Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-26 09:45:16 +03:00
Code Activity

BIND popup menu fix

Browse source
This commit is contained in:
Bertrand Songis 2019-05-04 11:00:33 +02:00
parent 8373cdbb8b
commit ad8a5ba7ae
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/gui/128x64/model_setup.cpp
View file

@ -1410,8 +1410,8 @@ void menuModelSetup(event_t event)
removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx); removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
killEvents(event); // we stopped BIND / SHARE, we don't want to re-open the menu killEvents(event); // we stopped BIND / SHARE, we don't want to re-open the menu
event = 0; event = 0;
CLEAR_POPUP();
} }
CLEAR_POPUP();
s_editMode = 0; s_editMode = 0;
} }
@ -1423,6 +1423,7 @@ void menuModelSetup(event_t event)
popupMenuItems[i] = reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[i]; popupMenuItems[i] = reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[i];
} }
popupMenuTitle = STR_PXX2_SELECT_RX; popupMenuTitle = STR_PXX2_SELECT_RX;
CLEAR_POPUP();
POPUP_MENU_START(onPXX2BindMenu); POPUP_MENU_START(onPXX2BindMenu);
} }
else { else {

2
radio/src/main.cpp
View file

@ -50,7 +50,7 @@ void handleUsbConnection()
} }
} }
if (!usbStarted() && usbPlugged() && getSelectedUsbMode() == USB_UNSELECTED_MODE) { if (!usbStarted() && usbPlugged() && getSelectedUsbMode() == USB_UNSELECTED_MODE) {
if((g_eeGeneral.USBMode == USB_UNSELECTED_MODE) && (popupMenuItemsCount == 0)) { if (g_eeGeneral.USBMode == USB_UNSELECTED_MODE && popupMenuItemsCount == 0) {
POPUP_MENU_ADD_ITEM(STR_USB_JOYSTICK); POPUP_MENU_ADD_ITEM(STR_USB_JOYSTICK);
POPUP_MENU_ADD_ITEM(STR_USB_MASS_STORAGE); POPUP_MENU_ADD_ITEM(STR_USB_MASS_STORAGE);
#if defined(DEBUG) #if defined(DEBUG)