diff --git a/Makefile b/Makefile index 96cc9e1..e3294a0 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ENABLE_OVERLAY := 0 ENABLE_LTO := 1 # UART Programming 2.9 kB ENABLE_UART := 1 -ENABLE_UART_DEBUG := 1 +ENABLE_UART_DEBUG := 0 # AirCopy 2.5 kB ENABLE_AIRCOPY := 0 ENABLE_AIRCOPY_REMEMBER_FREQ := 1 @@ -27,7 +27,7 @@ ENABLE_NOAA := 0 ENABLE_VOICE := 0 ENABLE_MUTE_RADIO_FOR_VOICE := 0 # Tx on Voice 1.0 kB -ENABLE_VOX := 0 +ENABLE_VOX := 1 ENABLE_VOX_MORE_SENSITIVE := 1 ENABLE_REDUCE_LOW_MID_TX_POWER := 1 # Tx Alarm 600 B diff --git a/app/app.c b/app/app.c index 66208ad..4394378 100644 --- a/app/app.c +++ b/app/app.c @@ -1842,15 +1842,15 @@ void APP_process_power_save(void) if (g_current_function == FUNCTION_POWER_SAVE) FUNCTION_Select(FUNCTION_RECEIVE); // come out of power save mode - g_schedule_power_save_tick_10ms = battery_save_count_10ms; // stay out of power save mode + g_power_save_pause_tick_10ms = power_save_pause_10ms; // stay out of power save mode } else - if (g_schedule_power_save) + if (g_power_save_pause_done) { // enter power save FUNCTION_Select(FUNCTION_POWER_SAVE); } - g_schedule_power_save = false; + g_power_save_pause_done = false; // ************************** @@ -2524,7 +2524,8 @@ static void APP_process_key(const key_code_t Key, const bool key_pressed, const FUNCTION_Select(FUNCTION_FOREGROUND); // stay awake - for now - g_schedule_power_save_tick_10ms = battery_save_count_10ms; + g_power_save_pause_tick_10ms = power_save_pause_10ms; + g_power_save_pause_done = false; #ifdef ENABLE_KEYLOCK // keep the auto keylock at bay diff --git a/firmware.bin b/firmware.bin index a26235e..d068956 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 25f922c..00435f7 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/functions.c b/functions.c index 099a773..1f03ed1 100644 --- a/functions.c +++ b/functions.c @@ -300,8 +300,8 @@ void FUNCTION_Select(function_type_t Function) break; } - g_schedule_power_save_tick_10ms = battery_save_count_10ms; - g_schedule_power_save = false; + g_power_save_pause_tick_10ms = power_save_pause_10ms; + g_power_save_pause_done = false; #ifdef ENABLE_FMRADIO g_fm_restore_tick_10ms = 0; diff --git a/misc.c b/misc.c index a69ffe7..c805dac 100644 --- a/misc.c +++ b/misc.c @@ -66,8 +66,7 @@ const uint16_t scan_pause_cdcss_10ms = 300 / 10; // 300ms const uint16_t scan_pause_freq_10ms = 100 / 10; // 100ms const uint16_t scan_pause_chan_10ms = 200 / 10; // 200ms -const uint16_t battery_save_count_10ms = 10000 / 10; // 10 seconds - +const uint16_t power_save_pause_10ms = 10000 / 10; // 10 seconds const uint16_t power_save1_10ms = 100 / 10; // 100ms const uint16_t power_save2_10ms = 200 / 10; // 200ms @@ -92,9 +91,8 @@ bool g_monitor_enabled; bool g_has_aes_key; uint32_t g_challenge[4]; -volatile uint16_t g_schedule_power_save_tick_10ms = battery_save_count_10ms; -volatile bool g_schedule_power_save; - +volatile uint16_t g_power_save_pause_tick_10ms = power_save_pause_10ms; +volatile bool g_power_save_pause_done; volatile bool g_power_save_expired; volatile uint16_t g_dual_watch_tick_10ms; diff --git a/misc.h b/misc.h index f4e7128..6dc9bb7 100644 --- a/misc.h +++ b/misc.h @@ -148,7 +148,7 @@ extern const uint8_t key_repeat_10ms; extern const uint16_t search_freq_css_10ms; extern const uint16_t search_10ms; -extern const uint16_t battery_save_count_10ms; +extern const uint16_t power_save_pause_10ms; extern const uint16_t power_save1_10ms; extern const uint16_t power_save2_10ms; @@ -183,9 +183,8 @@ extern const uint32_t g_default_aes_key[4]; extern bool g_has_aes_key; extern uint32_t g_challenge[4]; -extern volatile uint16_t g_schedule_power_save_tick_10ms; -extern volatile bool g_schedule_power_save; - +extern volatile uint16_t g_power_save_pause_tick_10ms; +extern volatile bool g_power_save_pause_done; extern volatile bool g_power_save_expired; extern volatile uint16_t g_dual_watch_tick_10ms; diff --git a/scheduler.c b/scheduler.c index a5fb3ed..33e7616 100644 --- a/scheduler.c +++ b/scheduler.c @@ -73,7 +73,7 @@ void SystickHandler(void) DECREMENT(g_found_ctcss_tick_10ms); if (g_current_function == FUNCTION_FOREGROUND) - DECREMENT_AND_TRIGGER(g_schedule_power_save_tick_10ms, g_schedule_power_save); + DECREMENT_AND_TRIGGER(g_power_save_pause_tick_10ms, g_power_save_pause_done); if (g_current_function == FUNCTION_POWER_SAVE) DECREMENT_AND_TRIGGER(g_power_save_tick_10ms, g_power_save_expired);