Do some stuff

main.c

@@ -140,6 +140,7 @@ void Main(void) {
     AM_fix_init();
 #endif
 
+#if defined(ENABLE_FEAT_F4HWN_RESCUE_OPS) || defined(ENABLE_AIRCOPY)
     BOOT_Mode_t BootMode = BOOT_GetMode();
 
 #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
@@ -160,48 +161,21 @@ void Main(void) {
     */
 #endif
 
-#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
-    if (BootMode == BOOT_MODE_F_LOCK && gEeprom.MENU_LOCK == true)
-    {
-        BootMode = BOOT_MODE_NORMAL;
-    }
 #endif
 
-    if (BootMode == BOOT_MODE_F_LOCK) {
-
-        gF_LOCK = true;            // flag to say include the hidden menu items
-#ifdef ENABLE_FEAT_F4HWN
-        gEeprom.KEY_LOCK = 0;
-        SETTINGS_SaveSettings();
-#ifndef ENABLE_VOX
-        gMenuCursor = 67; // move to hidden section, fix me if change... !!! Remove VOX and Mic Bar
-#else
-        gMenuCursor = 68; // move to hidden section, fix me if change... !!!
-#endif
-
-#ifdef ENABLE_NOAA
-        gMenuCursor += 1; // move to hidden section, fix me if change... !!!
-#endif
-#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
-        gMenuCursor += 1; // move to hidden section, fix me if change... !!!
-#endif
-        gSubMenuSelection = gSetting_F_LOCK;
-#endif
-    }
-
     // count the number of menu items
     gMenuListCount = 0;
     while (MenuList[gMenuListCount].name[0] != '\0') {
-        if (!gF_LOCK && MenuList[gMenuListCount].menu_id == FIRST_HIDDEN_MENU_ITEM)
-            break;
-
         gMenuListCount++;
     }
 
     // wait for user to release all butts before moving on
     if (!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) ||
-        KEYBOARD_Poll() != KEY_INVALID ||
-        BootMode != BOOT_MODE_NORMAL) {   // keys are pressed
+        KEYBOARD_Poll() != KEY_INVALID
+#if defined(ENABLE_FEAT_F4HWN_RESCUE_OPS) || defined(ENABLE_AIRCOPY)
+        || BootMode != BOOT_MODE_NORMAL
+#endif
+            ) {   // keys are pressed
         UI_DisplayReleaseKeys();
         BACKLIGHT_TurnOn();
 
@@ -249,7 +223,9 @@ void Main(void) {
         }
 #endif
 
+#if defined(ENABLE_FEAT_F4HWN_RESCUE_OPS) || defined(ENABLE_AIRCOPY)
         BOOT_ProcessMode(BootMode);
+#endif
 
         GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_VOICE_0);