Remove REGISTER from RADIO / HARDWARE as it only brings issues

This commit is contained in:
Bertrand Songis
2019-03-09 10:21:04 +01:00
parent bfed532712
commit 7abb6a77b7
9 changed files with 226 additions and 200 deletions
-26
View File
@@ -125,7 +125,6 @@ enum MenuRadioHardwareItems {
#endif
ITEM_RADIO_HARDWARE_JITTER_FILTER,
ITEM_RADIO_OWNER_ID,
ITEM_RADIO_REGISTER_RECEIVER,
ITEM_RADIO_HARDWARE_MAX
};
@@ -158,8 +157,6 @@ enum MenuRadioHardwareItems {
#define HW_SETTINGS_COLUMN1 30
#define HW_SETTINGS_COLUMN2 (30 + 5*FW)
void startRegisterDialog(uint8_t module);
void menuRadioHardware(event_t event)
{
MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, {
@@ -314,29 +311,6 @@ void menuRadioHardware(event_t event)
case ITEM_RADIO_OWNER_ID:
editSingleName(HW_SETTINGS_COLUMN2, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr);
break;
case ITEM_RADIO_REGISTER_RECEIVER:
lcdDrawTextAlignedLeft(y, NO_INDENT(STR_RECEIVER));
lcdDrawText(HW_SETTINGS_COLUMN2, y, "[Register]", attr );
if (attr) {
if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_NORMAL && s_editMode > 0) {
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
startRegisterDialog(INTERNAL_MODULE);
}
else if (menuHorizontalPosition == 0) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK;
}
}
if (s_editMode == 0 && !warningText) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL;
}
if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_NORMAL) {
// REGISTER finished
s_editMode = 0;
}
}
break;
}
}
}