From 95be0729cfc1c326c88e388e0aa8e604664a2307 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 28 Mar 2015 00:51:39 +0400
Subject: [PATCH 1/5] Fix switch handling on X9E, cleanup/harmonize code for
 all revisions

---
 radio/src/gui/Taranis/helpers.cpp    | 21 +++++++++--------
 radio/src/gui/Taranis/navigation.cpp |  2 +-
 radio/src/gui/Taranis/view_main.cpp  | 29 +----------------------
 radio/src/keys.h                     |  4 ----
 radio/src/mixer.cpp                  | 35 +++++++---------------------
 radio/src/myeeprom.h                 |  9 +++----
 radio/src/switches.cpp               | 31 +-----------------------
 radio/src/translations/cz.h.txt      |  2 +-
 radio/src/translations/de.h.txt      |  2 +-
 radio/src/translations/en.h.txt      |  2 +-
 radio/src/translations/es.h.txt      | 22 ++++++++++++-----
 radio/src/translations/fi.h.txt      | 22 ++++++++++++-----
 radio/src/translations/fr.h.txt      |  2 +-
 radio/src/translations/it.h.txt      | 22 ++++++++++++-----
 radio/src/translations/pl.h.txt      | 22 ++++++++++++-----
 radio/src/translations/pt.h.txt      | 22 ++++++++++++-----
 radio/src/translations/se.h.txt      | 22 ++++++++++++-----
 17 files changed, 128 insertions(+), 143 deletions(-)

diff --git a/radio/src/gui/Taranis/helpers.cpp b/radio/src/gui/Taranis/helpers.cpp
index 06b9b8f15..f5ada5618 100755
--- a/radio/src/gui/Taranis/helpers.cpp
+++ b/radio/src/gui/Taranis/helpers.cpp
@@ -38,14 +38,8 @@
 
 uint8_t switchToMix(uint8_t source)
 {
-  if (source <= 5*3)
-    return MIXSRC_FIRST_SWITCH + (source-1) / 3;
-  else if (source <= 17)
-    return MIXSRC_SF;
-  else if (source <= 20)
-    return MIXSRC_SG;
-  else
-    return MIXSRC_SH;
+  div_t qr = div(source-1, 3);
+  return qr.quot+MIXSRC_FIRST_SWITCH;
 }
 
 int circularIncDec(int current, int inc, int min, int max, IsValueAvailable isValueAvailable)
@@ -94,6 +88,10 @@ bool isSourceAvailable(int source)
     return IS_POT_AVAILABLE(POT1+source-MIXSRC_FIRST_POT);
   }
 
+  if (source>=MIXSRC_FIRST_SWITCH && source<=MIXSRC_LAST_SWITCH) {
+     return SWITCH_EXISTS(source-MIXSRC_FIRST_SWITCH);
+  }
+    
 #if !defined(HELI)
   if (source>=MIXSRC_CYC1 && source<=MIXSRC_CYC3)
     return false;
@@ -109,7 +107,7 @@ bool isSourceAvailable(int source)
     return false;
   }
 
-  if (source>=MIXSRC_SW1 && source<=MIXSRC_LAST_LOGICAL_SWITCH) {
+  if (source>=MIXSRC_FIRST_LOGICAL_SWITCH && source<=MIXSRC_LAST_LOGICAL_SWITCH) {
     LogicalSwitchData * cs = lswAddress(source-MIXSRC_SW1);
     return (cs->func != LS_FUNC_NONE);
   }
@@ -156,9 +154,12 @@ bool isInputSourceAvailable(int source)
   if (source>=MIXSRC_Rud && source<=MIXSRC_MAX)
     return true;
 
-  if (source>=MIXSRC_TrimRud && source<MIXSRC_SW1)
+  if (source>=MIXSRC_FIRST_TRIM && source<=MIXSRC_LAST_TRIM)
     return true;
 
+  if (source>=MIXSRC_FIRST_SWITCH && source<=MIXSRC_LAST_SWITCH)
+     return SWITCH_EXISTS(source-MIXSRC_FIRST_SWITCH);
+  
   if (source>=MIXSRC_FIRST_CH && source<=MIXSRC_LAST_CH)
     return true;
 
diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp
index 18a7308b2..823c93377 100755
--- a/radio/src/gui/Taranis/navigation.cpp
+++ b/radio/src/gui/Taranis/navigation.cpp
@@ -53,7 +53,7 @@ int8_t checkIncDecMovedSwitch(int8_t val)
       div_t info = switchInfo(swtch);
       if (IS_TOGGLE(info.quot)) {
         if (info.rem != 0) {
-          val = (val == swtch ? swtch+2 : swtch);
+          val = (val == swtch ? swtch-2 : swtch);
         }
       }
       else {
diff --git a/radio/src/gui/Taranis/view_main.cpp b/radio/src/gui/Taranis/view_main.cpp
index 7ffd0bd89..481e348dd 100755
--- a/radio/src/gui/Taranis/view_main.cpp
+++ b/radio/src/gui/Taranis/view_main.cpp
@@ -571,7 +571,6 @@ void menuMainView(uint8_t event)
   lcd_bmp(BITMAP_X, BITMAP_Y, modelBitmap);
 
   // Switches
-#if defined(REV9E)
   if (getSwitchCount() > 8) {
     for (int i=0; i<NUM_SWITCHES; ++i) {
       div_t qr = div(i, 9);
@@ -591,39 +590,13 @@ void menuMainView(uint8_t event)
     int index = 0;
     for (int i=0; i<NUM_SWITCHES; ++i) {
       if (SWITCH_EXISTS(i)) {
-        getvalue_t val = getValue(MIXSRC_SA+i);
+        getvalue_t val = getValue(MIXSRC_FIRST_SWITCH+i);
         getvalue_t sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3));
         putsSwitches((g_eeGeneral.view == VIEW_INPUTS) ? (index<4 ? 8*FW+3 : 24*FW+1) : (index<4 ? 3*FW+2 : 8*FW-1), (index%4)*FH+3*FH, sw, 0);
         index++;
       }
     }
   }
-#else
-  for (int i=0; i<8; ++i) {
-    getvalue_t sw;
-    getvalue_t val;
-    // TODO simplify this + reuse code in checkSwitches() + Menu MODELSETUP
-    switch(i) {
-      case 5:
-        sw = getValue(MIXSRC_SF) > 0 ? 3*i+2 : 3*i+1;
-        break;
-      case 6:
-        val = getValue(MIXSRC_SG);
-        sw = ((val < 0) ? 3*i : ((val == 0) ? 3*i+1 : 3*i+2));
-        break;     
-      case 7:
-        sw = getValue(MIXSRC_SH) > 0 ? 3*i+1 : 3*i;
-        break;
-      default:
-      {
-        val = getValue(MIXSRC_SA+i);
-        sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3));
-        break;
-      }
-    }
-    putsSwitches((g_eeGeneral.view == VIEW_INPUTS) ? (i<4 ? 8*FW+3 : 24*FW+1) : (i<4 ? 3*FW+2 : 8*FW-1), (i%4)*FH+3*FH, sw, 0);
-  }
-#endif
 
   if (g_eeGeneral.view == VIEW_TIMERS) {
     displayTimers();
diff --git a/radio/src/keys.h b/radio/src/keys.h
index 2948b943f..5d70dd3a3 100644
--- a/radio/src/keys.h
+++ b/radio/src/keys.h
@@ -89,17 +89,13 @@ enum EnumKeys {
   SW_SE1,
   SW_SE2,
   SW_SF0,
-#if defined(REV9E)
   SW_SF1,
-#endif
   SW_SF2,
   SW_SG0,
   SW_SG1,
   SW_SG2,
   SW_SH0,
-#if defined(REV9E)
   SW_SH1,
-#endif
   SW_SH2,
 #if defined(REV9E)
   SW_SI0,
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index dff2cb1ed..de63bbc32 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -278,32 +278,15 @@ getvalue_t getValue(mixsrc_t i)
   else if (i<=MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_TrimRud));
 
 #if defined(PCBTARANIS)
-  else if (i==MIXSRC_SA) return (switchState(SW_SA0) ? -1024 : (switchState(SW_SA1) ? 0 : 1024));
-  else if (i==MIXSRC_SB) return (switchState(SW_SB0) ? -1024 : (switchState(SW_SB1) ? 0 : 1024));
-  else if (i==MIXSRC_SC) return (switchState(SW_SC0) ? -1024 : (switchState(SW_SC1) ? 0 : 1024));
-  else if (i==MIXSRC_SD) return (switchState(SW_SD0) ? -1024 : (switchState(SW_SD1) ? 0 : 1024));
-  else if (i==MIXSRC_SE) return (switchState(SW_SE0) ? -1024 : (switchState(SW_SE1) ? 0 : 1024));
-#if defined(REV9E)
-  else if (i==MIXSRC_SF) return (switchState(SW_SF0) ? -1024 : (switchState(SW_SF1) ? 0 : 1024));
-#else
-  else if (i==MIXSRC_SF) return (switchState(SW_SF0) ? -1024 : 1024);
-#endif
-  else if (i==MIXSRC_SG) return (switchState(SW_SG0) ? -1024 : (switchState(SW_SG1) ? 0 : 1024));
-#if defined(REV9E)
-  else if (i==MIXSRC_SH) return (switchState(SW_SH0) ? -1024 : (switchState(SW_SH1) ? 0 : 1024));
-  else if (i==MIXSRC_SI) return (switchState(SW_SI0) ? -1024 : (switchState(SW_SI1) ? 0 : 1024));
-  else if (i==MIXSRC_SJ) return (switchState(SW_SJ0) ? -1024 : (switchState(SW_SJ1) ? 0 : 1024));
-  else if (i==MIXSRC_SK) return (switchState(SW_SK0) ? -1024 : (switchState(SW_SK1) ? 0 : 1024));
-  else if (i==MIXSRC_SL) return (switchState(SW_SL0) ? -1024 : (switchState(SW_SL1) ? 0 : 1024));
-  else if (i==MIXSRC_SM) return (switchState(SW_SM0) ? -1024 : (switchState(SW_SM1) ? 0 : 1024));
-  else if (i==MIXSRC_SN) return (switchState(SW_SN0) ? -1024 : (switchState(SW_SN1) ? 0 : 1024));
-  else if (i==MIXSRC_SO) return (switchState(SW_SO0) ? -1024 : (switchState(SW_SO1) ? 0 : 1024));
-  else if (i==MIXSRC_SP) return (switchState(SW_SP0) ? -1024 : (switchState(SW_SP1) ? 0 : 1024));
-  else if (i==MIXSRC_SQ) return (switchState(SW_SQ0) ? -1024 : (switchState(SW_SQ1) ? 0 : 1024));
-  else if (i==MIXSRC_SR) return (switchState(SW_SR0) ? -1024 : (switchState(SW_SR1) ? 0 : 1024));
-#else
-  else if (i==MIXSRC_SH) return (switchState(SW_SH0) ? -1024 : 1024);
-#endif
+  else if ((i >= MIXSRC_FIRST_SWITCH) && (i <= MIXSRC_LAST_SWITCH)) {
+    mixsrc_t sw = i-MIXSRC_FIRST_SWITCH;
+    if (SWITCH_EXISTS(sw)) {
+      return (switchState((EnumKeys)(SW_BASE+(3*sw))) ? -1024 : (switchState((EnumKeys)(SW_BASE+(3*sw)+1)) ? 0 : 1024));
+    }
+    else {
+      return 0;
+    }
+  }
 #else
   else if (i==MIXSRC_3POS) return (getSwitch(SW_ID0-SW_BASE+1) ? -1024 : (getSwitch(SW_ID1-SW_BASE+1) ? 0 : 1024));
   // don't use switchState directly to give getSwitch possibility to hack values if needed for switch warning
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index e1028213f..373fbd667 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -1633,17 +1633,13 @@ enum SwitchSources {
   SWSRC_SE1,
   SWSRC_SE2,
   SWSRC_SF0,
-#if defined(REV9E)
   SWSRC_SF1,
-#endif
   SWSRC_SF2,
   SWSRC_SG0,
   SWSRC_SG1,
   SWSRC_SG2,
   SWSRC_SH0,
-#if defined(REV9E)
   SWSRC_SH1,
-#endif
   SWSRC_SH2,
   SWSRC_TRAINER = SWSRC_SH2,
 #if defined(REV9E)
@@ -1827,6 +1823,7 @@ enum MixSources {
   MIXSRC_TrimEle,                      LUA_EXPORT("trim-ele", "Elevator trim")
   MIXSRC_TrimThr,                      LUA_EXPORT("trim-thr", "Throttle trim")
   MIXSRC_TrimAil,                      LUA_EXPORT("trim-ail", "Aileron trim")
+  MIXSRC_LAST_TRIM = MIXSRC_TrimAil,
 
   MIXSRC_FIRST_SWITCH,
 
@@ -1850,6 +1847,9 @@ enum MixSources {
   MIXSRC_SP,                        LUA_EXPORT("sp", "Switch P")
   MIXSRC_SQ,                        LUA_EXPORT("sq", "Switch Q")
   MIXSRC_SR,                        LUA_EXPORT("sr", "Switch R")
+  MIXSRC_LAST_SWITCH = MIXSRC_SR,
+#else
+  MIXSRC_LAST_SWITCH = MIXSRC_SH,
 #endif
 #else
   MIXSRC_3POS = MIXSRC_FIRST_SWITCH,
@@ -1859,6 +1859,7 @@ enum MixSources {
   MIXSRC_AIL,
   MIXSRC_GEA,
   MIXSRC_TRN,
+  MIXSRC_LAST_SWITCH = MIXSRC_TRN,
 #endif
   MIXSRC_FIRST_LOGICAL_SWITCH,
   MIXSRC_SW1 = MIXSRC_FIRST_LOGICAL_SWITCH, LUA_EXPORT_MULTIPLE("ls", "Logical switch L%d", NUM_LOGICAL_SWITCH)
diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
index 4660c26ef..6b7cba904 100644
--- a/radio/src/switches.cpp
+++ b/radio/src/switches.cpp
@@ -77,32 +77,10 @@ uint64_t  switchesPos = 0;
 tmr10ms_t potsLastposStart[NUM_XPOTS] = { 0 };
 uint8_t   potsPos[NUM_XPOTS];
 
-#if defined(REV9E)
 div_t switchInfo(int switchPosition)
 {
   return div(switchPosition-SWSRC_FIRST_SWITCH, 3);
 }
-#else
-div_t switchInfo(int switchPosition)
-{
-  if (switchPosition <= SWSRC_SE2) {
-    return div(switchPosition-SWSRC_SA0, 3);
-  }
-  else if (switchPosition <= SWSRC_SF2) {
-    div_t qr = { 5, switchPosition == SWSRC_SF2 ? 2 : 0 };
-    return qr;
-  }
-  else if (switchPosition <= SWSRC_SG2) {
-    div_t qr = { 6, switchPosition-SWSRC_SG0 };
-    return qr;
-  }
-  else {
-    div_t qr = div(2*7+switchPosition-SWSRC_SH0, 2);
-    qr.rem *= 2;
-    return qr;
-  }
-}
-#endif
 
 uint64_t check2PosSwitchPosition(EnumKeys sw)
 {
@@ -577,14 +555,7 @@ int8_t getMovedSwitch()
       uint8_t next = (1024+getValue(MIXSRC_SA+i)) / 1024;
       if (prev != next) {
         switches_states = (switches_states & (~mask)) | ((swarnstate_t)next << (i*2));
-        if (i<5)
-          result = 1+(3*i)+next;
-        else if (i==5)
-          result = 1+(3*5)+(next!=0);
-        else if (i==6)
-          result = 1+(3*5)+2+next;
-        else
-          result = 1+(3*5)+2+3+(next!=0);
+        result = 1+(3*i)+next;
       }
     }
   }
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 358a4aa1a..a15eb24a3 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -482,7 +482,7 @@
 #if defined(PCBTARANIS) && defined(REV9E)
   #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
 #elif defined(PCBTARANIS)
-  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301"
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
   #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
 #endif
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index b2bddbe42..cd7fce3ef 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -481,7 +481,7 @@
 #if defined(PCBTARANIS) && defined(REV9E)
   #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
 #elif defined(PCBTARANIS)
-  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301"
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
   #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
 #endif
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 4f02b2ca1..5a228bfcd 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -481,7 +481,7 @@
 #if defined(PCBTARANIS) && defined(REV9E)
   #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
 #elif defined(PCBTARANIS)
-  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301"
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
   #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
 #endif
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index 0fe37e137..19920dab0 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -459,13 +459,23 @@
   #define TR_ROTENC_SWITCHES
 #endif
 
-#if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
-  #define TR_VSWITCHES         "---""SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
-#elif defined(CPUARM)
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#if defined(PCBTARANIS) && defined(REV9E)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
+#elif defined(PCBTARANIS)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+  #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
+#endif
+
+#if defined(PCBTARANIS)
+  #if defined(REV9E)
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46"
+  #else
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
+  #endif
+  #define TR_VSWITCHES         "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#else
+  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
 #endif
 
 #if defined(HELI)
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 83f7b7f44..3014a6201 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -459,13 +459,23 @@
   #define TR_ROTENC_SWITCHES
 #endif
 
-#if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
-  #define TR_VSWITCHES         "---""SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
-#elif defined(CPUARM)
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#if defined(PCBTARANIS) && defined(REV9E)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
+#elif defined(PCBTARANIS)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+  #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
+#endif
+
+#if defined(PCBTARANIS)
+  #if defined(REV9E)
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46"
+  #else
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
+  #endif
+  #define TR_VSWITCHES         "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#else
+  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
 #endif
 
 #if defined(HELI)
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index db4948920..b93defc44 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -481,7 +481,7 @@
 #if defined(PCBTARANIS) && defined(REV9E)
   #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
 #elif defined(PCBTARANIS)
-  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301"
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
   #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
 #endif
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 722307632..ebb8d4feb 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -459,13 +459,23 @@
   #define TR_ROTENC_SWITCHES
 #endif
 
-#if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
-  #define TR_VSWITCHES         "---""SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
-#elif defined(CPUARM)
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#if defined(PCBTARANIS) && defined(REV9E)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
+#elif defined(PCBTARANIS)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+  #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
+#endif
+
+#if defined(PCBTARANIS)
+  #if defined(REV9E)
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46"
+  #else
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
+  #endif
+  #define TR_VSWITCHES         "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#else
+  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
 #endif
 
 #if defined(HELI)
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 18c4e9693..812562dd3 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -457,13 +457,23 @@
   #define TR_ROTENC_SWITCHES
 #endif
 
-#if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
-  #define TR_VSWITCHES         "---""SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
-#elif defined(CPUARM)
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "GAZ""SK ""SW ""LOT""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#if defined(PCBTARANIS) && defined(REV9E)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
+#elif defined(PCBTARANIS)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "GAZ""SK ""SW ""LOT""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+  #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
+#endif
+
+#if defined(PCBTARANIS)
+  #if defined(REV9E)
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46"
+  #else
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
+  #endif
+  #define TR_VSWITCHES         "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#else
+  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
 #endif
 
 #if defined(HELI)
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index ec1fb9846..f5351722b 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -459,13 +459,23 @@
   #define TR_ROTENC_SWITCHES
 #endif
 
-#if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
-  #define TR_VSWITCHES         "---""SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
-#elif defined(CPUARM)
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#if defined(PCBTARANIS) && defined(REV9E)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
+#elif defined(PCBTARANIS)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+  #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
+#endif
+
+#if defined(PCBTARANIS)
+  #if defined(REV9E)
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46"
+  #else
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
+  #endif
+  #define TR_VSWITCHES         "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#else
+  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
 #endif
 
 #if defined(HELI)
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index c29e03d39..41166261f 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -459,13 +459,23 @@
   #define TR_ROTENC_SWITCHES
 #endif
 
-#if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
-  #define TR_VSWITCHES         "---""SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "PÅ\0""En\0"
-#elif defined(CPUARM)
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "PÅ\0""En\0"
+#if defined(PCBTARANIS) && defined(REV9E)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301"
+#elif defined(PCBTARANIS)
+  #define TR_PHYS_SWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301"
 #else
-  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "PÅ\0""En\0"
+  #define TR_PHYS_SWITCHES     "THR""RUD""ELE""AIL""GEA""TRN"
+#endif
+
+#if defined(PCBTARANIS)
+  #if defined(REV9E)
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46"
+  #else
+    #define TR_6POS_POTS       "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36"
+  #endif
+  #define TR_VSWITCHES         "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
+#else
+  #define TR_VSWITCHES         "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
 #endif
 
 #if defined(HELI)

From d8fa6beb83dc79e6037d7a12022720aa8feca9cc Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 28 Mar 2015 01:24:00 +0400
Subject: [PATCH 2/5] Should fix gtest

---
 radio/src/tests/mixer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index 393c2e0ff..70f094350 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -761,6 +761,9 @@ TEST(Mixer, SlowOnSwitchSource)
   g_model.mixData[0].weight = 100;
   g_model.mixData[0].speedUp = SLOW_STEP*5;
   g_model.mixData[0].speedDown = SLOW_STEP*5;
+#if defined(CPUARM)
+  g_eeGeneral.switchConfig = 0x03;
+#endif
 
   s_mixer_first_run_done = true;
 

From 26fdac072a6cba83cba5e269c4ea461490a9d6c8 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 28 Mar 2015 01:31:22 +0400
Subject: [PATCH 3/5] Taranis only

---
 radio/src/tests/mixer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index 70f094350..109fb6d32 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -761,7 +761,7 @@ TEST(Mixer, SlowOnSwitchSource)
   g_model.mixData[0].weight = 100;
   g_model.mixData[0].speedUp = SLOW_STEP*5;
   g_model.mixData[0].speedDown = SLOW_STEP*5;
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
   g_eeGeneral.switchConfig = 0x03;
 #endif
 

From 19ff2d6f39787f80578de043f55b840640eeb52e Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 28 Mar 2015 02:10:13 +0400
Subject: [PATCH 4/5] Missing switches in companion

---
 companion/src/eeprominterface.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 7575b63f2..409f0df5e 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -533,15 +533,19 @@ QString RawSwitch::toString()
     SwitchUp('C'), QString::fromUtf8("SC-"), SwitchDn('C'),
     SwitchUp('D'), QString::fromUtf8("SD-"), SwitchDn('D'),
     SwitchUp('E'), QString::fromUtf8("SE-"), SwitchDn('E'),
-    SwitchUp('F'), SwitchDn('F'),
+    SwitchUp('F'), QString::fromUtf8("SF-"), SwitchDn('F'),
     SwitchUp('G'), QString::fromUtf8("SG-"), SwitchDn('G'),
-    SwitchUp('H'), SwitchDn('H'),
-    SwitchUp('I'), SwitchDn('I'),
-    SwitchUp('J'), SwitchDn('J'),
-    SwitchUp('K'), SwitchDn('K'),
-    SwitchUp('L'), SwitchDn('L'),
-    SwitchUp('M'), SwitchDn('M'),
-    SwitchUp('N'), SwitchDn('N'),
+    SwitchUp('H'), QString::fromUtf8("SH-"), SwitchDn('H'),
+    SwitchUp('I'), QString::fromUtf8("SI-"), SwitchDn('I'),
+    SwitchUp('J'), QString::fromUtf8("SJ-"), SwitchDn('J'),
+    SwitchUp('K'), QString::fromUtf8("SK-"), SwitchDn('K'),
+    SwitchUp('L'), QString::fromUtf8("SL-"), SwitchDn('L'),
+    SwitchUp('M'), QString::fromUtf8("SM-"), SwitchDn('M'),
+    SwitchUp('N'), QString::fromUtf8("SN-"), SwitchDn('N'),
+    SwitchUp('O'), QString::fromUtf8("SO-"), SwitchDn('O'),
+    SwitchUp('P'), QString::fromUtf8("SP-"), SwitchDn('P'),
+    SwitchUp('Q'), QString::fromUtf8("SQ-"), SwitchDn('Q'),
+    SwitchUp('R'), QString::fromUtf8("SR-"), SwitchDn('R'),
   };
 
   static const QString logicalSwitches[] = {

From 930fd7443e0ac14daeecb54c334d048aad42666c Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 28 Mar 2015 11:42:45 +0400
Subject: [PATCH 5/5] Companion UI support

---
 companion/src/eeprominterface.cpp           | 16 +++++++---------
 companion/src/eeprominterface.h             |  1 +
 companion/src/helpers.cpp                   | 21 ++++++++++++++++-----
 companion/src/helpers.h                     |  2 +-
 companion/src/modeledit/customfunctions.cpp |  8 ++++----
 companion/src/modeledit/expodialog.cpp      |  2 +-
 companion/src/modeledit/heli.cpp            |  6 +++---
 companion/src/modeledit/logicalswitches.cpp |  6 +++---
 companion/src/modeledit/mixerdialog.cpp     |  2 +-
 9 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 409f0df5e..3fd6e5ee2 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -995,14 +995,7 @@ void LimitData::clear()
 
 GeneralSettings::SwitchInfo GeneralSettings::switchInfoFromSwitchPositionTaranis(unsigned int index)
 {
-  if (index <= 3*5)
-    return SwitchInfo((index-1)/3, (index-1)%3);
-  else if (index <= 17)
-    return SwitchInfo(5, index==17 ? 2 : 0);
-  else if (index <= 20)
-    return SwitchInfo(6, index-18);
-  else
-    return SwitchInfo(7+(index-21)/2, 2*((index-21)%2));
+  return SwitchInfo((index-1)/3, (index-1)%3);
 }
 
 bool GeneralSettings::switchPositionAllowedTaranis(int index) const
@@ -1015,7 +1008,12 @@ bool GeneralSettings::switchPositionAllowedTaranis(int index) const
   else if (info.position == 1)
     return switchConfig[info.index] == SWITCH_3POS;
   else
-    return true;
+    return switchConfig[info.index] != SWITCH_NONE;
+}
+
+bool GeneralSettings::switchSourceAllowedTaranis(int index) const
+{
+  return switchConfig[index] != SWITCH_NONE;
 }
 
 GeneralSettings::GeneralSettings()
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index b982da9d0..e26d88581 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1174,6 +1174,7 @@ class GeneralSettings {
     
     static SwitchInfo switchInfoFromSwitchPositionTaranis(unsigned int index);
     bool switchPositionAllowedTaranis(int index) const;
+    bool switchSourceAllowedTaranis(int index) const;
 };
 
 class RadioData {
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index eaaeaca17..f52aa506d 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -412,10 +412,13 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
   }
 
   for (int i=-GetCurrentFirmware()->getCapability(SwitchesPositions); i<0; i++) {
-    if (IS_TARANIS(GetCurrentFirmware()->getBoard()) && !generalSettings.switchPositionAllowedTaranis(i))
-      continue;
     item = RawSwitch(SWITCH_TYPE_SWITCH, i);
     b->addItem(item.toString(), item.toValue());
+    if (IS_TARANIS(GetCurrentFirmware()->getBoard()) && !generalSettings.switchPositionAllowedTaranis(i)){
+      QModelIndex index = b->model()->index(b->count()-1, 0);
+      QVariant v(0);
+      b->model()->setData(index, v, Qt::UserRole - 1);
+    }
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
@@ -433,10 +436,13 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
   }
 
   for (int i=1; i<=GetCurrentFirmware()->getCapability(SwitchesPositions); i++) {
-    if (IS_TARANIS(GetCurrentFirmware()->getBoard()) && !generalSettings.switchPositionAllowedTaranis(i))
-      continue;
     item = RawSwitch(SWITCH_TYPE_SWITCH, i);
     b->addItem(item.toString(), item.toValue());
+    if (IS_TARANIS(GetCurrentFirmware()->getBoard()) && !generalSettings.switchPositionAllowedTaranis(i)){
+      QModelIndex index = b->model()->index(b->count()-1, 0);
+      QVariant v(0);
+      b->model()->setData(index, v, Qt::UserRole - 1);
+    }
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
@@ -525,7 +531,7 @@ void populateGVCB(QComboBox *b, int value)
   }
 }
 
-void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData * model, unsigned int flags)
+void populateSourceCB(QComboBox *b, const RawSource & source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags)
 {
   BoardEnum board = GetCurrentFirmware()->getBoard();
   RawSource item;
@@ -590,6 +596,11 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData *
     for (int i=0; i<GetCurrentFirmware()->getCapability(Switches); i++) {
       item = RawSource(SOURCE_TYPE_SWITCH, i);
       b->addItem(item.toString(model), item.toValue());
+      if (IS_TARANIS(GetCurrentFirmware()->getBoard()) && !generalSettings.switchSourceAllowedTaranis(i)) {
+        QModelIndex index = b->model()->index(b->count()-1, 0);
+        QVariant v(0);
+        b->model()->setData(index, v, Qt::UserRole - 1);
+      }
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
 
diff --git a/companion/src/helpers.h b/companion/src/helpers.h
index c57cdbda6..035176e58 100644
--- a/companion/src/helpers.h
+++ b/companion/src/helpers.h
@@ -115,7 +115,7 @@ QString getPhasesStr(unsigned int phases, ModelData * model);
 
 // void populateGVarCB(QComboBox *b, int value, int min, int max,int pgvars=5); //TODO: Clean Up
 void populateGVCB(QComboBox *b, int value);
-void populateSourceCB(QComboBox *b, const RawSource &source, const ModelData * model, unsigned int flags);
+void populateSourceCB(QComboBox *b, const RawSource &source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags);
 QString getPhaseName(int val, const char * phasename=NULL);
 QString getInputStr(ModelData * model, int index);
 QString image2qstring(QImage image);
diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp
index f7c8d0eab..600278d73 100644
--- a/companion/src/modeledit/customfunctions.cpp
+++ b/companion/src/modeledit/customfunctions.cpp
@@ -714,18 +714,18 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsi
     b->setCurrentIndex(value);
   }
   else if (function==FuncVolume) {
-    populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS);
+    populateSourceCB(b, RawSource(value), generalSettings, model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS);
   }
   else if (function==FuncPlayValue) {
-    populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRYEXT);
+    populateSourceCB(b, RawSource(value), generalSettings, model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRYEXT);
   }
   else if (function>=FuncAdjustGV1 && function<=FuncAdjustGVLast) {
     switch (adjustmode) {
       case 1:
-        populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS|POPULATE_SWITCHES);
+        populateSourceCB(b, RawSource(value), generalSettings, model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS|POPULATE_SWITCHES);
         break;
       case 2:
-        populateSourceCB(b, RawSource(value), model, POPULATE_GVARS);
+        populateSourceCB(b, RawSource(value), generalSettings, model, POPULATE_GVARS);
         break;
       case 3:
         b->clear();
diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
index 51c51200b..54f7fb61f 100644
--- a/companion/src/modeledit/expodialog.cpp
+++ b/companion/src/modeledit/expodialog.cpp
@@ -60,7 +60,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
 
   if (firmware->getCapability(VirtualInputs)) {
     ui->inputName->setMaxLength(4);
-    populateSourceCB(ui->sourceCB, ed->srcRaw, &model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS | POPULATE_TELEMETRY);
+    populateSourceCB(ui->sourceCB, ed->srcRaw, generalSettings, &model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS | POPULATE_TELEMETRY);
     ui->sourceCB->removeItem(0);
   }
   else {
diff --git a/companion/src/modeledit/heli.cpp b/companion/src/modeledit/heli.cpp
index 53d6541f9..391c1c328 100644
--- a/companion/src/modeledit/heli.cpp
+++ b/companion/src/modeledit/heli.cpp
@@ -48,11 +48,11 @@ void HeliPanel::update()
   lock = true;
 
   ui->swashType->setCurrentIndex(model->swashRingData.type);
-  populateSourceCB(ui->swashCollectiveSource, model->swashRingData.collectiveSource, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
+  populateSourceCB(ui->swashCollectiveSource, model->swashRingData.collectiveSource, generalSettings, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
   ui->swashRingVal->setValue(model->swashRingData.value);
   if (firmware->getCapability(VirtualInputs)) {
-    populateSourceCB(ui->swashElevatorSource, model->swashRingData.elevatorSource, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
-    populateSourceCB(ui->swashAileronSource, model->swashRingData.aileronSource, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
+    populateSourceCB(ui->swashElevatorSource, model->swashRingData.elevatorSource, generalSettings, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
+    populateSourceCB(ui->swashAileronSource, model->swashRingData.aileronSource, generalSettings, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
     ui->swashElevatorWeight->setValue(model->swashRingData.elevatorWeight);
     ui->swashAileronWeight->setValue(model->swashRingData.aileronWeight);
     ui->swashCollectiveWeight->setValue(model->swashRingData.collectiveWeight);
diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp
index 5a156b49c..4228b7141 100644
--- a/companion/src/modeledit/logicalswitches.cpp
+++ b/companion/src/modeledit/logicalswitches.cpp
@@ -301,7 +301,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
   {
     case LS_FAMILY_VOFS:
       mask |= SOURCE1_VISIBLE;
-      populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource1[i], source, generalSettings, model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
       cswitchOffset[i]->setDecimals(range.decimals);
       cswitchOffset[i]->setSingleStep(range.step);
       if (source.isTimeBased()) {
@@ -346,8 +346,8 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       break;
     case LS_FAMILY_VCOMP:
       mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE;
-      populateSourceCB(cswitchSource1[i], RawSource(model->logicalSw[i].val1), model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
-      populateSourceCB(cswitchSource2[i], RawSource(model->logicalSw[i].val2), model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource1[i], RawSource(model->logicalSw[i].val1), generalSettings, model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource2[i], RawSource(model->logicalSw[i].val2), generalSettings, model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
       break;
     case LS_FAMILY_TIMER:
       mask |= VALUE1_VISIBLE | VALUE2_VISIBLE;
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index 89596f610..12a754673 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -19,7 +19,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
 
     this->setWindowTitle(tr("DEST -> CH%1").arg(md->destCh));
 
-    populateSourceCB(ui->sourceCB, md->srcRaw, &model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
+    populateSourceCB(ui->sourceCB, md->srcRaw, generalSettings, &model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
     ui->sourceCB->removeItem(0);
 
     int limit = firmware->getCapability(OffsetWeight);