From e4296225a86d3388246c15dd58cb0d96ed22ac23 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Thu, 21 Feb 2013 09:01:24 +0000
Subject: [PATCH] Issue 213 fixed (15 custom switches on '128 / gruvin9x)

---
 src/main_views.cpp    | 25 ++++++++++++++-----------
 src/myeeprom.h        |  2 +-
 src/open9x.cpp        |  6 +++---
 src/open9x.h          | 16 ++++++++--------
 src/translations/en.h |  2 +-
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/main_views.cpp b/src/main_views.cpp
index f94fc87f6..12746624c 100644
--- a/src/main_views.cpp
+++ b/src/main_views.cpp
@@ -250,15 +250,15 @@ void displayVoltage()
 #endif
 
 #if defined(PCBX9D) || defined(PCBACT)
-#define EVT_KEY_MODEL_MENU   EVT_KEY_BREAK(KEY_MENU)
-#define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_MENU)
-#define EVT_KEY_TELEMETRY    EVT_KEY_LONG(KEY_PAGE)
-#define EVT_KEY_STATISTICS   EVT_KEY_LONG(KEY_ENTER)
+  #define EVT_KEY_MODEL_MENU   EVT_KEY_BREAK(KEY_MENU)
+  #define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_MENU)
+  #define EVT_KEY_TELEMETRY    EVT_KEY_LONG(KEY_PAGE)
+  #define EVT_KEY_STATISTICS   EVT_KEY_LONG(KEY_ENTER)
 #else
-#define EVT_KEY_MODEL_MENU   EVT_KEY_LONG(KEY_RIGHT)
-#define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_LEFT)
-#define EVT_KEY_TELEMETRY    EVT_KEY_LONG(KEY_DOWN)
-#define EVT_KEY_STATISTICS   EVT_KEY_LONG(KEY_UP)
+  #define EVT_KEY_MODEL_MENU   EVT_KEY_LONG(KEY_RIGHT)
+  #define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_LEFT)
+  #define EVT_KEY_TELEMETRY    EVT_KEY_LONG(KEY_DOWN)
+  #define EVT_KEY_STATISTICS   EVT_KEY_LONG(KEY_UP)
 #endif
 
 #if defined(PCBX9D) || defined(PCBACT)
@@ -583,13 +583,16 @@ void menuMainView(uint8_t event)
       }
 #elif defined(PCBGRUVIN9X) && ROTARY_ENCODERS > 2
       for (uint8_t i=0; i<NUM_CSW; i++)
-        putsSwitches(2*FW-2 + (i/3)*(4*FW-2) + (i/3>1 ? 3*FW+6 : 0), 4*FH+1 + (i%3)*FH, 10+i, getSwitch(10+i, 0) ? INVERS : 0);
+        putsSwitches(2*FW-2 + (i/3)*(4*FW-2) + (i/3>1 ? 3*FW+6 : 0), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i, 0) ? INVERS : 0);
 #elif defined(PCBGRUVIN9X)
       for (uint8_t i=0; i<NUM_CSW; i++)
-        putsSwitches(2*FW-2 + (i/3)*(4*FW) + (i/3>1 ? 3*FW : 0), 4*FH+1 + (i%3)*FH, 10+i, getSwitch(10+i, 0) ? INVERS : 0);
+        putsSwitches(2*FW-2 + (i/3)*(4*FW-2) + (i/3>1 ? 3*FW : 0), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i, 0) ? INVERS : 0);
+#elif !defined(CPUM64)
+      for (uint8_t i=0; i<NUM_CSW; i++)
+        putsSwitches(2*FW-2 + (i/3)*(4*FW-1), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i, 0) ? INVERS : 0);
 #else
       for (uint8_t i=0; i<NUM_CSW; i++)
-        putsSwitches(2*FW-2 + (i/3)*(5*FW), 4*FH+1 + (i%3)*FH, 10+i, getSwitch(10+i, 0) ? INVERS : 0);
+        putsSwitches(2*FW-2 + (i/3)*(5*FW), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i, 0) ? INVERS : 0);
 #endif
     }
   }
diff --git a/src/myeeprom.h b/src/myeeprom.h
index 2bba3613d..3cb2f0f8c 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -720,7 +720,7 @@ PACK(typedef struct t_PhaseData {
   #define MAX_PHASES 6
   #define MAX_MIXERS 32
   #define MAX_EXPOS  16
-  #define NUM_CSW    16 // number of custom switches
+  #define NUM_CSW    15 // number of custom switches
   #define NUM_CFN    24 // number of functions assigned to switches
 #else
   #define MAX_MODELS 16
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 8f328519c..acda3a60d 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -702,9 +702,9 @@ int16_t getValue(uint8_t i)
 #endif
   else if (i<MIXSRC_LAST_CSW) return __getSwitch(SWSRC_THR+i+1-MIXSRC_SW1) ? 1024 : -1024;
 #endif
-  else if (i<MIXSRC_PPM1+NUM_CAL_PPM) return (g_ppmIns[i-MIXSRC_LAST_CSW] - g_eeGeneral.trainer.calib[i+1-MIXSRC_PPM1])*2;
-  else if (i<MIXSRC_LAST_PPM) return g_ppmIns[i-MIXSRC_LAST_CSW]*2;
-  else if (i<MIXSRC_LAST_CH) return ex_chans[i-MIXSRC_LAST_PPM];
+  else if (i<MIXSRC_PPM1+NUM_CAL_PPM) return (g_ppmIns[i+1-MIXSRC_PPM1] - g_eeGeneral.trainer.calib[i+1-MIXSRC_PPM1])*2;
+  else if (i<MIXSRC_LAST_PPM) return g_ppmIns[i+1-MIXSRC_PPM1]*2;
+  else if (i<MIXSRC_LAST_CH) return ex_chans[i+1-MIXSRC_CH1];
   else if (i<MIXSRC_LAST_CH+TELEM_TX_VOLTAGE) return g_vbat100mV;
   else if (i<MIXSRC_LAST_CH+TELEM_TM2) return s_timerVal[i+1-MIXSRC_LAST_CH-TELEM_TM1];
 #if defined(FRSKY)
diff --git a/src/open9x.h b/src/open9x.h
index 559fb8cd0..f8a7c7381 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -1018,18 +1018,18 @@ extern void instantTrim();
 extern void moveTrimsToOffsets();
 
 #if defined(CPUARM)
-#define ACTIVE_EXPOS_TYPE uint32_t
-#define ACTIVE_MIXES_TYPE uint64_t
+#define ACTIVE_EXPOS_TYPE  uint32_t
+#define ACTIVE_MIXES_TYPE  uint64_t
 #define ACTIVE_PHASES_TYPE uint16_t
 #else
-#define ACTIVE_EXPOS_TYPE uint16_t
-#define ACTIVE_MIXES_TYPE uint32_t
+#define ACTIVE_EXPOS_TYPE  uint16_t
+#define ACTIVE_MIXES_TYPE  uint32_t
 #define ACTIVE_PHASES_TYPE uint8_t
 #endif
 
 #ifdef BOLD_FONT
-extern ACTIVE_EXPOS_TYPE activeExpos;
-extern ACTIVE_MIXES_TYPE activeMixes;
+extern ACTIVE_EXPOS_TYPE   activeExpos;
+extern ACTIVE_MIXES_TYPE   activeMixes;
 inline bool isExpoActive(uint8_t expo)
 {
   return activeExpos & ((ACTIVE_EXPOS_TYPE)1 << expo);
@@ -1045,10 +1045,10 @@ inline bool isMixActive(uint8_t mix)
 #endif
 
 #if defined(CPUARM)
-#define MASK_CFN_TYPE uint32_t // current max = 32 function switches
+#define MASK_CFN_TYPE uint32_t  // current max = 32 function switches
 #define MASK_FUNC_TYPE uint32_t // current max = 32 functions
 #else
-#define MASK_CFN_TYPE uint16_t // current max = 16 function switches
+#define MASK_CFN_TYPE uint16_t  // current max = 16 function switches
 #define MASK_FUNC_TYPE uint16_t // current max = 16 functions
 #endif
 
diff --git a/src/translations/en.h b/src/translations/en.h
index a68336f83..e76272dfe 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -286,7 +286,7 @@
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"
 #elif defined(PCBGRUVIN9X) || defined(CPUM128)
-  #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG"
+  #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF"
 #else
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC"
 #endif