Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 14:25:11 +03:00
Code Issues Wiki Activity

[Taranis] Support for the 6POS Pots

Browse source
This commit is contained in:
Bertrand Songis 2013-12-31 13:02:53 +01:00
parent 64419ffd3f
commit 1c8b865d89
17 changed files with 101 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

20
radio/src/eeprom_conversions.cpp
View file

@ -177,6 +177,21 @@ void ConvertGeneralSettings_215_to_216(EEGeneral &settings)
settings.version = 216; settings.version = 216;
} }
#if defined(PCBTARANIS)
int ConvertSwitch_215_to_216(int swtch)
{
if (swtch < SWSRC_ON)
return swtch;
else
return swtch + (2*6); // 2 * 6-pos pots added as switches
}
#else
inline int ConvertSwitch_215_to_216(int swtch)
{
return swtch;
}
#endif
void ConvertModel_215_to_216(ModelData &model) void ConvertModel_215_to_216(ModelData &model)
{ {
// Virtual inputs added instead of Expo/DR // Virtual inputs added instead of Expo/DR
@ -188,6 +203,7 @@ void ConvertModel_215_to_216(ModelData &model)
// Custom Switches: better precision for x when A comes from telemetry // Custom Switches: better precision for x when A comes from telemetry
// Main View: altitude in top bar // Main View: altitude in top bar
// Mixes: GVARS in weight moved from 512 to 4096 and -512 to -4096, because GVARS may be used in limits [-1250:1250] // Mixes: GVARS in weight moved from 512 to 4096 and -512 to -4096, because GVARS may be used in limits [-1250:1250]
// Switches: two 6-pos pots added
TRACE("Model conversion from v215 to v216"); TRACE("Model conversion from v215 to v216");
@ -221,7 +237,7 @@ void ConvertModel_215_to_216(ModelData &model)
g_model.mixData[i].phases = oldModel.mixData[i].phases; g_model.mixData[i].phases = oldModel.mixData[i].phases;
g_model.mixData[i].mltpx = oldModel.mixData[i].mltpx; g_model.mixData[i].mltpx = oldModel.mixData[i].mltpx;
g_model.mixData[i].weight = oldModel.mixData[i].weight; g_model.mixData[i].weight = oldModel.mixData[i].weight;
g_model.mixData[i].swtch = oldModel.mixData[i].swtch; g_model.mixData[i].swtch = ConvertSwitch_215_to_216(oldModel.mixData[i].swtch);
if (oldModel.mixData[i].curveMode==0/*differential*/) { if (oldModel.mixData[i].curveMode==0/*differential*/) {
g_model.mixData[i].curve.type = CURVE_REF_DIFF; g_model.mixData[i].curve.type = CURVE_REF_DIFF;
g_model.mixData[i].curve.value = oldModel.mixData[i].curveParam; g_model.mixData[i].curve.value = oldModel.mixData[i].curveParam;
@ -281,7 +297,7 @@ void ConvertModel_215_to_216(ModelData &model)
} }
g_model.expoData[i].srcRaw = MIXSRC_Rud+chn; g_model.expoData[i].srcRaw = MIXSRC_Rud+chn;
g_model.expoData[i].chn = chn; g_model.expoData[i].chn = chn;
g_model.expoData[i].swtch = oldModel.expoData[i].swtch; g_model.expoData[i].swtch = ConvertSwitch_215_to_216(oldModel.expoData[i].swtch);
g_model.expoData[i].phases = oldModel.expoData[i].phases; g_model.expoData[i].phases = oldModel.expoData[i].phases;
g_model.expoData[i].weight = oldModel.expoData[i].weight; g_model.expoData[i].weight = oldModel.expoData[i].weight;
memcpy(&g_model.expoData[i].name, &oldModel.expoData[i].name, LEN_EXPOMIX_NAME); memcpy(&g_model.expoData[i].name, &oldModel.expoData[i].name, LEN_EXPOMIX_NAME);

4
radio/src/gtests.cpp
View file

@ -295,8 +295,8 @@ TEST(FrSkySPORT, checkCrc)
TEST(getSwitch, undefCSW) TEST(getSwitch, undefCSW)
{ {
MODEL_RESET(); MODEL_RESET();
EXPECT_EQ(getSwitch(MAX_PSWITCH), false); EXPECT_EQ(getSwitch(NUM_PSWITCH), false);
EXPECT_EQ(getSwitch(-MAX_PSWITCH), true); // no good answer there! EXPECT_EQ(getSwitch(-NUM_PSWITCH), true); // no good answer there!
} }
#endif #endif

6
radio/src/gui/menu_model.cpp
View file

@ -1055,7 +1055,7 @@ void menuModelSetup(uint8_t event)
div_t qr = div(timer->start, 60); div_t qr = div(timer->start, 60);
switch (m_posHorz) { switch (m_posHorz) {
case 0: case 0:
CHECK_INCDEC_MODELVAR(event, timer->mode, -2*(MAX_PSWITCH+NUM_CSW), TMR_VAROFS-1+2*(MAX_PSWITCH+NUM_CSW)); CHECK_INCDEC_MODELVAR(event, timer->mode, -2*(NUM_PSWITCH+NUM_CSW), TMR_VAROFS-1+2*(NUM_PSWITCH+NUM_CSW));
break; break;
case 1: case 1:
CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59); CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59);
@ -1835,7 +1835,7 @@ void menuModelFlightModesAll(uint8_t event)
} }
else { else {
putsSwitches((5+LEN_FP_NAME)*FW+FW/2, y, p->swtch, attr); putsSwitches((5+LEN_FP_NAME)*FW+FW/2, y, p->swtch, attr);
if (active) CHECK_INCDEC_MODELSWITCH(event, p->swtch, -MAX_SWITCH, MAX_SWITCH); if (active) CHECK_INCDEC_MODELSWITCH(event, p->swtch, -NUM_SWITCH, NUM_SWITCH);
} }
break; break;
@ -4290,7 +4290,7 @@ void menuModelCustomSwitchOne(uint8_t event)
case CSW_FIELD_ANDSW: case CSW_FIELD_ANDSW:
lcd_putsLeft(y, STR_AND_SWITCH); lcd_putsLeft(y, STR_AND_SWITCH);
putsSwitches(CSWONE_2ND_COLUMN, y, cs->andsw, attr); putsSwitches(CSWONE_2ND_COLUMN, y, cs->andsw, attr);
if (attr) CHECK_INCDEC_MODELVAR(event, cs->andsw, -MAX_SWITCH, MAX_SWITCH); if (attr) CHECK_INCDEC_MODELVAR(event, cs->andsw, -NUM_SWITCH, NUM_SWITCH);
break; break;
case CSW_FIELD_DURATION: case CSW_FIELD_DURATION:
lcd_putsLeft(y, STR_DURATION); lcd_putsLeft(y, STR_DURATION);

10
radio/src/gui/menus.cpp
View file

@ -232,13 +232,13 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
if (event == EVT_KEY_LONG(KEY_ENTER) && i_max > SWSRC_ON) { if (event == EVT_KEY_LONG(KEY_ENTER) && i_max > SWSRC_ON) {
s_editMode = !s_editMode; s_editMode = !s_editMode;
if (newval > SWSRC_ON) if (newval > SWSRC_ON)
newval -= (MAX_SWITCH+1); newval -= (NUM_SWITCH+1);
else if (newval > 0) else if (newval > 0)
newval += (MAX_SWITCH+1); newval += (NUM_SWITCH+1);
else if (newval < SWSRC_OFF) else if (newval < SWSRC_OFF)
newval += (MAX_SWITCH+1); newval += (NUM_SWITCH+1);
else if (newval < 0) else if (newval < 0)
newval -= (MAX_SWITCH+1); newval -= (NUM_SWITCH+1);
} }
} }
#endif #endif
@ -976,7 +976,7 @@ int8_t switchMenuItem(uint8_t x, uint8_t y, int8_t value, LcdFlags attr, uint8_t
{ {
lcd_putsColumnLeft(x, y, STR_SWITCH); lcd_putsColumnLeft(x, y, STR_SWITCH);
putsSwitches(x, y, value, attr); putsSwitches(x, y, value, attr);
if (attr) CHECK_INCDEC_MODELSWITCH(event, value, -MAX_SWITCH, MAX_SWITCH); if (attr) CHECK_INCDEC_MODELSWITCH(event, value, -NUM_SWITCH, NUM_SWITCH);
return value; return value;
} }

2
radio/src/lcd.cpp
View file

@ -1097,7 +1097,7 @@ void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
return; return;
} }
if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) { if (mode >= TMR_VAROFS+NUM_PSWITCH+NUM_CSW) {
mode++; mode++;
} }

13
radio/src/myeeprom.h
View file

@ -639,7 +639,7 @@ PACK( union u_int8int16_t {
#if defined(CPUARM) #if defined(CPUARM)
#define MAX_CSW_DURATION 120 /*60s*/ #define MAX_CSW_DURATION 120 /*60s*/
#define MAX_CSW_DELAY 120 /*60s*/ #define MAX_CSW_DELAY 120 /*60s*/
#define MAX_CSW_ANDSW MAX_SWITCH #define MAX_CSW_ANDSW NUM_SWITCH
typedef int16_t csw_telemetry_value_t; typedef int16_t csw_telemetry_value_t;
PACK(typedef struct t_CustomSwData { // Custom Switches data PACK(typedef struct t_CustomSwData { // Custom Switches data
int16_t v1; int16_t v1;
@ -1140,6 +1140,8 @@ enum SwitchSources {
#endif #endif
SWSRC_FIRST_CSW, SWSRC_FIRST_CSW,
SWSRC_LAST_SWITCH = SWSRC_FIRST_CSW-1,
SWSRC_SW1 = SWSRC_FIRST_CSW, SWSRC_SW1 = SWSRC_FIRST_CSW,
SWSRC_SW2, SWSRC_SW2,
SWSRC_SW3, SWSRC_SW3,
@ -1154,10 +1156,17 @@ enum SwitchSources {
SWSRC_SWC, SWSRC_SWC,
SWSRC_LAST_CSW = SWSRC_SW1+NUM_CSW-1, SWSRC_LAST_CSW = SWSRC_SW1+NUM_CSW-1,
#if defined(PCBTARANIS)
SWSRC_P11,
SWSRC_P16 = SWSRC_P11+5,
SWSRC_P21,
SWSRC_P26 = SWSRC_P21+5,
#endif
SWSRC_ON, SWSRC_ON,
SWSRC_FIRST_MOMENT_SWITCH, SWSRC_FIRST_MOMENT_SWITCH,
SWSRC_LAST_MOMENT_SWITCH = SWSRC_FIRST_MOMENT_SWITCH+SWSRC_ON-1, SWSRC_LAST_MOMENT_SWITCH = SWSRC_FIRST_MOMENT_SWITCH+SWSRC_LAST_CSW,
#if !defined(PCBSTD) #if !defined(PCBSTD)
SWSRC_TRAINER_SHORT, SWSRC_TRAINER_SHORT,

61
radio/src/opentx.cpp
View file

@ -1301,6 +1301,8 @@ uint8_t cswStates[NUM_CSW];
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
tmr10ms_t switchesMidposStart[6] = { 0 }; tmr10ms_t switchesMidposStart[6] = { 0 };
uint32_t switchesPos = 0; uint32_t switchesPos = 0;
tmr10ms_t potsLastposStart[2];
uint8_t potsPos[2];
#define DELAY_SWITCH_3POS 10/*100ms*/ #define DELAY_SWITCH_3POS 10/*100ms*/
#define CHECK_2POS(sw) newPos |= (switchState(sw ## 0) ? (1 << (sw ## 0 - SW_SA0)) : (1 << (sw ## 0 - SW_SA0 + 1))) #define CHECK_2POS(sw) newPos |= (switchState(sw ## 0) ? (1 << (sw ## 0 - SW_SA0)) : (1 << (sw ## 0 - SW_SA0 + 1)))
#define CHECK_3POS(idx, sw) if (switchState(sw ## 0)) { \ #define CHECK_3POS(idx, sw) if (switchState(sw ## 0)) { \
@ -1321,8 +1323,7 @@ uint32_t switchesPos = 0;
} \ } \
newPos |= (switchesPos & (0x7 << (sw ## 0 - SW_SA0))); \ newPos |= (switchesPos & (0x7 << (sw ## 0 - SW_SA0))); \
} }
#define SWITCH_POSITION(sw) (switchesPos & (1<<(sw))) void getSwitchesPosition()
void get3POSSwitchesPosition()
{ {
uint32_t newPos = 0; uint32_t newPos = 0;
CHECK_3POS(0, SW_SA); CHECK_3POS(0, SW_SA);
@ -1334,9 +1335,26 @@ void get3POSSwitchesPosition()
CHECK_3POS(5, SW_SG); CHECK_3POS(5, SW_SG);
CHECK_2POS(SW_SH); CHECK_2POS(SW_SH);
switchesPos = newPos; switchesPos = newPos;
for (int i=0; i<2; i++) {
int val = RESX + (int16_t)anaIn(POT1+i) + (RESX / 5);
uint8_t pos = limit<uint8_t>(0, val / (2*RESX/5), 5);
uint8_t previousPos = potsPos[i] >> 4;
if (pos != previousPos) {
potsLastposStart[i] = get_tmr10ms();
potsPos[i] = (pos << 4) | (potsPos[i] & 0x0f);
}
else if ((tmr10ms_t)(get_tmr10ms() - potsLastposStart[i]) > DELAY_SWITCH_3POS) {
potsLastposStart[i] = 0;
potsPos[i] = (pos << 4) | (pos);
}
}
} }
#define SWITCH_POSITION(sw) (switchesPos & (1<<(sw)))
#define POT_POSITION(sw) ((potsPos[(sw)/6] & 0x0f) == ((sw) % 6))
#else #else
#define get3POSSwitchesPosition() #define getSwitchesPosition()
#define SWITCH_POSITION(idx) switchState((EnumKeys)(SW_BASE+(idx)))
#endif #endif
int16_t csLastValue[NUM_CSW]; int16_t csLastValue[NUM_CSW];
@ -1353,15 +1371,16 @@ bool getSwitch(int8_t swtch)
if (cs_idx == SWSRC_ON) { if (cs_idx == SWSRC_ON) {
result = true; result = true;
} }
else if (cs_idx <= MAX_PSWITCH) { else if (cs_idx <= SWSRC_LAST_SWITCH) {
#if defined(PCBTARANIS) result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH);
result = SWITCH_POSITION(cs_idx-SWSRC_SA0);
#else
result = switchState((EnumKeys)(SW_BASE+cs_idx-1));
#endif
} }
#if defined(PCBTARANIS)
else if (cs_idx >= SWSRC_P11 && cs_idx <= SWSRC_P26) {
result = POT_POSITION(cs_idx-SWSRC_P11);
}
#endif
else { else {
cs_idx -= MAX_PSWITCH+1; cs_idx -= SWSRC_FIRST_CSW;
GETSWITCH_RECURSIVE_TYPE mask = ((GETSWITCH_RECURSIVE_TYPE)1 << cs_idx); GETSWITCH_RECURSIVE_TYPE mask = ((GETSWITCH_RECURSIVE_TYPE)1 << cs_idx);
if (s_last_switch_used & mask) { if (s_last_switch_used & mask) {
@ -1550,7 +1569,7 @@ int8_t getMovedSwitch()
} }
} }
#else #else
for (uint8_t i=MAX_PSWITCH; i>0; i--) { for (uint8_t i=NUM_PSWITCH; i>0; i--) {
bool prev; bool prev;
swstate_t mask = 0; swstate_t mask = 0;
if (i <= 3) { if (i <= 3) {
@ -1562,7 +1581,7 @@ int8_t getMovedSwitch()
} }
bool next = getSwitch(i); bool next = getSwitch(i);
if (prev != next) { if (prev != next) {
if (i!=MAX_PSWITCH || next==true) if (i!=NUM_PSWITCH || next==true)
result = next ? i : -i; result = next ? i : -i;
if (mask) if (mask)
switches_states ^= mask; switches_states ^= mask;
@ -2203,7 +2222,7 @@ void checkSwitches()
} }
#else #else
uint8_t x = 2; uint8_t x = 2;
for (uint8_t i=1; i<MAX_PSWITCH-1; i++) { for (uint8_t i=1; i<NUM_PSWITCH-1; i++) {
uint8_t attr = (states & (1 << i)) == (switches_states & (1 << i)) ? 0 : INVERS; uint8_t attr = (states & (1 << i)) == (switches_states & (1 << i)) ? 0 : INVERS;
putsSwitches(x, 5*FH, (i>2?(i+1):1+((states>>1)&0x3)), attr); putsSwitches(x, 5*FH, (i>2?(i+1):1+((states>>1)&0x3)), attr);
if (i == 1 && attr) i++; if (i == 1 && attr) i++;
@ -3053,13 +3072,13 @@ void evalFunctions()
#endif #endif
if (swtch > MAX_SWITCH+1) { if (swtch > NUM_SWITCH+1) {
momentary = 1; momentary = 1;
swtch -= MAX_SWITCH+1; swtch -= NUM_SWITCH+1;
} }
if (swtch < -MAX_SWITCH-1) { if (swtch < -NUM_SWITCH-1) {
momentary = 1; momentary = 1;
swtch += MAX_SWITCH+1; swtch += NUM_SWITCH+1;
} }
bool active = getSwitch(swtch); bool active = getSwitch(swtch);
@ -3684,7 +3703,7 @@ void doMixerCalculations()
// therefore forget the exact calculation and use only 1 instead; good compromise // therefore forget the exact calculation and use only 1 instead; good compromise
lastTMR = tmr10ms; lastTMR = tmr10ms;
get3POSSwitchesPosition(); getSwitchesPosition();
getADC(); getADC();
@ -3871,9 +3890,9 @@ void doMixerCalculations()
timerState->sum+=val; timerState->sum+=val;
} }
if (atm>=(TMR_VAROFS+MAX_SWITCH)){ // toggeled switch if (atm>=(TMR_VAROFS+NUM_SWITCH)){ // toggeled switch
if(!(timerState->toggled | timerState->sum | timerState->cnt | timerState->lastPos)) { timerState->lastPos = tm < 0; timerState->sum = 1; } // if initializing then init the lastPos if(!(timerState->toggled | timerState->sum | timerState->cnt | timerState->lastPos)) { timerState->lastPos = tm < 0; timerState->sum = 1; } // if initializing then init the lastPos
uint8_t swPos = getSwitch(tm>0 ? tm-(TMR_VAROFS+MAX_SWITCH-1) : tm+MAX_SWITCH); uint8_t swPos = getSwitch(tm>0 ? tm-(TMR_VAROFS+NUM_SWITCH-1) : tm+NUM_SWITCH);
if (swPos && !timerState->lastPos) timerState->toggled = !timerState->toggled; // if switch is flipped first time -> change counter state if (swPos && !timerState->lastPos) timerState->toggled = !timerState->toggled; // if switch is flipped first time -> change counter state
timerState->lastPos = swPos; timerState->lastPos = swPos;
} }
@ -3910,7 +3929,7 @@ void doMixerCalculations()
newTimerVal++; newTimerVal++;
} }
else { else {
if (atm<(TMR_VAROFS+MAX_SWITCH)) if (atm<(TMR_VAROFS+NUM_SWITCH))
timerState->toggled = tm>0 ? getSwitch(tm-(TMR_VAROFS-1)) : !getSwitch(-tm); // normal switch timerState->toggled = tm>0 ? getSwitch(tm-(TMR_VAROFS-1)) : !getSwitch(-tm); // normal switch
if (timerState->toggled) if (timerState->toggled)
newTimerVal++; newTimerVal++;

6
radio/src/opentx.h
View file

@ -376,8 +376,8 @@ enum EnumKeys {
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define NUM_SWITCHES 8 #define NUM_SWITCHES 8
#define IS_3POS(sw) ((sw) != 5 && (sw) != 7) #define IS_3POS(sw) ((sw) != 5 && (sw) != 7)
#define MAX_PSWITCH (SW_SH2-SW_SA0+1)
#define NUM_POTS 4 #define NUM_POTS 4
#define NUM_POTSSW (2*6)
#define NUM_SW_SRCRAW 8 #define NUM_SW_SRCRAW 8
#define SWSRC_THR SWSRC_SF2 #define SWSRC_THR SWSRC_SF2
#define SWSRC_GEA SWSRC_SG2 #define SWSRC_GEA SWSRC_SG2
@ -389,13 +389,13 @@ enum EnumKeys {
#define NUM_SWITCHES 7 #define NUM_SWITCHES 7
#define IS_3POS(sw) ((sw) == 0) #define IS_3POS(sw) ((sw) == 0)
#define IS_MOMENTARY(sw) (sw == SWSRC_TRN) #define IS_MOMENTARY(sw) (sw == SWSRC_TRN)
#define MAX_PSWITCH (SW_TRN-SW_ID0+1) // 9 physical switches
#define NUM_POTS 3 #define NUM_POTS 3
#define NUM_SW_SRCRAW 1 #define NUM_SW_SRCRAW 1
#define SW_DSM2_BIND SW_TRN #define SW_DSM2_BIND SW_TRN
#endif #endif
#define MAX_SWITCH (MAX_PSWITCH+NUM_CSW) #define NUM_PSWITCH (SWSRC_LAST_SWITCH-SWSRC_FIRST_SWITCH+1)
#define NUM_SWITCH (NUM_PSWITCH+NUM_CSW+NUM_POTSSW)
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define KEY_RIGHT KEY_PLUS #define KEY_RIGHT KEY_PLUS

3
radio/src/translations/cz.h.txt
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "*1 " #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "*1 "
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "*1 " #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "*1 "
#endif #endif

3
radio/src/translations/de.h.txt
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "ONE" #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "ONE"
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "ONE" #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "ONE"
#endif #endif

3
radio/src/translations/en.h
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "One" #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "One"
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "One" #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "One"
#endif #endif

3
radio/src/translations/es.h.txt
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "Uno" #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "Uno"
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "ACE""DIR""ELE""ALE""GEA""TRN" TR_CUSTOMSW "Uno" #define TR_VSWITCHES TR_9X_3POS_SWITCHES "ACE""DIR""ELE""ALE""GEA""TRN" TR_CUSTOMSW "Uno"
#endif #endif

3
radio/src/translations/fr.h.txt
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "1*\0" #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "1*\0"
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "1*\0" #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "1*\0"
#endif #endif

3
radio/src/translations/it.h.txt
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "One" #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "1*\0"
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "One" #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "One"
#endif #endif

3
radio/src/translations/pl.h.txt
View file

@ -323,7 +323,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW " * " #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS " * "
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "GAZ""SK ""LOT""SW ""GEA""TRN" TR_CUSTOMSW " * " #define TR_VSWITCHES TR_9X_3POS_SWITCHES "GAZ""SK ""LOT""SW ""GEA""TRN" TR_CUSTOMSW " * "
#endif #endif

3
radio/src/translations/pt.h.txt
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "1*\0" #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "1*\0"
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "1*\0" #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "1*\0"
#endif #endif

3
radio/src/translations/se.h.txt
View file

@ -322,7 +322,8 @@
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#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_CUSTOMSW "One" #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26"
#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_CUSTOMSW TR_6POS_POTS "One"
#else #else
#define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "One" #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_CUSTOMSW "One"
#endif #endif