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

Better handle interactions with internal module telemetry (#5506)

Browse Source
This commit is contained in:
3djc
2017-12-12 20:32:53 +01:00
committed by Bertrand Songis
parent fa5895de39
commit 977262232a
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+8 -2
View File
@@ -1030,9 +1030,15 @@ void menuModelSetup(event_t event)
default_selection = 2;
}
else {
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON);
if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)
POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL);
else
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON);
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF);
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON);
if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)
POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL);
else
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON);
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_OFF);
default_selection = g_model.moduleData[INTERNAL_MODULE].pxx.receiver_telem_off + (g_model.moduleData[INTERNAL_MODULE].pxx.receiver_channel_9_16 << 1);
}
radio/src/gui/212x64/model_setup.cpp
+8 -2
View File
@@ -1035,9 +1035,15 @@ void menuModelSetup(event_t event)
default_selection = 1;
}
else {
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON);
if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)
POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL);
else
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON);
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF);
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON);
if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)
POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL);
else
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON);
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_OFF);
default_selection = g_model.moduleData[moduleIdx].pxx.receiver_telem_off + (g_model.moduleData[moduleIdx].pxx.receiver_channel_9_16 << 1);
}
radio/src/gui/480x272/model_setup.cpp
+8 -2
View File
@@ -937,9 +937,15 @@ bool menuModelSetup(event_t event)
default_selection = 2;
}
else {
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON);
if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)
POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL);
else
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON);
POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF);
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON);
if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)
POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL);
else
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON);
POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_OFF);
default_selection = g_model.moduleData[moduleIdx].pxx.receiver_telem_off + (g_model.moduleData[moduleIdx].pxx.receiver_channel_9_16 << 1);
}