diff --git a/app/app.c b/app/app.c index f522701..f1209c1 100644 --- a/app/app.c +++ b/app/app.c @@ -1589,7 +1589,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) else { if (Key != KEY_PTT) - gVoltageMenuCountdown = 2 * 30; // 30 sec + gVoltageMenuCountdown = g_menu_timeout; BACKLIGHT_TurnOn(); diff --git a/app/menu.c b/app/menu.c index da9706b..7ae0058 100644 --- a/app/menu.c +++ b/app/menu.c @@ -1322,5 +1322,5 @@ void MENU_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) } if (gScreenToDisplay == DISPLAY_MENU && gMenuCursor == MENU_VOL) - gVoltageMenuCountdown = 2 * 30; // 30 sec + gVoltageMenuCountdown = g_menu_timeout; } diff --git a/firmware b/firmware index c524c12..0196cc1 100644 Binary files a/firmware and b/firmware differ diff --git a/firmware.bin b/firmware.bin index a84ace6..ffe2ccf 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index ca0ada2..56a1ef4 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/misc.c b/misc.c index 8c166d6..c0ae8cf 100644 --- a/misc.c +++ b/misc.c @@ -20,6 +20,8 @@ const uint8_t g_scan_delay = 21; // 21 +const uint8_t g_menu_timeout = 2 * 30; // 30 seconds + const uint16_t gMax_bat_v = 840; // 8.4V const uint16_t gMin_bat_v = 660; // 6.6V diff --git a/misc.h b/misc.h index b513178..1ed3bfc 100644 --- a/misc.h +++ b/misc.h @@ -77,9 +77,13 @@ typedef enum CssScanMode_t CssScanMode_t; extern const uint8_t g_scan_delay; +extern const uint8_t g_menu_timeout; + extern const uint16_t gMax_bat_v; extern const uint16_t gMin_bat_v; +extern const uint8_t gMicGain_dB2[5]; + extern const uint32_t *gUpperLimitFrequencyBandTable; extern const uint32_t *gLowerLimitFrequencyBandTable; @@ -92,8 +96,6 @@ extern uint8_t gSetting_F_LOCK; extern bool gSetting_ScrambleEnable; extern uint8_t gSetting_F_LOCK; -extern const uint8_t gMicGain_dB2[5]; - extern const uint32_t gDefaultAesKey[4]; extern uint32_t gCustomAesKey[4]; extern bool bHasCustomAesKey;