From 31071cc0fc6a237beed0d46d6f2d8c71942f55d9 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 5 Jun 2021 00:36:17 +0200
Subject: [PATCH] Fixed registration ID

---
 radio/src/gui/128x64/radio_setup.cpp          |  7 +++++-
 radio/src/gui/212x64/radio_setup.cpp          |  7 +++++-
 .../gui/common/stdlcd/model_setup_pxx2.cpp    | 24 +++++++++++++++----
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index dd6252fd0..ba515c4c2 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -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
 
diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp
index efe5e8ea0..1efd78c2e 100644
--- a/radio/src/gui/212x64/radio_setup.cpp
+++ b/radio/src/gui/212x64/radio_setup.cpp
@@ -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
 
diff --git a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
index 13ee54942..7e33181aa 100644
--- a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
+++ b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
@@ -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;