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

Fixed registration ID

Browse Source
This commit is contained in:
Raphael Coeffic
2021-06-05 20:29:09 +02:00
committed by Raphael Coeffic
parent 27252a41ac
commit 31071cc0fc
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/radio_setup.cpp
+6 -1
View File
@@ -134,6 +134,8 @@ void menuRadioSetup(event_t event)
}
#endif
uint8_t old_editMode = s_editMode;
MENU(STR_RADIO_SETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_RADIO_SETUP_MAX, {
HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1)
LABEL(SOUND), CASE_AUDIO(0)
@@ -551,7 +553,10 @@ void menuRadioSetup(event_t event)
#if defined(PXX2)
case ITEM_RADIO_SETUP_OWNER_ID:
editSingleName(RADIO_SETUP_2ND_COLUMN, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr);
editSingleName(RADIO_SETUP_2ND_COLUMN, y, STR_OWNER_ID,
g_eeGeneral.ownerRegistrationID,
PXX2_LEN_REGISTRATION_ID, event, attr,
old_editMode);
break;
#endif
radio/src/gui/212x64/radio_setup.cpp
+6 -1
View File
@@ -121,6 +121,8 @@ void menuRadioSetup(event_t event)
}
#endif
uint8_t old_editMode = s_editMode;
MENU(STR_RADIO_SETUP, menuTabGeneral, MENU_RADIO_SETUP, ITEM_RADIO_SETUP_MAX, {
2, // date
2, // time
@@ -440,7 +442,10 @@ void menuRadioSetup(event_t event)
#if defined(PXX2)
case ITEM_RADIO_SETUP_OWNER_ID:
editSingleName(RADIO_SETUP_2ND_COLUMN, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr);
editSingleName(RADIO_SETUP_2ND_COLUMN, y, STR_OWNER_ID,
g_eeGeneral.ownerRegistrationID,
PXX2_LEN_REGISTRATION_ID, event, attr,
old_editMode);
break;
#endif
radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
+20 -4
View File
@@ -201,7 +201,9 @@ void runPopupRegister(event_t event)
// registration password
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4, STR_REG_ID);
editName(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 4, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID, event, menuVerticalPosition == ITEM_REGISTER_PASSWORD);
editName(WARNING_LINE_X + 8 * FW, WARNING_LINE_Y - 4,
g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID, event,
menuVerticalPosition == ITEM_REGISTER_PASSWORD, 0, backupEditMode);
// loop index (will be removed in future)
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + FH, "UID");
@@ -217,9 +219,23 @@ void runPopupRegister(event_t event)
}
else {
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + 2 * FH, STR_RX_NAME);
editName(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 4 + 2 * FH, reusableBuffer.moduleSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME, event, menuVerticalPosition == ITEM_REGISTER_RECEIVER_NAME);
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, TR_ENTER, menuVerticalPosition == ITEM_REGISTER_BUTTONS && menuHorizontalPosition == 0 ? INVERS : 0);
lcdDrawText(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 2 + 3 * FH, TR_EXIT, menuVerticalPosition == ITEM_REGISTER_BUTTONS && menuHorizontalPosition == 1 ? INVERS : 0);
editName(WARNING_LINE_X + 8 * FW, WARNING_LINE_Y - 4 + 2 * FH,
reusableBuffer.moduleSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME,
event, menuVerticalPosition == ITEM_REGISTER_RECEIVER_NAME, 0,
backupEditMode);
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, TR_ENTER,
menuVerticalPosition == ITEM_REGISTER_BUTTONS &&
menuHorizontalPosition == 0
? INVERS
: 0);
lcdDrawText(WARNING_LINE_X + 8 * FW, WARNING_LINE_Y - 2 + 3 * FH, TR_EXIT,
menuVerticalPosition == ITEM_REGISTER_BUTTONS &&
menuHorizontalPosition == 1
? INVERS
: 0);
}
reusableBuffer.moduleSetup.pxx2.registerPopupVerticalPosition = menuVerticalPosition;