From 812ce555388517c5ffbbc57017c36461f2d364eb Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 29 Aug 2016 14:05:25 +0200
Subject: [PATCH] [Horus] SEGFAULT in calibration menu (new tests needed
 thanks!)

---
 radio/src/gui/212x64/radio_calibration.cpp  |  2 --
 radio/src/gui/480x272/radio_calibration.cpp | 19 ++++++-------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/radio/src/gui/212x64/radio_calibration.cpp b/radio/src/gui/212x64/radio_calibration.cpp
index 1bbdbc928..5ef309292 100644
--- a/radio/src/gui/212x64/radio_calibration.cpp
+++ b/radio/src/gui/212x64/radio_calibration.cpp
@@ -113,7 +113,6 @@ void menuCommonCalib(event_t event)
       // SET MIDPOINT
       lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_SETMIDPOINT, INVERS);
       lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE);
-
       for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
         reusableBuffer.calib.loVals[i] = 15000;
         reusableBuffer.calib.hiVals[i] = -15000;
@@ -130,7 +129,6 @@ void menuCommonCalib(event_t event)
       STICK_SCROLL_DISABLE();
       lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS);
       lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE);
-
       for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
         if (abs(reusableBuffer.calib.loVals[i]-reusableBuffer.calib.hiVals[i]) > 50) {
           g_eeGeneral.calib[i].mid = reusableBuffer.calib.midVals[i];
diff --git a/radio/src/gui/480x272/radio_calibration.cpp b/radio/src/gui/480x272/radio_calibration.cpp
index 7459f86b9..53f88c6fe 100644
--- a/radio/src/gui/480x272/radio_calibration.cpp
+++ b/radio/src/gui/480x272/radio_calibration.cpp
@@ -124,20 +124,12 @@ bool menuCommonCalib(event_t event)
 
   switch (event) {
     case EVT_ENTRY:
-      menuCalibrationState = CALIB_START;
-      break;
-      
     case EVT_KEY_FIRST(KEY_EXIT):
-      if (menuCalibrationState == CALIB_START) {
-        killEvents(KEY_EXIT);
-        popMenu();
-      }
-      else {
-        menuCalibrationState = CALIB_START;
-      }
+      menuCalibrationState = CALIB_START;
       break;
 
     case EVT_KEY_FIRST(KEY_ENTER):
+      killEvents(event);
       menuCalibrationState++;
       break;
   }
@@ -155,7 +147,7 @@ bool menuCommonCalib(event_t event)
       // SET MIDPOINT
       lcdDrawText(50, 3, STR_MENUCALIBRATION, MENU_TITLE_COLOR);
       lcdDrawText(50, 3+FH, STR_SETMIDPOINT, MENU_TITLE_COLOR);
-      for (int i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS; i++) {
+      for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS; i++) {
         reusableBuffer.calib.loVals[i] = 15000;
         reusableBuffer.calib.hiVals[i] = -15000;
         reusableBuffer.calib.midVals[i] = i < TX_VOLTAGE ? anaIn(i) : anaIn(i+1);
@@ -230,8 +222,9 @@ bool menuCommonCalib(event_t event)
 bool menuRadioCalibration(event_t event)
 {
   if (event == EVT_ENTRY || event == EVT_ENTRY_UP) TRACE("Menu %s displayed ...", STR_MENUCALIBRATION);
-  if (menuCalibrationState == CALIB_FINISHED) {
+  if (menuCalibrationState == CALIB_FINISHED || (menuCalibrationState == CALIB_START && event == EVT_KEY_FIRST(KEY_EXIT))) {
     menuCalibrationState = CALIB_START;
+    killEvents(event);
     popMenu();
     return false;
   }
@@ -246,7 +239,7 @@ bool menuRadioCalibration(event_t event)
 
 bool menuFirstCalib(event_t event)
 {
-  if (event == EVT_KEY_BREAK(KEY_EXIT) || menuCalibrationState == CALIB_FINISHED) {
+  if (event == EVT_KEY_FIRST(KEY_EXIT) || menuCalibrationState == CALIB_FINISHED) {
     menuCalibrationState = CALIB_START;
     chainMenu(menuMainView);
     return false;