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

fix: Don't allow select MULTI_TRAINER if no MULTI (#2299)

Browse Source 
* fix: Don't allow select MULTI_TRAINER if no MULTI
Fixes #1563 by ensuring Multi Trainer opt is not shown if no MPM
is enabled, as well as if MPM suport is not even compiled in.

* chore: Uppercase "OFF" or equiv for Trainer OFF
This commit is contained in:
Peter Feerick
2022-09-14 12:34:43 +10:00
committed by GitHub
parent d9c7cfae6f
commit d54e656608
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/gui_common.cpp
+12 -1
View File
@@ -882,7 +882,18 @@ bool isTrainerModeAvailable(int mode)
mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE))
return false;
#endif
#if !defined(MULTIMODULE)
if (mode == TRAINER_MODE_MULTI)
return false;
#else
if (mode == TRAINER_MODE_MULTI &&
((!IS_INTERNAL_MODULE_ENABLED() && !IS_EXTERNAL_MODULE_ENABLED()) ||
(!isModuleMultimodule(INTERNAL_MODULE) &&
!isModuleMultimodule(EXTERNAL_MODULE))))
return false;
#endif
return true;
}
radio/src/translations/da.h
+1 -1
View File
@@ -270,7 +270,7 @@
#define TR_EXTRA_VSRCRAW "Bat","Time","GPS",TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,"Tmr1","Tmr2","Tmr3"
#define TR_VTMRMODES "FRA","TIL","Strt","THs","TH%","THt"
#define TR_VTRAINER_MASTER_OFF "Fra"
#define TR_VTRAINER_MASTER_OFF "FRA"
#define TR_VTRAINER_MASTER_JACK "Træner/Jack"
#define TR_VTRAINER_SLAVE_JACK "Elev/Jack"
#define TR_VTRAINER_MASTER_SBUS_MODULE "Træner/SBUS modul"
radio/src/translations/en.h
+1 -1
View File
@@ -269,7 +269,7 @@
#define TR_EXTRA_VSRCRAW "Batt","Time","GPS",TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,"Tmr1","Tmr2","Tmr3"
#define TR_VTMRMODES "OFF","ON","Strt","THs","TH%","THt"
#define TR_VTRAINER_MASTER_OFF "Off"
#define TR_VTRAINER_MASTER_OFF "OFF"
#define TR_VTRAINER_MASTER_JACK "Master/Jack"
#define TR_VTRAINER_SLAVE_JACK "Slave/Jack"
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module"
radio/src/translations/fi.h
+1 -1
View File
@@ -287,7 +287,7 @@
#define TR_EXTRA_VSRCRAW "Batt","Time","GPS",TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,"Tmr1","Tmr2","Tmr3"
#define TR_VTMRMODES "OFF","ABS","THs","TH%","THt"
#define TR_VTRAINER_MASTER_OFF "Off"
#define TR_VTRAINER_MASTER_OFF "OFF"
#define TR_VTRAINER_MASTER_JACK "Master/Jack"
#define TR_VTRAINER_SLAVE_JACK "Slave/Jack"
#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module"
radio/src/translations/se.h
+1 -1
View File
@@ -286,7 +286,7 @@
#define TR_EXTRA_VSRCRAW "Batt","Tid","GPS",TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,TR_RESERVE_VSRCRAW,"Tmr1","Tmr2","Tmr3"
#define TR_VTMRMODES "Av","På","GAs","GA%","GAt"
#define TR_VTRAINER_MASTER_OFF "Av"
#define TR_VTRAINER_MASTER_OFF "AV"
#define TR_VTRAINER_MASTER_JACK "Lärare/Uttag"
#define TR_VTRAINER_SLAVE_JACK "Elev/Uttag"
#define TR_VTRAINER_MASTER_SBUS_MODULE "Lärare/SBUS-modul"