Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Sep 14, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be9cc54
fix: Don't allow select MULTI_TRAINER if no MULTI
pfeerick Sep 9, 2022
5533519
chore: Uppercase "OFF" or equiv for Trainer OFF
pfeerick Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion radio/src/gui/gui_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/da.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/fi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/se.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down