BIND menu added (still not tested)

This commit is contained in:
Bertrand Songis
2019-02-06 14:12:54 +01:00
parent 833adb5787
commit c7404998f9
11 changed files with 57 additions and 46 deletions
+10 -3
View File
@@ -1115,12 +1115,19 @@ void menuModelSetup(event_t event)
if (attr) {
if (menuHorizontalPosition == 0) {
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
moduleSettings[INTERNAL_MODULE].mode ^= MODULE_MODE_BIND;
reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_START;
reusableBuffer.modelsetup.pxx2_bind_receiver_index = receiverIdx;
reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count = 0;
moduleSettings[INTERNAL_MODULE].mode ^= MODULE_MODE_BIND;
}
if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_BIND) {
s_editMode = 1;
// TODO the menu here
if (reusableBuffer.modelsetup.pxx2_register_or_bind_step == BIND_RX_ID_RECEIVED) {
for (uint8_t i=0; i<min(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count, (uint8_t)MENU_MAX_DISPLAY_LINES); i++) {
popupMenuItems[i] = reusableBuffer.modelsetup.pxx2_bind_candidate_receivers[i];
}
popupMenuItemsCount = reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count;
}
}
else {
s_editMode = 0;
@@ -1265,7 +1272,7 @@ void menuModelSetup(event_t event)
newFlag = MODULE_MODE_BIND;
}
else {
if (!popupMenuNoItems) {
if (!popupMenuItemsCount) {
s_editMode = 0; // this is when popup is exited before a choice is made
}
}
+5 -3
View File
@@ -21,6 +21,8 @@
#ifndef _POPUPS_H_
#define _POPUPS_H_
#include <keys.h>
#define MENU_X 10
#define MENU_Y 16
#define MENU_W LCD_W-(2*MENU_X)
@@ -63,8 +65,8 @@ extern uint8_t warningInfoFlags;
#endif
#define NAVIGATION_MENUS
#define POPUP_MENU_ADD_ITEM(s) do { popupMenuOffsetType = MENU_OFFSET_INTERNAL; if (popupMenuNoItems < POPUP_MENU_MAX_LINES) popupMenuItems[popupMenuNoItems++] = s; } while (0)
#define POPUP_MENU_SELECT_ITEM(s) s_menu_item = (s > 0 ? (s < popupMenuNoItems ? s : popupMenuNoItems) : 0)
#define POPUP_MENU_ADD_ITEM(s) do { popupMenuOffsetType = MENU_OFFSET_INTERNAL; if (popupMenuItemsCount < POPUP_MENU_MAX_LINES) popupMenuItems[popupMenuItemsCount++] = s; } while (0)
#define POPUP_MENU_SELECT_ITEM(s) s_menu_item = (s > 0 ? (s < popupMenuItemsCount ? s : popupMenuItemsCount) : 0)
#define POPUP_MENU_START(func) do { popupMenuHandler = (func); AUDIO_KEY_PRESS(); } while (0)
#define POPUP_MENU_MAX_LINES 12
#define MENU_MAX_DISPLAY_LINES 6
@@ -81,7 +83,7 @@ extern uint8_t warningInfoFlags;
#if defined(NAVIGATION_MENUS)
extern uint16_t popupMenuOffset;
extern const char * popupMenuItems[POPUP_MENU_MAX_LINES];
extern uint16_t popupMenuNoItems;
extern uint16_t popupMenuItemsCount;
const char * runPopupMenu(event_t event);
extern void (*popupMenuHandler)(const char * result);
#endif