diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index ba17d4d1b..499293069 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1143,7 +1143,6 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware) firmware->addOption("nogvars", QObject::tr("Disable Global variables")); firmware->addOption("lua", QObject::tr("Enable Lua custom scripts screen")); firmware->addOption("luac", QObject::tr("Enable Lua compiler")); - firmware->addOption("bindopt", QObject::tr("Enable bindings options")); } void addOpenTxTaranisOptions(OpenTxFirmware * firmware) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index a1867535e..1d27bca09 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -41,7 +41,6 @@ option(FAS_PROTOTYPE "Support of old FAS prototypes (different resistors)" OFF) option(TEMPLATES "Model templates menu" OFF) option(TRACE_SIMPGMSPACE "Turn on traces in simpgmspace.cpp" ON) option(TRACE_LUA_INTERNALS "Turn on traces for Lua internals" OFF) -option(BINDING_OPTIONS "Allow advanced FrSky bindings" OFF) option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF) option(NANO "Use nano newlib and binalloc") option(NIGHTLY_BUILD_WARNING "Warn this is a nightly build" OFF) @@ -327,10 +326,6 @@ if(TRACE_LUA_INTERNALS) add_definitions(-DTRACE_LUA_INTERNALS_ENABLED) endif() -if(BINDING_OPTIONS) - add_definitions(-DBINDING_OPTIONS) -endif() - if(FRSKY_STICKS) add_definitions(-DFRSKY_STICKS) endif() diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 201163a3f..b3cdb6265 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -178,7 +178,7 @@ enum MenuModelSetupItems { #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? HEADER_LINE+ITEM_MODEL_SETUP_MAX : HEADER_LINE+ITEM_MODEL_SETUP_MAX-1) #endif -#if defined(BINDING_OPTIONS) +#if defined(PCBTARANIS) void onBindMenu(const char * result) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(menuVerticalPosition); @@ -227,6 +227,7 @@ void onBindMenu(const char * result) } #endif + void menuModelSetup(event_t event) { #if defined(PCBX7) @@ -1014,7 +1015,7 @@ void menuModelSetup(event_t event) s_editMode=0; } #endif -#if defined(BINDING_OPTIONS) +#if defined(PCBTARANIS) if (attr && l_posHorz > 0) { if (s_editMode > 0) { if (l_posHorz == 1) { @@ -1065,7 +1066,6 @@ void menuModelSetup(event_t event) newFlag = MODULE_RANGECHECK; } #endif - moduleFlag[moduleIdx] = newFlag; #if defined(MULTIMODULE) @@ -1151,7 +1151,7 @@ void menuModelSetup(event_t event) } } #endif - if (IS_MODULE_R9M(moduleIdx)) { + if (IS_MODULE_R9M_FCC(moduleIdx)) { if (IS_TELEMETRY_INTERNAL_MODULE()) { lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_INTERNAL); @@ -1160,6 +1160,16 @@ void menuModelSetup(event_t event) g_model.moduleData[moduleIdx].pxx.sport_out = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].pxx.sport_out, MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_TELEMETRY, attr, event); } } + else if (IS_MODULE_R9M_LBT(moduleIdx)) { + if (IS_TELEMETRY_INTERNAL_MODULE()) { + lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_INTERNAL); + } + else { + lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BINDING_OPTION); + } + } else if (IS_MODULE_SBUS(moduleIdx)) { lcdDrawTextAlignedLeft(y, STR_WARN_BATTVOLTAGE); putsVolts(lcdLastRightPos, y, getBatteryVoltage(), attr | PREC2 | LEFT); diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index b7aa3bd1b..1b6703744 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -105,7 +105,6 @@ enum MenuModelSetupItems { #define CURRENT_MODULE_EDITED(k) (k>=ITEM_MODEL_TRAINER_LABEL ? TRAINER_MODULE : (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE)) -#if defined(BINDING_OPTIONS) void onBindMenu(const char * result) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(menuVerticalPosition); @@ -152,7 +151,6 @@ void onBindMenu(const char * result) moduleFlag[moduleIdx] = MODULE_BIND; } -#endif void copySelection(char * dst, const char * src, uint8_t size) { @@ -1020,7 +1018,6 @@ void menuModelSetup(event_t event) s_editMode = 0; } #endif -#if defined(BINDING_OPTIONS) if (attr && l_posHorz>0) { if (s_editMode>0) { if (l_posHorz == 1) { @@ -1028,11 +1025,14 @@ void menuModelSetup(event_t event) if (event == EVT_KEY_BREAK(KEY_ENTER)) { uint8_t default_selection; if (IS_MODULE_R9M_LBT(moduleIdx)) { + if (IS_TELEMETRY_INTERNAL_MODULE()) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_OFF); - POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH1_8_TELEM_OFF); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH9_16_TELEM_OFF); - default_selection = 2; + default_selection = 1; } else { POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); @@ -1061,13 +1061,6 @@ void menuModelSetup(event_t event) else if (l_posHorz == 2) { newFlag = MODULE_RANGECHECK; } -#else - if (attr && l_posHorz>0 && s_editMode>0) { - if (l_posHorz == 1) - newFlag = MODULE_BIND; - else if (l_posHorz == 2) { - newFlag = MODULE_RANGECHECK; -#endif } } moduleFlag[moduleIdx] = newFlag; @@ -1143,7 +1136,7 @@ void menuModelSetup(event_t event) } } #endif - if (IS_MODULE_R9M(moduleIdx)) { + if (IS_MODULE_R9M_FCC(moduleIdx)) { if (IS_TELEMETRY_INTERNAL_MODULE()) { lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_INTERNAL); @@ -1152,6 +1145,16 @@ void menuModelSetup(event_t event) g_model.moduleData[moduleIdx].pxx.sport_out = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].pxx.sport_out, MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_TELEMETRY, attr, event); } } + else if (IS_MODULE_R9M_LBT(moduleIdx)) { + if (IS_TELEMETRY_INTERNAL_MODULE()) { + lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_INTERNAL); + } + else { + lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BINDING_OPTION); + } + } else if (IS_MODULE_SBUS(moduleIdx)) { lcdDrawTextAlignedLeft(y, STR_WARN_BATTVOLTAGE); putsVolts(lcdLastRightPos, y, getBatteryVoltage(), attr | PREC2 | LEFT); diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 2b5685836..1672251c2 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -98,7 +98,6 @@ enum MenuModelSetupItems { #define CURRENT_MODULE_EDITED(k) (k>=ITEM_MODEL_TRAINER_LABEL ? TRAINER_MODULE : (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE)) -#if defined(BINDING_OPTIONS) void onBindMenu(const char * result) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(menuVerticalPosition); @@ -145,7 +144,6 @@ void onBindMenu(const char * result) moduleFlag[moduleIdx] = MODULE_BIND; } -#endif void onModelSetupBitmapMenu(const char * result) { @@ -922,7 +920,6 @@ bool menuModelSetup(event_t event) s_editMode = 0; } #endif -#if defined(BINDING_OPTIONS) if (attr && l_posHorz>0) { if (s_editMode>0) { if (l_posHorz == 1) { @@ -930,8 +927,11 @@ bool menuModelSetup(event_t event) if (event == EVT_KEY_BREAK(KEY_ENTER)) { uint8_t default_selection; if (IS_MODULE_R9M_LBT(moduleIdx)) { + if (IS_TELEMETRY_INTERNAL_MODULE()) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_OFF); - POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH1_8_TELEM_OFF); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH9_16_TELEM_OFF); default_selection = 2; @@ -963,13 +963,6 @@ bool menuModelSetup(event_t event) else if (l_posHorz == 2) { newFlag = MODULE_RANGECHECK; } -#else - if (attr && l_posHorz>0 && s_editMode>0) { - if (l_posHorz == 1) - newFlag = MODULE_BIND; - else if (l_posHorz == 2) { - newFlag = MODULE_RANGECHECK; -#endif } } moduleFlag[moduleIdx] = newFlag; @@ -1044,15 +1037,26 @@ bool menuModelSetup(event_t event) } } #endif - if (IS_MODULE_R9M(moduleIdx)) { - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MODULE_TELEMETRY); + if (IS_MODULE_R9M_FCC(moduleIdx)) { if (IS_TELEMETRY_INTERNAL_MODULE()) { + lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MODULE_TELEMETRY); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_INTERNAL); } else { + lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MODULE_TELEMETRY); g_model.moduleData[moduleIdx].pxx.sport_out = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].pxx.sport_out, MODEL_SETUP_2ND_COLUMN, y, attr, event); } } + else if (IS_MODULE_R9M_LBT(moduleIdx)) { + if (IS_TELEMETRY_INTERNAL_MODULE()) { + lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MODULE_TELEMETRY); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_INTERNAL); + } + else { + lcdDrawText(MENUS_MARGIN_LEFT,y, STR_MODULE_TELEMETRY); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BINDING_OPTION); + } + } else if (IS_MODULE_SBUS(moduleIdx)) { lcdDrawText(MENUS_MARGIN_LEFT, y, STR_WARN_BATTVOLTAGE); drawValueWithUnit(MODEL_SETUP_4TH_COLUMN, y, getBatteryVoltage(), UNIT_VOLTS, attr|PREC2|LEFT); diff --git a/radio/src/pulses/pxx_arm.cpp b/radio/src/pulses/pxx_arm.cpp index af7fdc40a..c466fe1d1 100644 --- a/radio/src/pulses/pxx_arm.cpp +++ b/radio/src/pulses/pxx_arm.cpp @@ -381,10 +381,8 @@ void setupPulsesPXX(uint8_t port) extra_flags |= (g_model.moduleData[port].pxx.external_antenna << 0); } #endif -#if defined(BINDING_OPTIONS) extra_flags |= (g_model.moduleData[port].pxx.receiver_telem_off << 1); extra_flags |= (g_model.moduleData[port].pxx.receiver_channel_9_16 << 2); -#endif if (IS_MODULE_R9M(port)) { extra_flags |= (max(g_model.moduleData[port].pxx.power, IS_MODULE_R9M_FCC(port) ? (uint8_t)R9M_FCC_POWER_MAX : (uint8_t)R9M_LBT_POWER_MAX) << 3); // Disable S.PORT if internal module is active diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 2d77e9c71..a526ca72d 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -625,6 +625,7 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_BINDING_25MW_CH1_8_TELEM_ON[] PROGMEM = TR_BINDING_25MW_CH1_8_TELEM_ON; const pm_char STR_BINDING_500MW_CH1_8_TELEM_OFF[] PROGMEM = TR_BINDING_500MW_CH1_8_TELEM_OFF; const pm_char STR_BINDING_500MW_CH9_16_TELEM_OFF[] PROGMEM = TR_BINDING_500MW_CH9_16_TELEM_OFF; + const pm_char STR_BINDING_OPTION[] PROGMEM = TR_BINDING_OPTION; const pm_char STR_CHANNELRANGE[] PROGMEM = TR_CHANNELRANGE; const pm_char STR_ANTENNASELECTION[] PROGMEM = TR_ANTENNASELECTION; const pm_char STR_ANTENNACONFIRM1[] PROGMEM = TR_ANTENNACONFIRM1; diff --git a/radio/src/translations.h b/radio/src/translations.h index 0a3851511..caf96dc51 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -929,6 +929,7 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_BINDING_25MW_CH1_8_TELEM_ON[]; extern const pm_char STR_BINDING_500MW_CH1_8_TELEM_OFF[]; extern const pm_char STR_BINDING_500MW_CH9_16_TELEM_OFF[]; + extern const pm_char STR_BINDING_OPTION[]; extern const pm_char STR_CHANNELRANGE[]; extern const pm_char STR_ANTENNASELECTION[]; extern const pm_char STR_ANTENNACONFIRM1[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 25ea63dc9..b4a11feb4 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -871,10 +871,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 7cc73391e..f1fcc7d9c 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -892,10 +892,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 7f6227dc1..4aec43f06 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -875,10 +875,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 94f4600a5..436797c6e 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -851,10 +851,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 36c448fd2..962eee82b 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -847,10 +847,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 96da2a918..91e03dd9e 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -878,6 +878,7 @@ #define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Télem ON" #define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Télem OFF" #define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Télem OFF" +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Sél. invalide", "Protocole invalide") #define TR_MODULE_STATUS TR(INDENT "Etat", INDENT "Etat module") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 19bca4715..d8a8fb4a9 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -876,10 +876,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index b1a6ab2c0..95f794d0d 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -874,10 +874,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 566d802a9..25aaacf2e 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -878,10 +878,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 7bbbcfac9..e30a7dc62 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -853,10 +853,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b86d6a01c..cb210b29a 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -890,10 +890,11 @@ #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_OFF "25mW Ch1-8 Telem OFF" -#define TR_BINDING_25MW_CH1_8_TELEM_ON "25mW Ch1-8 Telem ON" -#define TR_BINDING_500MW_CH1_8_TELEM_OFF "500mW Ch1-8 Telem OFF" -#define TR_BINDING_500MW_CH9_16_TELEM_OFF "500mW Ch9-16 Telem OFF" +#define TR_BINDING_25MW_CH1_8_TELEM_OFF TR("25mW Ch1-8 Tel OFF", "25mW Ch1-8 Telem OFF") +#define TR_BINDING_25MW_CH1_8_TELEM_ON TR("25mW Ch1-8 Tel ON", "25mW Ch1-8 Telem ON") +#define TR_BINDING_500MW_CH1_8_TELEM_OFF TR("500mW Ch1-8 Tel OFF", "500mW Ch1-8 Telem OFF") +#define TR_BINDING_500MW_CH9_16_TELEM_OFF TR("500mW Ch9-16 Tel OFF", "500mW Ch9-16 Telem OFF") +#define TR_BINDING_OPTION "Set at bind" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") #define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") #define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Module Sync") diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index 060251da6..94a4b0560 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -245,8 +245,7 @@ options_taranis = { "internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "multimodule": ("MULTIMODULE", "YES", "NO"), - "bindopt": ("BINDING_OPTIONS", "YES", "NO") + "multimodule": ("MULTIMODULE", "YES", "NO") } options_taranisplus = { @@ -263,8 +262,7 @@ options_taranisplus = { "internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "multimodule": ("MULTIMODULE", "YES", "NO"), - "bindopt": ("BINDING_OPTIONS", "YES", "NO") + "multimodule": ("MULTIMODULE", "YES", "NO") } options_taranisx9e = { @@ -282,8 +280,7 @@ options_taranisx9e = { "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "horussticks": ("STICKS", "HORUS", "STANDARD"), - "multimodule": ("MULTIMODULE", "YES", "NO"), - "bindopt": ("BINDING_OPTIONS", "YES", "NO") + "multimodule": ("MULTIMODULE", "YES", "NO") } options_x12s = { @@ -297,8 +294,7 @@ options_x12s = { "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "multimodule": ("MULTIMODULE", "YES", "NO"), - "pcbdev": ("PCBREV", "10", None), - "bindopt": ("BINDING_OPTIONS", "YES", "NO") + "pcbdev": ("PCBREV", "10", None) } options_x10 = { @@ -311,6 +307,5 @@ options_x10 = { "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "multimodule": ("MULTIMODULE", "YES", "NO"), - "bindopt": ("BINDING_OPTIONS", "YES", "NO") + "multimodule": ("MULTIMODULE", "YES", "NO") }