From be9cc540e524b3a91adbb8fc4b8e53d7a072c944 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 9 Sep 2022 20:27:34 +1000 Subject: [PATCH 1/2] 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. --- radio/src/gui/gui_common.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 0bd1937a8f3..831b4f6149b 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -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; } From 553351984f0c2bdbeab417c490ec19f9306774cd Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Wed, 14 Sep 2022 12:32:39 +1000 Subject: [PATCH 2/2] chore: Uppercase "OFF" or equiv for Trainer OFF --- radio/src/translations/da.h | 2 +- radio/src/translations/en.h | 2 +- radio/src/translations/fi.h | 2 +- radio/src/translations/se.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 9883ff83058..7a726504b22 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -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" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 752a54416a3..881f774cec9 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -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" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index b560924fe13..65e7e379276 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -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" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 4329b05ce72..e8b0c02add6 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -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"