From 8cb46f2425fb3d72260999e6ad2a5ad483108481 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 12 Feb 2017 22:58:24 +0100 Subject: [PATCH] [SKY9X / 9XR-PRO] A couple of UI bugfixes --- radio/src/gui/128x64/model_logical_switches.cpp | 2 +- radio/src/gui/gui_common_arm.cpp | 8 +++++++- radio/src/translations/cz.h.txt | 10 +++++++--- radio/src/translations/de.h.txt | 10 +++++++--- radio/src/translations/en.h.txt | 10 +++++++--- radio/src/translations/es.h.txt | 6 +++--- radio/src/translations/fi.h.txt | 10 +++++++--- radio/src/translations/fr.h.txt | 10 +++++++--- radio/src/translations/it.h.txt | 10 +++++++--- radio/src/translations/nl.h.txt | 10 +++++++--- radio/src/translations/pl.h.txt | 10 +++++++--- radio/src/translations/pt.h.txt | 10 +++++++--- radio/src/translations/se.h.txt | 10 +++++++--- 13 files changed, 81 insertions(+), 35 deletions(-) diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp index ea7764063..96a5c1edb 100644 --- a/radio/src/gui/128x64/model_logical_switches.cpp +++ b/radio/src/gui/128x64/model_logical_switches.cpp @@ -227,7 +227,7 @@ void menuModelLogicalSwitchOne(event_t event) void onLogicalSwitchesMenu(const char *result) { - int8_t sub = menuVerticalPosition; + int8_t sub = menuVerticalPosition - HEADER_LINE; LogicalSwitchData * cs = lswAddress(sub); if (result == STR_EDIT) { diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index b529a25b6..9eae3f67a 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -147,7 +147,13 @@ bool isSourceAvailable(int source) if (source>=MIXSRC_FIRST_POT && source<=MIXSRC_LAST_POT) { return IS_POT_SLIDER_AVAILABLE(POT1+source-MIXSRC_FIRST_POT); } - + +#if defined(PCBSKY9X) && defined(REVX) + if (source == MIXSRC_REa) { + return false; + } +#endif + #if defined(PCBX10) if ((source>=MIXSRC_S3 && source<=MIXSRC_S4) || (source>=MIXSRC_MOUSE1 && source<=MIXSRC_MOUSE2)) return false; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 2be628ad4..4738ccda5 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -559,6 +559,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "POT1""POT2""POT3" + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "POT1""POT2""POT3" #define TR_SW_VSRCRAW "3POS" @@ -589,7 +593,7 @@ #endif #if !defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ZAP""One" @@ -600,9 +604,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 17ff9d8b3..4ac126758 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -559,6 +559,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -591,7 +595,7 @@ #if defined(PCBFLAMENCO) #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301" #elif !defined(PCBTARANIS) && !defined(PCBHORUS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -602,9 +606,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 246c2cfe4..0dd5e53f9 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -536,6 +536,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -568,7 +572,7 @@ #if defined(PCBFLAMENCO) #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301" #elif !defined(PCBTARANIS) && !defined(PCBHORUS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -579,9 +583,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 7aa82b5ec..e64892bce 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -566,7 +566,7 @@ #endif #if !defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -577,9 +577,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 71a6cd43e..00c45184e 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -536,6 +536,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -566,7 +570,7 @@ #endif #if !defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -577,9 +581,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 0e48bcbe9..a9fbe968a 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -549,6 +549,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -579,7 +583,7 @@ #endif #if !defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""Un" @@ -590,9 +594,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 83bd3df09..a53241b81 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -543,6 +543,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -573,7 +577,7 @@ #endif #if !defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -584,9 +588,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 7fcca1368..e1fd16d2d 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -527,6 +527,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -559,7 +563,7 @@ #if defined(PCBFLAMENCO) #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301" #elif !defined(PCBTARANIS) && !defined(PCBHORUS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -570,9 +574,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index d1345bd96..023845f64 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -545,6 +545,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -575,7 +579,7 @@ #endif #if !defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "GAZ""SK ""SW ""LOT""GEA""TRN" + #define TR_2POS_SWITCHES "GAZ""SK ""SW ""LOT""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -586,9 +590,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 45f9d2e51..5f5e6cdae 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -531,6 +531,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3POS" @@ -561,7 +565,7 @@ #endif #if !defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" @@ -572,9 +576,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 154fd3c11..0fb694e47 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -550,6 +550,10 @@ #elif defined(PCBTARANIS) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" +#elif defined(PCBSKY9X) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" "THR\0""RUD\0""ELE\0""AIL\0""GEA\0""TRN\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " #define TR_SW_VSRCRAW "3Pos" @@ -583,7 +587,7 @@ #if defined(PCBFLAMENCO) #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301" #elif !defined(PCBTARANIS) && !defined(PCBHORUS) - #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" + #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "På\0""Ett" @@ -595,9 +599,9 @@ // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI)