Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 01:05:10 +03:00
Code Issues Wiki Activity

X9D+ fixes

Browse source
This commit is contained in:
Bertrand Songis 2019-02-09 13:47:16 +01:00
parent a812c15f1f
commit 43fa3a4fae
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/src/gui/212x64/model_setup.cpp
View file

@ -130,7 +130,7 @@ void onBindMenu(const char * result)
return;
}
moduleSettings[moduleIdx].bind = 1;;
moduleSettings[moduleIdx].mode = MODULE_MODE_BIND;
}
void copySelection(char * dst, const char * src, uint8_t size)
@ -240,7 +240,7 @@ int getSwitchWarningsCount()
#define INTERNAL_MODULE_MODE_ROWS 0 // (OFF / RF protocols)
#endif
#define IF_EXTERNAL_MODULE_ON(x) (IS_EXTERNAL_MODULE_ENABLED() ? (uint8_t)(x) : HIDDEN_ROW)
#define INTERNAL_MODULE_CHANNELS_ROWS IF_INTERNAL_MODULE_ON(1)
#define PORT_CHANNELS_ROWS(x) (x==INTERNAL_MODULE ? INTERNAL_MODULE_CHANNELS_ROWS : (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS : 1))
#if defined(BLUETOOTH) && defined(USEHORUSBT)
@ -760,7 +760,7 @@ void menuModelSetup(event_t event)
if (attr && s_editMode>0) {
switch (menuHorizontalPosition) {
case 0:
g_model.moduleData[EXTERNAL_MODULE].type = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].type, MODULE_TYPE_NONE, IS_TRAINER_EXTERNAL_MODULE() ? MODULE_TYPE_NONE : MODULE_TYPE_COUNT-1, EE_MODEL, isModuleAvailable);
g_model.moduleData[EXTERNAL_MODULE].type = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].type, MODULE_TYPE_NONE, IS_TRAINER_EXTERNAL_MODULE() ? MODULE_TYPE_NONE : MODULE_TYPE_COUNT-1, EE_MODEL, isExternalModuleAvailable);
if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
@ -1061,8 +1061,8 @@ void menuModelSetup(event_t event)
POPUP_MENU_START(onBindMenu);
continue;
}
if (moduleSettings[moduleIdx].mode == MODULE_BIND) {
newFlag = MODULE_BIND;
if (moduleSettings[moduleIdx].mode == MODULE_MODE_BIND) {
newFlag = MODULE_MODE_BIND;
}
else {
if (!popupMenuItemsCount) {
@ -1071,11 +1071,11 @@ void menuModelSetup(event_t event)
}
}
else {
newFlag = MODULE_BIND;
newFlag = MODULE_MODE_BIND;
}
}
else if (l_posHorz == 2) {
newFlag = MODULE_RANGECHECK;
newFlag = MODULE_MODE_RANGECHECK;
}
}
}