Issue #767 - Extra Pot (S3) support

companion/src/eeprominterface.h

@@ -162,7 +162,6 @@ enum HeliSwashTypes {
 #define BOARD_X9D_NUM_POTS  4
 #define C9X_NUM_POTS        4
 #define NUM_CAL_PPM         4
-#define NUM_PPM(board)      (IS_ARM(board) ? 16 : 8)
 #define NUM_CYC             3
 #define C9X_NUM_SWITCHES    10
 #define C9X_NUM_KEYS        6
@@ -1063,6 +1062,7 @@ enum Capability {
  GetThrSwitch,
  HasDisplayText,
  VirtualInputs,
+ TrainerInputs,
  LuaInputs,
  LimitsPer1000,
  EnhancedCurves,

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -671,6 +671,8 @@ int OpenTxInterface::getCapability(const Capability capability)
     case HasDisplayText:
     case VirtualInputs:
       return IS_TARANIS(board) ? 32 : 0;
+    case TrainerInputs:
+      return IS_ARM(board) ? 16 : 8;
     case LuaInputs:
     case LimitsPer1000:
     case EnhancedCurves:

companion/src/helpers.cpp

@@ -599,7 +599,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
 
-    for (int i=0; i<NUM_PPM(GetEepromInterface()->getBoard()); i++) {
+    for (int i=0; i<GetEepromInterface()->getCapability(TrainerInputs); i++) {
       item = RawSource(SOURCE_TYPE_PPM, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);

radio/src/audio_arm.cpp

@@ -381,7 +381,7 @@ void referenceModelAudioFiles()
       }
 
       // Switches Audio Files <switchname>-[up|mid|down].wav
-      for (int i=0; i<SWSRC_LAST_SWITCH+NUM_XPOTS*POTS_POS_COUNT && !found; i++) {
+      for (int i=0; i<SWSRC_LAST_SWITCH+NUM_XPOTS*XPOTS_MULTIPOS_COUNT && !found; i++) {
         getSwitchAudioFile(path, i);
         if (!strcmp(filename, fn)) {
           sdAvailableSwitchAudioFiles |= MASK_SWITCH_AUDIO_FILE(i);

radio/src/eeprom_conversions.cpp

@@ -212,12 +212,18 @@ PACK(typedef struct {
 
 }) ModelData_v215;
 
+#if defined(PCBTARANIS)
+  #define NUM_POTS_215 4
+#else
+  #define NUM_POTS_215 3
+#endif
+
 PACK(typedef struct {
   uint8_t   version;
   uint16_t  variant;
-  int16_t   calibMid[NUM_STICKS+NUM_POTS];
+  int16_t   calibMid[NUM_STICKS+NUM_POTS_215];
-  int16_t   calibSpanNeg[NUM_STICKS+NUM_POTS];
+  int16_t   calibSpanNeg[NUM_STICKS+NUM_POTS_215];
-  int16_t   calibSpanPos[NUM_STICKS+NUM_POTS];
+  int16_t   calibSpanPos[NUM_STICKS+NUM_POTS_215];
   uint16_t  chkSum;
 }) GeneralSettings_v215;
 
@@ -227,10 +233,14 @@ void ConvertGeneralSettings_215_to_216(EEGeneral &settings)
   memcpy(&oldSettings, &settings, sizeof(oldSettings));
 
   settings.version = 216;
-  for (int i=0; i<NUM_STICKS+NUM_POTS; i++) {
+  for (int i=0, j=0; i<NUM_STICKS+NUM_POTS; i++) {
-    settings.calib[i].mid = oldSettings.calibMid[i];
+    settings.calib[i].mid = oldSettings.calibMid[j];
-    settings.calib[i].spanNeg = oldSettings.calibSpanNeg[i];
+    settings.calib[i].spanNeg = oldSettings.calibSpanNeg[j];
-    settings.calib[i].spanPos = oldSettings.calibSpanPos[i];
+    settings.calib[i].spanPos = oldSettings.calibSpanPos[j];
+#if defined(PCBTARANIS)
+    if (i==POT3) continue;
+#endif
+    j++;
   }
   settings.chkSum = evalChkSum();
 }
@@ -270,6 +280,9 @@ int ConvertSource_215_to_216(int source, bool insertZero=false)
   // Virtual Inputs and Lua Outputs added
   if (source > 0)
     source += MAX_INPUTS + MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS;
+  // S3 added
+  if (source > MIXSRC_POT2)
+    source += 1;
   // PPM9-PPM16 added
   if (source > MIXSRC_FIRST_PPM+7)
     source += 8;
@@ -290,7 +303,7 @@ int ConvertSwitch_215_to_216(int swtch)
   else if (swtch <= SWSRC_LAST_SWITCH)
     return swtch;
   else
-    return swtch + (2*4) + (2*6); // 4 trims and 2 * 6-pos added as switches
+    return swtch + (2*4) + (3*6); // 4 trims and 2 * 6-pos added as switches
 }
 #else
 int ConvertSource_215_to_216(int source, bool insertZero=false)

radio/src/gui/menu_general.cpp

@@ -1154,7 +1154,7 @@ void menuGeneralDiagAna(uint8_t event)
 #if defined(PCBTARANIS)
   lcd_putsLeft(6*FH+1, STR_BATT_CALIB);
   static int32_t adcBatt;
-  adcBatt = ((adcBatt * 7) + anaIn(8)) / 8;
+  adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8;
   uint32_t batCalV = (adcBatt + (adcBatt*g_eeGeneral.vBatCalib)/128) * BATT_SCALE;
   batCalV >>= 11;
   batCalV += 2; // because of the diode
@@ -1162,7 +1162,7 @@ void menuGeneralDiagAna(uint8_t event)
 #elif defined(PCBSKY9X)
   lcd_putsLeft(5*FH+1, STR_BATT_CALIB);
   static int32_t adcBatt;
-  adcBatt = ((adcBatt * 7) + anaIn(7)) / 8;
+  adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8;
   uint32_t batCalV = (adcBatt + adcBatt*(g_eeGeneral.vBatCalib)/128) * 4191;
   batCalV /= 55296;
   putsVolts(LEN_CALIB_FIELDS*FW+4*FW, 5*FH+1, batCalV, (m_posVert==1 ? INVERS : 0));
@@ -1170,7 +1170,7 @@ void menuGeneralDiagAna(uint8_t event)
   lcd_putsLeft(6*FH-2, STR_BATT_CALIB);
   // Gruvin wants 2 decimal places and instant update of volts calib field when button pressed
   static uint16_t adcBatt;
-  adcBatt = ((adcBatt * 7) + anaIn(7)) / 8; // running average, sourced directly (to avoid unending debate :P)
+  adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8; // running average, sourced directly (to avoid unending debate :P)
   uint32_t batCalV = ((uint32_t)adcBatt*1390 + (10*(int32_t)adcBatt*g_eeGeneral.vBatCalib)/8) / BandGap;
   lcd_outdezNAtt(LEN_CALIB_FIELDS*FW+4*FW, 6*FH-2, batCalV, PREC2|(m_posVert==1 ? INVERS : 0));
 #else
@@ -1196,6 +1196,7 @@ void menuGeneralDiagAna(uint8_t event)
 enum menuGeneralHwItems {
   ITEM_SETUP_HW_POT1,
   ITEM_SETUP_HW_POT2,
+  ITEM_SETUP_HW_POT3,
   ITEM_SETUP_HW_UART3_MODE,
   ITEM_SETUP_HW_MAX
 };
@@ -1214,14 +1215,20 @@ void menuGeneralHardware(uint8_t event)
     switch(i) {
       case ITEM_SETUP_HW_POT1:
       case ITEM_SETUP_HW_POT2:
+      case ITEM_SETUP_HW_POT3:
       {
         int idx = i - ITEM_SETUP_HW_POT1;
-        uint8_t mask = (1<<idx);
+        uint8_t shift = (2*idx);
-        uint8_t potType = selectMenuItem(HW_SETTINGS_COLUMN, y, i==ITEM_SETUP_HW_POT1 ? STR_POT1TYPE : STR_POT2TYPE, STR_POTTYPES, (g_eeGeneral.potsType & mask) >> idx, 0, 1, attr, event);
+        uint8_t mask = (0x03 << shift);
-        if (potType)
+        putsMixerSource(sizeof(TR_TYPE)*FW, y, MIXSRC_FIRST_POT+idx);
-          g_eeGeneral.potsType |= mask;
+        uint8_t potType = (g_eeGeneral.potsType & mask) >> shift;
-        else
+        if (potType == POT_TYPE_NONE && i < 2)
-          g_eeGeneral.potsType &= ~mask;
+          potType = 1;
+        potType = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_TYPE, STR_POTTYPES, potType, 0, POT_TYPE_MAX, attr, event);
+        if (potType == POT_TYPE_POT && i < 2)
+          potType = 0;
+        g_eeGeneral.potsType &= ~mask;
+        g_eeGeneral.potsType |= (potType << shift);
         break;
       }
 
@@ -1234,7 +1241,6 @@ void menuGeneralHardware(uint8_t event)
 
     }
   }
-  	
 }
 
 #elif defined(PCBSKY9X)
@@ -1323,7 +1329,7 @@ void menuCommonCalib(uint8_t event)
 #if defined(PCBTARANIS)
       uint8_t idx = i - POT1;
       int count = reusableBuffer.calib.xpotsCalib[idx].stepsCount;
-      if (IS_MULTIPOS_POT(i) && count <= POTS_POS_COUNT) {
+      if (IS_POT_MULTIPOS(i) && count <= XPOTS_MULTIPOS_COUNT) {
         if (reusableBuffer.calib.xpotsCalib[idx].lastCount == 0 || vt < reusableBuffer.calib.xpotsCalib[idx].lastPosition - XPOT_DELTA || vt > reusableBuffer.calib.xpotsCalib[idx].lastPosition + XPOT_DELTA) {
           reusableBuffer.calib.xpotsCalib[idx].lastPosition = vt;
           reusableBuffer.calib.xpotsCalib[idx].lastCount = 1;
@@ -1341,7 +1347,7 @@ void menuCommonCalib(uint8_t event)
             }
           }
           if (!found) {
-            if (count < POTS_POS_COUNT) {
+            if (count < XPOTS_MULTIPOS_COUNT) {
               reusableBuffer.calib.xpotsCalib[idx].steps[count] = position;
             }
             reusableBuffer.calib.xpotsCalib[idx].stepsCount += 1;
@@ -1413,7 +1419,7 @@ void menuCommonCalib(uint8_t event)
       for (uint8_t i=POT1; i<=POT_LAST; i++) {
         int idx = i - POT1;
         int count = reusableBuffer.calib.xpotsCalib[idx].stepsCount;
-        if (IS_MULTIPOS_POT(i) && count > 1 && count <= POTS_POS_COUNT) {
+        if (IS_POT_MULTIPOS(i) && count > 1 && count <= XPOTS_MULTIPOS_COUNT) {
           for (int j=0; j<count; j++) {
             for (int k=j+1; k<count; k++) {
               if (reusableBuffer.calib.xpotsCalib[idx].steps[k] < reusableBuffer.calib.xpotsCalib[idx].steps[j]) {
@@ -1451,11 +1457,11 @@ void menuCommonCalib(uint8_t event)
     if (reusableBuffer.calib.state == 2) {
       steps = reusableBuffer.calib.xpotsCalib[i-POT1].stepsCount;
     }
-    else if (IS_MULTIPOS_POT(i)) {
+    else if (IS_POT_MULTIPOS(i)) {
       StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[i];
       steps = calib->count + 1;
     }
-    if (steps > 0 && steps <= POTS_POS_COUNT) {
+    if (steps > 0 && steps <= XPOTS_MULTIPOS_COUNT) {
       lcd_outdezAtt(LCD_W/2-2+(i-POT1)*5, LCD_H-6, steps, TINSIZE);
     }
   }

radio/src/gui/menus.cpp

@@ -1351,6 +1351,12 @@ bool isSourceAvailable(int source)
     return false;
 #endif
 
+#if defined(PCBTARANIS)
+  if (source>=MIXSRC_FIRST_POT && source<=MIXSRC_LAST_POT) {
+    return IS_POT_AVAILABLE(POT1+source-MIXSRC_FIRST_POT);
+  }
+#endif
+
 #if !defined(HELI)
   if (source>=MIXSRC_CYC1 && source<=MIXSRC_CYC3)
     return false;
@@ -1438,11 +1444,11 @@ bool isSwitchAvailableInLogicalSwitches(int swtch)
   }
 
 #if defined(PCBTARANIS)
-  if (swtch >= SWSRC_P11 && swtch <= SWSRC_P26) {
+  if (swtch >= SWSRC_FIRST_MULTIPOS_SWITCH && swtch <= SWSRC_LAST_MULTIPOS_SWITCH) {
-    int index = (swtch - SWSRC_P11) / POTS_POS_COUNT;
+    int index = (swtch - SWSRC_FIRST_MULTIPOS_SWITCH) / XPOTS_MULTIPOS_COUNT;
-    if (g_eeGeneral.potsType & (1<<index)) {
+    if (IS_POT_MULTIPOS(POT1+index)) {
       StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[POT1+index];
-      return (calib->count >= ((swtch - SWSRC_P11) % POTS_POS_COUNT));
+      return (calib->count >= ((swtch - SWSRC_FIRST_MULTIPOS_SWITCH) % XPOTS_MULTIPOS_COUNT));
     }
     else {
       return false;

radio/src/gui/view_main.cpp

@@ -122,8 +122,10 @@ void drawPotsBars()
   // Optimization by Mike Blandford
   uint8_t x, i, len ;  // declare temporary variables
   for (x=LCD_W/2-5, i=NUM_STICKS; i<NUM_STICKS+NUM_POTS; x+=5, i++) {
-    len = ((calibratedStick[i]+RESX)*BAR_HEIGHT/(RESX*2))+1l;  // calculate once per loop
+    if (IS_POT_AVAILABLE(i)) {
-    V_BAR(x, LCD_H-8, len)
+      len = ((calibratedStick[i]+RESX)*BAR_HEIGHT/(RESX*2))+1l;  // calculate once per loop
+      V_BAR(x, LCD_H-8, len)
+    }
   }
 }
 
@@ -196,8 +198,11 @@ void displayTrims(uint8_t phase)
 void displaySliders()
 {
   for (uint8_t i=NUM_STICKS; i<NUM_STICKS+NUM_POTS; i++) {
-    xcoord_t x = (i%2 ? LCD_W-5 : 3);
+    if (i == POT3) {
-    int8_t y = (i>NUM_STICKS+1 ? LCD_H/2+1 : 1);
+      continue;
+    }
+    xcoord_t x = ((i==POT1 || i==SLIDER1) ? 3 : LCD_W-5);
+    int8_t y = (i>=SLIDER1 ? LCD_H/2+1 : 1);
     lcd_vline(x, y, LCD_H/2-2);
     lcd_vline(x+1, y, LCD_H/2-2);
     y += LCD_H/2-4;

radio/src/logs.cpp

@@ -147,7 +147,7 @@ const pm_char * openLogs()
 #endif
 
 #if defined(PCBTARANIS)
-    f_puts("Rud,Ele,Thr,Ail,S1,S2,LS,RS,SA,SB,SC,SD,SE,SF,SG,SH\n", &g_oLogFile);
+    f_puts("Rud,Ele,Thr,Ail,S1,S2,S3,LS,RS,SA,SB,SC,SD,SE,SF,SG,SH\n", &g_oLogFile);
 #else
     f_puts("Rud,Ele,Thr,Ail,P1,P2,P3,THR,RUD,ELE,ID0,ID1,ID2,AIL,GEA,TRN\n", &g_oLogFile);
 #endif

radio/src/myeeprom.h

@@ -68,52 +68,62 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define MAX_MODELS  60
+  #define MAX_MODELS    60
-  #define NUM_CHNOUT  32 // number of real output channels CH1-CH32
+  #define NUM_CHNOUT    32 // number of real output channels CH1-CH32
-  #define MAX_PHASES  9
+  #define MAX_PHASES    9
-  #define MAX_MIXERS  64
+  #define MAX_MIXERS    64
-  #define MAX_EXPOS   64
+  #define MAX_EXPOS     64
-  #define NUM_CSW     32 // number of custom switches
+  #define NUM_CSW       32 // number of custom switches
-  #define NUM_CFN     64 // number of functions assigned to switches
+  #define NUM_CFN       64 // number of functions assigned to switches
-  #define MAX_SCRIPTS 7
+  #define MAX_SCRIPTS   7
-  #define MAX_INPUTS  32
+  #define MAX_INPUTS    32
-  #define NUM_PPM     16
+  #define NUM_PPM       16
+  #define NUM_POTS      5
+  #define NUM_XPOTS     3
 #elif defined(CPUARM)
-  #define MAX_MODELS  60
+  #define MAX_MODELS    60
-  #define NUM_CHNOUT  32 // number of real output channels CH1-CH32
+  #define NUM_CHNOUT    32 // number of real output channels CH1-CH32
-  #define MAX_PHASES  9
+  #define MAX_PHASES    9
-  #define MAX_MIXERS  64
+  #define MAX_MIXERS    64
-  #define MAX_EXPOS   32
+  #define MAX_EXPOS     32
-  #define NUM_CSW     32 // number of custom switches
+  #define NUM_CSW       32 // number of custom switches
-  #define NUM_CFN     64 // number of functions assigned to switches
+  #define NUM_CFN       64 // number of functions assigned to switches
-  #define NUM_PPM     16
+  #define NUM_PPM       16
+  #define NUM_POTS      3
+  #define NUM_XPOTS     0
 #elif defined(CPUM2560) || defined(CPUM2561)
-  #define MAX_MODELS  30
+  #define MAX_MODELS    30
-  #define NUM_CHNOUT  16 // number of real output channels CH1-CH16
+  #define NUM_CHNOUT    16 // number of real output channels CH1-CH16
-  #define MAX_PHASES  6
+  #define MAX_PHASES    6
-  #define MAX_MIXERS  32
+  #define MAX_MIXERS    32
-  #define MAX_EXPOS   16
+  #define MAX_EXPOS     16
-  #define NUM_CSW     15 // number of custom switches
+  #define NUM_CSW       15 // number of custom switches
-  #define NUM_CFN     24 // number of functions assigned to switches
+  #define NUM_CFN       24 // number of functions assigned to switches
-  #define NUM_PPM     8
+  #define NUM_PPM       8
+  #define NUM_POTS      3
+  #define NUM_XPOTS     0
 #elif defined(CPUM128)
-  #define MAX_MODELS  30
+  #define MAX_MODELS    30
-  #define NUM_CHNOUT  16 // number of real output channels CH1-CH16
+  #define NUM_CHNOUT    16 // number of real output channels CH1-CH16
-  #define MAX_PHASES  5
+  #define MAX_PHASES    5
-  #define MAX_MIXERS  32
+  #define MAX_MIXERS    32
-  #define MAX_EXPOS   14
+  #define MAX_EXPOS     14
-  #define NUM_CSW     15 // number of custom switches
+  #define NUM_CSW       15 // number of custom switches
-  #define NUM_CFN     24 // number of functions assigned to switches
+  #define NUM_CFN       24 // number of functions assigned to switches
-  #define NUM_PPM     8
+  #define NUM_PPM       8
+  #define NUM_POTS      3
+  #define NUM_XPOTS     0
 #else
-  #define MAX_MODELS  16
+  #define MAX_MODELS    16
-  #define NUM_CHNOUT  16 // number of real output channels CH1-CH16
+  #define NUM_CHNOUT    16 // number of real output channels CH1-CH16
-  #define MAX_PHASES  5
+  #define MAX_PHASES    5
-  #define MAX_MIXERS  32
+  #define MAX_MIXERS    32
-  #define MAX_EXPOS   14
+  #define MAX_EXPOS     14
-  #define NUM_CSW     12 // number of custom switches
+  #define NUM_CSW       12 // number of custom switches
-  #define NUM_CFN     16 // number of functions assigned to switches
+  #define NUM_CFN       16 // number of functions assigned to switches
-  #define NUM_PPM     8
+  #define NUM_PPM       8
+  #define NUM_POTS      3
+  #define NUM_XPOTS     0
 #endif
 
 #define MAX_TIMERS    2
@@ -333,12 +343,12 @@ enum BacklightMode {
   #define SPLASH_MODE uint8_t splashMode:1; uint8_t spare4:2
 #endif
 
-#define POTS_POS_COUNT 6
+#define XPOTS_MULTIPOS_COUNT 6
 
 #if defined(PCBTARANIS)
 PACK(typedef struct {
   uint8_t count;
-  uint8_t steps[POTS_POS_COUNT-1];
+  uint8_t steps[XPOTS_MULTIPOS_COUNT-1];
 }) StepsCalibData;
 #endif
 
@@ -1304,10 +1314,8 @@ enum SwitchSources {
   SWSRC_LAST_SWITCH = SWSRC_TRAINER,
 
 #if defined(PCBTARANIS)
-  SWSRC_P11,
+  SWSRC_FIRST_MULTIPOS_SWITCH,
-  SWSRC_P16 = SWSRC_P11+5,
+  SWSRC_LAST_MULTIPOS_SWITCH = SWSRC_FIRST_MULTIPOS_SWITCH + (NUM_XPOTS*XPOTS_MULTIPOS_COUNT) - 1,
-  SWSRC_P21,
-  SWSRC_P26 = SWSRC_P21+5,
 #endif
 
   SWSRC_FIRST_TRIM,
@@ -1368,11 +1376,12 @@ enum MixSources {
 
   MIXSRC_FIRST_POT,
 #if defined(PCBTARANIS)
-  MIXSRC_S1 = MIXSRC_FIRST_POT,
+  MIXSRC_POT1 = MIXSRC_FIRST_POT,
-  MIXSRC_S2,
+  MIXSRC_POT2,
-  MIXSRC_S3,
+  MIXSRC_POT3,
-  MIXSRC_S4,
+  MIXSRC_SLIDER1,
-  MIXSRC_LAST_POT = MIXSRC_S4,
+  MIXSRC_SLIDER2,
+  MIXSRC_LAST_POT = MIXSRC_SLIDER2,
 #else
   MIXSRC_P1 = MIXSRC_FIRST_POT,
   MIXSRC_P2,

radio/src/opentx.cpp

@@ -520,7 +520,7 @@ uint16_t evalChkSum()
 {
   uint16_t sum = 0;
   const int16_t *calibValues = (const int16_t *) &g_eeGeneral.calib[0];
-  for (int i=0; i<NUM_STICKS+NUM_POTS+5; i++)
+  for (int i=0; i<12; i++)
     sum += calibValues[i];
   return sum;
 }
@@ -1404,7 +1404,7 @@ void getSwitchesPosition(bool startup)
   for (int i=0; i<NUM_XPOTS; i++) {
     if (g_eeGeneral.potsType & (1 << i)) {
       StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[POT1+i];
-      if (calib->count>0 && calib->count<POTS_POS_COUNT) {
+      if (calib->count>0 && calib->count<XPOTS_MULTIPOS_COUNT) {
         uint8_t pos = anaIn(POT1+i) / (2*RESX/calib->count);
         uint8_t previousPos = potsPos[i] >> 4;
         uint8_t previousStoredPos = potsPos[i] & 0x0F;
@@ -1416,7 +1416,7 @@ void getSwitchesPosition(bool startup)
           potsLastposStart[i] = 0;
           potsPos[i] = (pos << 4) | pos;
           if (previousStoredPos != pos) {
-            PLAY_SWITCH_MOVED(SWSRC_LAST_SWITCH+i*POTS_POS_COUNT+pos);
+            PLAY_SWITCH_MOVED(SWSRC_LAST_SWITCH+i*XPOTS_MULTIPOS_COUNT+pos);
           }
         }
       }
@@ -1424,7 +1424,7 @@ void getSwitchesPosition(bool startup)
   }
 }
 #define SWITCH_POSITION(sw)  (switchesPos & (1<<(sw)))
-#define POT_POSITION(sw)     ((potsPos[(sw)/POTS_POS_COUNT] & 0x0f) == ((sw) % POTS_POS_COUNT))
+#define POT_POSITION(sw)     ((potsPos[(sw)/XPOTS_MULTIPOS_COUNT] & 0x0f) == ((sw) % XPOTS_MULTIPOS_COUNT))
 #else
 #define getSwitchesPosition(...)
 #define SWITCH_POSITION(idx) switchState((EnumKeys)(SW_BASE+(idx)))
@@ -1464,8 +1464,8 @@ bool getSwitch(int8_t swtch)
 #endif
   }
 #if defined(PCBTARANIS)
-  else if (cs_idx <= SWSRC_P26) {
+  else if (cs_idx <= SWSRC_LAST_MULTIPOS_SWITCH) {
-    result = POT_POSITION(cs_idx-SWSRC_P11);
+    result = POT_POSITION(cs_idx-SWSRC_FIRST_MULTIPOS_SWITCH);
   }
 #endif
   else if (cs_idx <= SWSRC_LAST_TRIM) {
@@ -2815,7 +2815,7 @@ void getADC()
 #if defined(PCBTARANIS)
     if (s_noScroll) v = temp[x] >> 1;
     StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[x];
-    if (!s_noScroll && IS_MULTIPOS_POT(x) && calib->count>0 && calib->count<POTS_POS_COUNT) {
+    if (!s_noScroll && 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++) {
@@ -3078,7 +3078,7 @@ void evalInputs(uint8_t mode)
 
 #ifndef SIMU
     if (i < NUM_STICKS+NUM_POTS) {
-      if (IS_MULTIPOS_POT(i)) {
+      if (IS_POT_MULTIPOS(i)) {
         v -= RESX;
       }
       else {

radio/src/opentx.h

@@ -378,8 +378,6 @@ enum EnumKeys {
 #if defined(PCBTARANIS)
   #define NUM_SWITCHES  8
   #define IS_3POS(sw)   ((sw) != 5 && (sw) != 7)
-  #define NUM_POTS      4
-  #define NUM_XPOTS     2
   #define NUM_SW_SRCRAW 8
   #define SWSRC_THR     SWSRC_SF2
   #define SWSRC_GEA     SWSRC_SG2
@@ -391,8 +389,6 @@ enum EnumKeys {
   #define NUM_SWITCHES  7
   #define IS_3POS(sw)   ((sw) == 0)
   #define IS_MOMENTARY(sw) (sw == SWSRC_TRN)
-  #define NUM_POTS      3
-  #define NUM_XPOTS     0
   #define NUM_SW_SRCRAW 1
   #define SW_DSM2_BIND  SW_TRN
 #endif
@@ -413,10 +409,19 @@ enum EnumKeys {
 
 #include "myeeprom.h"
 
+enum PotType {
+  POT_TYPE_NONE,
+  POT_TYPE_POT,
+  POT_TYPE_MULTIPOS,
+  POT_TYPE_MAX=POT_TYPE_MULTIPOS
+};
+
 #if defined(PCBTARANIS)
-  #define IS_MULTIPOS_POT(x)   ((x)>=POT1 && (x)<=POT_LAST && (g_eeGeneral.potsType & (1 << ((x)-POT1))))
+  #define IS_POT_AVAILABLE(x)  ((x)!=POT3 || (g_eeGeneral.potsType & (0x03 << (2*((x)-POT1))))!=POT_TYPE_NONE)
+  #define IS_POT_MULTIPOS(x)   ((x)>=POT1 && (x)<=POT_LAST && ((g_eeGeneral.potsType>>(2*((x)-POT1)))&0x03)==POT_TYPE_MULTIPOS)
 #else
-  #define IS_MULTIPOS_POT(x)   (false)
+  #define IS_POT_AVAILABLE(x)  (true)
+  #define IS_POT_MULTIPOS(x)   (false)
 #endif
 
 #if ROTARY_ENCODERS > 0
@@ -1044,7 +1049,8 @@ enum Analogs {
 #if defined(PCBTARANIS)
   POT1,
   POT2,
-  POT_LAST = POT2,
+  POT3,
+  POT_LAST = POT3,
   SLIDER1,
   SLIDER2,
 #else
@@ -1603,7 +1609,7 @@ union ReusableBuffer
 #if defined(PCBTARANIS)
         struct {
           uint8_t stepsCount;
-          int16_t steps[POTS_POS_COUNT];
+          int16_t steps[XPOTS_MULTIPOS_COUNT];
           uint8_t lastCount;
           int16_t lastPosition;
         } xpotsCalib[NUM_XPOTS];

radio/src/simu.cpp

@@ -407,18 +407,18 @@ uint16_t anaIn(uint8_t chan)
   else if (chan<NUM_STICKS+NUM_POTS)
     return th9xSim->knobs[chan-NUM_STICKS]->getValue();
 #if defined(PCBTARANIS)
-  else if (chan == 8)
+  else if (chan == TX_VOLTAGE)
     return 1000;
 #elif defined(PCBSKY9X)
-  else if (chan == 7)
+  else if (chan == TX_VOLTAGE)
     return 1500;
-  else if (chan == 8)
+  else if (chan == TX_CURRENT)
     return 100;
 #elif defined(PCBGRUVIN9X)
-  else if (chan == 7)
+  else if (chan == TX_VOLTAGE)
     return 150;
 #else
-  else if (chan == 7)
+  else if (chan == TX_VOLTAGE)
     return 1500;
 #endif
   else

radio/src/targets/taranis/adc_driver.cpp

@@ -60,9 +60,9 @@
 
 volatile uint16_t Analog_values[NUMBER_ANALOG];
 #if defined(REV4a)
-const char ana_direction[NUMBER_ANALOG] = {0,1,0,1,  1,1,1,0,  0};
+const char ana_direction[NUMBER_ANALOG] = {0,1,0,1,  1,1,0,1,0,  0};
 #elif !defined(REV3)
-const char ana_direction[NUMBER_ANALOG] = {0,1,0,1,  1,0,1,0,  0};
+const char ana_direction[NUMBER_ANALOG] = {0,1,0,1,  1,0,0,1,0,  0};
 #endif
 
 void adcInit()
@@ -88,7 +88,7 @@ void adcInit()
   ADC1->CR1 = ADC_CR1_SCAN ;
   ADC1->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS ;
   ADC1->SQR1 = (NUMBER_ANALOG-1) << 20 ;             // NUMBER_ANALOG Channels
-  ADC1->SQR2 = SLIDE_L + (SLIDE_R<<5) + (BATTERY<<10) ;
+  ADC1->SQR2 = (SLIDE_L<<5) + (SLIDE_R<<10) + (BATTERY<<15) ;
   ADC1->SQR3 = STICK_LH + (STICK_LV<<5) + (STICK_RV<<10) + (STICK_RH<<15) + (POT_L<<20) + (POT_R<<25) ;
   ADC1->SMPR1 = SAMPTIME + (SAMPTIME<<3) + (SAMPTIME<<6) + (SAMPTIME<<9) + (SAMPTIME<<12)
                                                           + (SAMPTIME<<15) + (SAMPTIME<<18) + (SAMPTIME<<21) + (SAMPTIME<<24) ;
@@ -120,7 +120,6 @@ void adcRead()
     }
   }
   DMA2_Stream0->CR &= ~DMA_SxCR_EN ;              // Disable DMA
-  // return ( i < 10000 ) ? 1 : 0 ;
 
 #if !defined(REV3)
   // adc direction correct
@@ -136,9 +135,3 @@ void adcRead()
 void adcStop()
 {
 }
-
-
-
-
-
-

radio/src/translations.cpp

@@ -498,8 +498,6 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
   const pm_char STR_POTWARNING[] PROGMEM = TR_POTWARNING;
   const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST;
   const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE;
-  const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE;
-  const pm_char STR_POT2TYPE[] PROGMEM = TR_POT2TYPE;
 #endif
 
 #if MENUS_LOCK == 1

radio/src/translations.h

@@ -689,8 +689,6 @@ extern const pm_char STR_VIEW_TEXT[];
   extern const pm_char STR_POTWARNING[];
   extern const pm_char STR_CHECKLIST[];
   extern const pm_char STR_UART3MODE[];
-  extern const pm_char STR_POT1TYPE[];
-  extern const pm_char STR_POT2TYPE[];
 #endif
 
 #if MENUS_LOCK == 1

radio/src/translations/cz.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW            "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial port"
-#define TR_POT1TYPE            "S1 Type"
-#define TR_POT2TYPE            "S2 Type"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL        "Max RSSI"

radio/src/translations/de.h.txt

@@ -344,7 +344,7 @@
 #define LEN_VSRCRAW            "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "  //4 Potis S1,S2,Links,Rechts  
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "  //4 Potis S1,S2,Links,Rechts  
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -378,7 +378,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW
@@ -720,8 +720,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial Port"
-#define TR_POT1TYPE            "S1 Type"
-#define TR_POT2TYPE            "S2 Type"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL   "Max RSSI"

radio/src/translations/en.h.txt

@@ -72,7 +72,7 @@
 #define TR_UART3MODES          "OFF\0           ""S-Port Mirror\0 ""Debug\0         "
 
 #define LEN_POTTYPES           "\017"
-#define TR_POTTYPES            "Pot\0           ""Multipos Switch"
+#define TR_POTTYPES            "None\0          ""Pot\0           ""Multipos Switch"
 
 #define LEN_DATETIME           "\005"
 #define TR_DATETIME            "DATE:""TIME:"
@@ -347,7 +347,7 @@
 #define LEN_VSRCRAW            "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -381,7 +381,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -723,8 +723,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial port"
-#define TR_POT1TYPE            "S1 Type"
-#define TR_POT2TYPE            "S2 Type"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "Max RSSI"

radio/src/translations/es.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW            "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial port"
-#define TR_POT1TYPE            "S1 Type"
-#define TR_POT2TYPE            "S2 Type"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "Max RSSI"

radio/src/translations/fi.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW            "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial port"
-#define TR_POT1TYPE            "S1 Type"
-#define TR_POT2TYPE            "S2 Type"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "Max RSSI"

radio/src/translations/fr.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW      "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Afficher notes"
 #define TR_FAS_OFFSET          TR(INDENT "Corr FAS", INDENT "Correction FAS")
 #define TR_UART3MODE           "Port série"
-#define TR_POT1TYPE            "Type S1"
-#define TR_POT2TYPE            "Type S2"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "RSSI Max"

radio/src/translations/it.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW      "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial port"
-#define TR_POT1TYPE            "S1 Type"
-#define TR_POT2TYPE            "S2 Type"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "Max RSSI"

radio/src/translations/pl.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW            "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "GAZ""SK""SW""LOL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Port szreg."
-#define TR_POT1TYPE            "Typ S1"
-#define TR_POT2TYPE            "Typ S2"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "Maks RSSI"

radio/src/translations/pt.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW      "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serial port"
-#define TR_POT1TYPE            "S1 Type"
-#define TR_POT2TYPE            "S2 Type"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "Max RSSI"

radio/src/translations/se.h.txt

@@ -337,7 +337,7 @@
 #define LEN_VSRCRAW            "\004"
 
 #if defined(PCBTARANIS)
-  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""LS\0 ""RS\0 "
+  #define TR_POTS_VSRCRAW      "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 "
   #define TR_SW_VSRCRAW        "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #elif defined(EXTRA_3POS)
   #define TR_POTS_VSRCRAW      "P1\0 ""P2\0 "
@@ -371,7 +371,7 @@
 #endif
 
 #if defined(PCBTARANIS)
-  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
+  #define TR_6POS_POTS         "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36"
   #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
 #elif defined(CPUARM)
   #define TR_VSWITCHES         TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW
@@ -713,8 +713,6 @@
 #define TR_CHECKLIST           "Display Checklist"
 #define TR_FAS_OFFSET          TR(INDENT "FAS Ofs", INDENT "FAS Offset")
 #define TR_UART3MODE           "Serieporten"
-#define TR_POT1TYPE            "S1-ratten"
-#define TR_POT2TYPE            "S2-ratten"
 
 #if defined(MAVLINK)
   #define TR_MAVLINK_RC_RSSI_SCALE_LABEL  "Max RSSI"