From fbb90ff5d587ddafbc5fae6df430cffd0f087036 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 2 Jun 2014 15:20:22 +0200
Subject: [PATCH] No Center Beeps during calibration

---
 radio/src/gui/menu_general.cpp |  8 ++++----
 radio/src/gui/menus.cpp        | 10 +++++-----
 radio/src/gui/menus.h          |  2 +-
 radio/src/mixer.cpp            |  2 +-
 radio/src/opentx.cpp           |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index 3c33a02dd..9165dcd66 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -1501,9 +1501,9 @@ void menuCommonCalib(uint8_t event)
     }
   }
 
-  s_noScroll = reusableBuffer.calib.state; // make sure we don't scroll while calibrating
+  calibrationState = reusableBuffer.calib.state; // make sure we don't scroll while calibrating
 
-  switch(event)
+  switch (event)
   {
     case EVT_ENTRY:
       reusableBuffer.calib.state = 0;
@@ -1524,7 +1524,7 @@ void menuCommonCalib(uint8_t event)
 
     case 1:
       // SET MIDPOINT
-      lcd_putsAtt(0*FW, 2*FH, STR_SETMIDPOINT, s_noScroll ? INVERS : 0);
+      lcd_putsAtt(0*FW, 2*FH, STR_SETMIDPOINT, INVERS);
       lcd_putsLeft(3*FH, STR_MENUWHENDONE);
 
       for (uint8_t i=0; i<NUM_STICKS+NUM_POTS; i++) {
@@ -1543,7 +1543,7 @@ void menuCommonCalib(uint8_t event)
     case 2:
       // MOVE STICKS/POTS
       STICK_SCROLL_DISABLE();
-      lcd_putsAtt(0*FW, 2*FH, STR_MOVESTICKSPOTS, s_noScroll ? INVERS : 0);
+      lcd_putsAtt(0*FW, 2*FH, STR_MOVESTICKSPOTS, INVERS);
       lcd_putsLeft(3*FH, STR_MENUWHENDONE);
 
       for (uint8_t i=0; i<NUM_STICKS+NUM_POTS; i++) {
diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index 9f2c7903e..203a8a5e2 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -39,7 +39,7 @@
 vertpos_t s_pgOfs;
 int8_t s_editMode;
 uint8_t s_noHi;
-uint8_t s_noScroll;
+uint8_t calibrationState;
 
 void menu_lcd_onoff(uint8_t x, uint8_t y, uint8_t value, LcdFlags attr)
 {
@@ -394,7 +394,7 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
     uint8_t attr = 0;
 
     int8_t cc = curr;
-    switch(event) {
+    switch (event) {
       case EVT_KEY_LONG(KEY_MENU):
         if (menuTab == menuTabModel) {
           killEvents(event);
@@ -430,7 +430,7 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
       return false;
     }
 
-    s_noScroll = 0;
+    calibrationState = 0;
 
     if (!(flags&CHECK_FLAG_NO_SCREEN_INDEX)) {
       displayScreenIndex(curr, menuTabSize, attr);
@@ -701,7 +701,7 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
     uint8_t attr = 0;
 
 
-    if (l_posVert==0 && !s_noScroll) {
+    if (l_posVert==0 && !calibrationState) {
       attr = INVERS;
 
       int8_t cc = curr;
@@ -761,7 +761,7 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
 #endif
     }
 
-    s_noScroll = 0;
+    calibrationState = 0;
     displayScreenIndex(curr, menuTabSize, attr);
 
   }
diff --git a/radio/src/gui/menus.h b/radio/src/gui/menus.h
index a66a72822..0ae5507b9 100644
--- a/radio/src/gui/menus.h
+++ b/radio/src/gui/menus.h
@@ -96,7 +96,7 @@ extern vertpos_t m_posVert;
 extern horzpos_t m_posHorz;
 extern vertpos_t s_pgOfs;
 extern uint8_t s_noHi;
-extern uint8_t s_noScroll;
+extern uint8_t calibrationState;
 
 void menu_lcd_onoff(uint8_t x, uint8_t y, uint8_t value, LcdFlags attr);
 
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index 06d7e1bd3..a09fa5c1e 100755
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -434,7 +434,7 @@ void evalInputs(uint8_t mode)
       if (mode == e_perout_mode_normal) {
         if (tmp==0 || (tmp==1 && (bpanaCenter & mask))) {
           anaCenter |= mask;
-          if ((g_model.beepANACenter & mask) && !(bpanaCenter & mask)) {
+          if ((g_model.beepANACenter & mask) && !(bpanaCenter & mask) && !calibrationState) {
             AUDIO_POT_MIDDLE(i);
           }
         }
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 87158a79f..aa94e75c6 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1385,16 +1385,16 @@ void getADC()
       temp[x] += Analog_values[x];
     }
 #if defined(PCBTARANIS)
-    if (s_noScroll) break;
+    if (calibrationState) break;
 #endif
   }
 
   for (uint32_t x=0; x<NUMBER_ANALOG; x++) {
     uint16_t v = temp[x] >> 3;
 #if defined(PCBTARANIS)
-    if (s_noScroll) v = temp[x] >> 1;
+    if (calibrationState) v = temp[x] >> 1;
     StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[x];
-    if (!s_noScroll && IS_POT_MULTIPOS(x) && calib->count>0 && calib->count<XPOTS_MULTIPOS_COUNT) {
+    if (!calibrationState && IS_POT_MULTIPOS(x) && calib->count>0 && calib->count<XPOTS_MULTIPOS_COUNT) {
       uint8_t vShifted = (v >> 4);
       s_anaFilt[x] = 2*RESX;
       for (int i=0; i<calib->count; i++) {