piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Companion trainer modes OFF and Master-Multi available for all radios (#1806)

Browse Source 
* Allow trainer modes OFF and Master-Multi for all radios

* Change Trainer mode Off to the standard OFF

* fix: German for Trainer OFF, Master and Slave
This commit is contained in:
Neil Horne
2022-04-05 20:16:19 +10:00
committed by GitHub
parent b6dd2fe6bd
commit c8e9ca0a32
12 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/modeldata.cpp
+1 -5
View File
@@ -1647,9 +1647,7 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
bool ret = true;
const Board::Type board = firmware->getBoard();
if (!IS_FLYSKY_NV14(board) && value == TRAINER_MODE_OFF)
ret = false;
else if (!IS_TARANIS(board) ||
if (!IS_TARANIS(board) ||
IS_ACCESS_RADIO(board, Firmware::getCurrentVariant()->getId())) {
if (value >= TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE &&
value <= TRAINER_MODE_MASTER_BATTERY_COMPARTMENT)
@@ -1665,8 +1663,6 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
value <= TRAINER_MODE_SLAVE_BLUETOOTH)
ret = false;
if (!IS_RADIOMASTER_TX16S(board) && value == TRAINER_MODE_MULTI) ret = false;
return ret;
}
radio/src/translations/cz.h.txt
+4 -4
View File
@@ -322,7 +322,7 @@
#define TR_VTMRMODES "VYP\0""ZAP\0""Pln>""Pln%""Pln*"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Učitel/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Žák/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Učitel/SBUS Modul\0"
@@ -854,7 +854,7 @@
#define TR_PATH_TOO_LONG "Cesta je moc dlouhá"
#define TR_VIEW_TEXT "Zobrazit text"
#define TR_FLASH_BOOTLOADER "Flash bootloaderu"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Portem", "Flash S.Portem")
#define TR_FLASH_RECEIVER_OTA "Flash příjímače OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1366,9 +1366,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/de.h.txt
+7 -7
View File
@@ -325,14 +325,14 @@
#define TR_VTMRMODES "AUS""EIN""GSs""GS%""GSt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "AUS\0 "
#define TR_VTRAINER_MASTER_JACK "Lehrer/Buchse\0 "
#define TR_VTRAINER_SLAVE_JACK "Schüler/Buchse\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Lehrer/SBUS Modul\0"
#define TR_VTRAINER_MASTER_CPPM_MODULE "Lehrer/CPPM Modul\0"
#define TR_VTRAINER_MASTER_BATTERY "Lehrer/Serial\0 "
#define TR_VTRAINER_BLUETOOTH TR("Master/BT\0 ""Slave/BT\0 ", "Master/Bluetooth\0 ""Slave/Bluetooth\0 ")
#define TR_VTRAINER_MULTI "Master/Multi"
#define TR_VTRAINER_BLUETOOTH TR("Lehrer/BT\0 ""Schüler/BT\0 ", "Lehrer/Bluetooth\0 ""Schüler/Bluetooth\0")
#define TR_VTRAINER_MULTI "Lehrer/Multi"
#define LEN_VFAILSAFE "\015" // "\013" original
#define TR_VFAILSAFE "Kein Failsafe""Halte Pos.\0 ""Kanäle\0 ""Kein Signal\0 ""Empfänger\0 "
@@ -855,8 +855,8 @@
#define TR_MIXERS_MONITOR "==>Mischer Monitor"
#define TR_PATH_TOO_LONG "Pfad zu Lang"
#define TR_VIEW_TEXT "View Text"
#define TR_FLASH_DEVICE TR("Flash Gerät","Flash Gerät")
#define TR_FLASH_BOOTLOADER TR("Flash bootloader","Flash bootloader")
#define TR_FLASH_DEVICE TR("Flash Gerät","Flash Gerät")
#define TR_FLASH_BOOTLOADER TR("Flash bootloader","Flash bootloader")
#define TR_FLASH_EXTERNAL_DEVICE TR("Flash ext. Gerät","Flash externes Gerät")
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1373,9 +1373,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/en.h.txt
+4 -4
View File
@@ -325,7 +325,7 @@
#define TR_VTMRMODES "OFF\0""ON\0 ""Strt""THs\0""TH%\0""THt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module"
@@ -861,7 +861,7 @@
#define TR_PATH_TOO_LONG "Path too long"
#define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash bootloader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Port", "Flash S.Port device")
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1369,9 +1369,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
radio/src/translations/es.h.txt
+4 -4
View File
@@ -322,7 +322,7 @@
#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Esclav/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/Módulo SBUS"
@@ -859,7 +859,7 @@
#define TR_PATH_TOO_LONG "Path muy largo"
#define TR_VIEW_TEXT "Ver texto"
#define TR_FLASH_BOOTLOADER "Flash bootloader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE "Flash disp. externo"
#define TR_FLASH_RECEIVER_OTA "Flash RX OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX por ext. OTA"
@@ -1372,9 +1372,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/fi.h.txt
+4 -4
View File
@@ -343,7 +343,7 @@
#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module"
@@ -872,7 +872,7 @@
#define TR_PATH_TOO_LONG "Path too long"
#define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash bootloader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device"
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1377,9 +1377,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/fr.h.txt
+4 -4
View File
@@ -345,7 +345,7 @@
#define TR_VTMRMODES "OFF""ON\0""GZs""GZ%""GZt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Maître/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Elève/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Maître/SBUS Module"
@@ -877,7 +877,7 @@
#define TR_PATH_TOO_LONG "Chemin trop long"
#define TR_VIEW_TEXT "Voir texte"
#define TR_FLASH_BOOTLOADER "Flasher BootLoader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE TR("Flasher S.Port", "Flasher S.Port externe")
#define TR_FLASH_RECEIVER_OTA "Flasher RX OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1395,9 +1395,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/it.h.txt
+4 -4
View File
@@ -350,7 +350,7 @@
#define TR_VTMRMODES "OFF""ABS""MOs""MO%""MOt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Maestro/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Allievo/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/Modulo SBUS"
@@ -878,7 +878,7 @@
#define TR_PATH_TOO_LONG "Path troppo lungo"
#define TR_VIEW_TEXT "Vedi testo"
#define TR_FLASH_BOOTLOADER TR("Prog. bootloader", "Programma bootloader")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE TR("Prog. disp. est.", "Programma dispositivo esterno")
#define TR_FLASH_RECEIVER_OTA TR("Prog. RX OTA", INDENT "Programma RX OTA")
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA TR("Prog. RX da OTA est.", INDENT "Prog. RX da OTA esterno")
@@ -1391,9 +1391,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/nl.h.txt
+4 -4
View File
@@ -325,7 +325,7 @@
#define TR_VTMRMODES "UIT""AAN""THs""TH%""THt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module"
@@ -864,7 +864,7 @@
#define TR_PATH_TOO_LONG "Pad te Lang"
#define TR_VIEW_TEXT "Lees Tekst"
#define TR_FLASH_BOOTLOADER "Flash bootloader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE "Flash extern Apparaat"
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1382,9 +1382,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/pl.h.txt
+4 -4
View File
@@ -343,7 +343,7 @@
#define TR_VTMRMODES "WYŁ""ABS""THs""TH%""THt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 " /*18 decimal*/
#define TR_VTRAINER_MASTER_OFF "OFF\0 " /*18 decimal*/
#define TR_VTRAINER_MASTER_JACK "Trener/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Uczeń/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Trener/SBUS Moduł "
@@ -875,7 +875,7 @@
#define TR_PATH_TOO_LONG "Ścieżka za długa"
#define TR_VIEW_TEXT "Pokaż tekst"
#define TR_FLASH_BOOTLOADER "Flash bootloader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE "Sflashuj Moduł Zewnętrzny"
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1387,9 +1387,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/pt.h.txt
+4 -4
View File
@@ -343,7 +343,7 @@
#define TR_VTMRMODES "OFF""ABS""MTs""MT%""MTt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 "
#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module"
@@ -883,7 +883,7 @@
#define TR_PATH_TOO_LONG "Path too long"
#define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash bootloader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device"
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1393,9 +1393,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"
radio/src/translations/se.h.txt
+4 -4
View File
@@ -346,7 +346,7 @@
#define TR_VTMRMODES "Av\0""På\0""GAs""GA%""GAt"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "Off\0 "
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Lärare/Uttag\0 "
#define TR_VTRAINER_SLAVE_JACK "Elev./Uttag\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Lärare/SBUS-Modul\0"
@@ -883,7 +883,7 @@
#define TR_PATH_TOO_LONG "För lång sökväg"
#define TR_VIEW_TEXT "Visa Text"
#define TR_FLASH_BOOTLOADER "Skriv BootLoader"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device"
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -1395,9 +1395,9 @@
#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims"
#if LCD_W > LCD_H
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Monitor"
#else
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#define TR_OPEN_CHANNEL_MONITORS "Open Channel Mon."
#endif
#define TR_DUPLICATE "Duplicate"
#define TR_ACTIVATE "Set Active"