Do some stuff

helper/boot.c

@@ -17,8 +17,9 @@
 #include <string.h>
 
 #ifdef ENABLE_AIRCOPY
-    #include "app/aircopy.h"
+#include "app/aircopy.h"
 #endif
+
 #include "bsp/dp32g030/gpio.h"
 #include "driver/bk4819.h"
 #include "driver/keyboard.h"
@@ -31,98 +32,84 @@
 #include "ui/menu.h"
 #include "ui/ui.h"
 
-BOOT_Mode_t BOOT_GetMode(void)
-{
+#if defined(ENABLE_FEAT_F4HWN_RESCUE_OPS) || defined(ENABLE_AIRCOPY)
+BOOT_Mode_t BOOT_GetMode(void) {
     unsigned int i;
-    KEY_Code_t   Keys[2];
+    KEY_Code_t Keys[2];
 
-    for (i = 0; i < 2; i++)
-    {
+    for (i = 0; i < 2; i++) {
         if (GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT))
             return BOOT_MODE_NORMAL;   // PTT not pressed
         Keys[i] = KEYBOARD_Poll();
         SYSTEM_DelayMs(20);
     }
 
-    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if (Keys[0] == (10 + gEeprom.SET_KEY))
     {
         return BOOT_MODE_RESCUE_OPS;  // Secret KEY pressed
     }
-    #endif
+#endif
 
-    if (Keys[0] == Keys[1])
-    {
+    if (Keys[0] == Keys[1]) {
         gKeyReading0 = Keys[0];
         gKeyReading1 = Keys[0];
 
         gDebounceCounter = 2;
 
-        if (Keys[0] == KEY_SIDE1)
-            return BOOT_MODE_F_LOCK;
-
-        #ifdef ENABLE_AIRCOPY
-            if (Keys[0] == KEY_SIDE2)
-                return BOOT_MODE_AIRCOPY;
-        #endif
+#ifdef ENABLE_AIRCOPY
+        if (Keys[0] == KEY_SIDE2)
+            return BOOT_MODE_AIRCOPY;
+#endif
     }
 
     return BOOT_MODE_NORMAL;
 }
 
-void BOOT_ProcessMode(BOOT_Mode_t Mode)
-{
-    if (Mode == BOOT_MODE_F_LOCK)
+void BOOT_ProcessMode(BOOT_Mode_t Mode) {
+    Mode = Mode;
+#ifdef ENABLE_AIRCOPY
+    if (Mode == BOOT_MODE_AIRCOPY)
     {
-        #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
+        gEeprom.DUAL_WATCH               = DUAL_WATCH_OFF;
+        gEeprom.BATTERY_SAVE             = 0;
+#ifdef ENABLE_VOX
+            gEeprom.VOX_SWITCH           = false;
+#endif
+        gEeprom.CROSS_BAND_RX_TX         = CROSS_BAND_OFF;
+        gEeprom.AUTO_KEYPAD_LOCK         = false;
+        gEeprom.KEY_1_SHORT_PRESS_ACTION = ACTION_OPT_NONE;
+        gEeprom.KEY_1_LONG_PRESS_ACTION  = ACTION_OPT_NONE;
+        gEeprom.KEY_2_SHORT_PRESS_ACTION = ACTION_OPT_NONE;
+        gEeprom.KEY_2_LONG_PRESS_ACTION  = ACTION_OPT_NONE;
+        gEeprom.KEY_M_LONG_PRESS_ACTION  = ACTION_OPT_NONE;
+
+        RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_LAST - 1, 43400000); // LPD
+
+        gRxVfo->CHANNEL_BANDWIDTH        = BANDWIDTH_NARROW;
+        gRxVfo->OUTPUT_POWER             = OUTPUT_POWER_LOW1;
+
+        RADIO_ConfigureSquelchAndOutputPower(gRxVfo);
+
+        gCurrentVfo = gRxVfo;
+
+        RADIO_SetupRegisters(true);
+        BK4819_SetupAircopy();
+        BK4819_ResetFSK();
+
+        gAircopyState = AIRCOPY_READY;
+
+        gEeprom.BACKLIGHT_TIME = 61;
+        gEeprom.KEY_LOCK = 0;
+
+#ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
             gEeprom.CURRENT_STATE = 0; // Don't resume is active...
-        #endif 
-        GUI_SelectNextDisplay(DISPLAY_MENU);
-    }
-    #ifdef ENABLE_AIRCOPY
-        else
-        if (Mode == BOOT_MODE_AIRCOPY)
-        {
-            gEeprom.DUAL_WATCH               = DUAL_WATCH_OFF;
-            gEeprom.BATTERY_SAVE             = 0;
-            #ifdef ENABLE_VOX
-                gEeprom.VOX_SWITCH           = false;
-            #endif
-            gEeprom.CROSS_BAND_RX_TX         = CROSS_BAND_OFF;
-            gEeprom.AUTO_KEYPAD_LOCK         = false;
-            gEeprom.KEY_1_SHORT_PRESS_ACTION = ACTION_OPT_NONE;
-            gEeprom.KEY_1_LONG_PRESS_ACTION  = ACTION_OPT_NONE;
-            gEeprom.KEY_2_SHORT_PRESS_ACTION = ACTION_OPT_NONE;
-            gEeprom.KEY_2_LONG_PRESS_ACTION  = ACTION_OPT_NONE;
-            gEeprom.KEY_M_LONG_PRESS_ACTION  = ACTION_OPT_NONE;
-
-            RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_LAST - 1, 43400000); // LPD
-
-            gRxVfo->CHANNEL_BANDWIDTH        = BANDWIDTH_NARROW;
-            gRxVfo->OUTPUT_POWER             = OUTPUT_POWER_LOW1;
-
-            RADIO_ConfigureSquelchAndOutputPower(gRxVfo);
-
-            gCurrentVfo = gRxVfo;
-
-            RADIO_SetupRegisters(true);
-            BK4819_SetupAircopy();
-            BK4819_ResetFSK();
-
-            gAircopyState = AIRCOPY_READY;
-
-            gEeprom.BACKLIGHT_TIME = 61;
-            gEeprom.KEY_LOCK = 0;
-
-            #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
-                gEeprom.CURRENT_STATE = 0; // Don't resume is active...
-            #endif 
-
-            GUI_SelectNextDisplay(DISPLAY_AIRCOPY);
-        }
-    #endif
-    else
-    {
-        GUI_SelectNextDisplay(DISPLAY_MAIN);
+#endif
+
+        GUI_SelectNextDisplay(DISPLAY_AIRCOPY);
     }
+#endif
+    GUI_SelectNextDisplay(DISPLAY_MAIN);
 }
+
+#endif

helper/boot.h

@@ -20,10 +20,10 @@
 #include <stdint.h>
 #include "driver/keyboard.h"
 
+#if defined(ENABLE_FEAT_F4HWN_RESCUE_OPS) || defined(ENABLE_AIRCOPY)
 enum BOOT_Mode_t
 {
     BOOT_MODE_NORMAL = 0,
-    BOOT_MODE_F_LOCK,
     #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         BOOT_MODE_RESCUE_OPS,
     #endif
@@ -38,4 +38,4 @@ BOOT_Mode_t BOOT_GetMode(void);
 void BOOT_ProcessMode(BOOT_Mode_t Mode);
 
 #endif
-
+#endif