diff --git a/Makefile b/Makefile index 3ef6b2b..3e084eb 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,10 @@ ENABLE_ALARM ?= 0 ENABLE_TX1750 ?= 0 ENABLE_PWRON_PASSWORD ?= 0 ENABLE_DTMF_CALLING ?= 0 -ENABLE_FLASHLIGHT ?= 0 +ENABLE_FLASHLIGHT ?= 1 # ---- CUSTOM MODS ---- -ENABLE_SPECTRUM ?= 0 +ENABLE_SPECTRUM ?= 1 ENABLE_BIG_FREQ ?= 0 ENABLE_SMALL_BOLD ?= 0 ENABLE_CUSTOM_MENU_LAYOUT ?= 1 diff --git a/app/action.c b/app/action.c index 8a494e9..74fb7b1 100644 --- a/app/action.c +++ b/app/action.c @@ -113,7 +113,6 @@ void (*action_opt_table[])(void) = { #ifdef ENABLE_FEAT_F4HWN [ACTION_OPT_RXMODE] = &ACTION_RxMode, - [ACTION_OPT_MAINONLY] = &ACTION_MainOnly, [ACTION_OPT_PTT] = &ACTION_Ptt, [ACTION_OPT_WN] = &ACTION_Wn, [ACTION_OPT_BACKLIGHT] = &ACTION_BackLight, @@ -122,8 +121,6 @@ void (*action_opt_table[])(void) = { #else [ACTION_OPT_MUTE] = &FUNCTION_NOP, #endif - [ACTION_OPT_POWER_HIGH] = &ACTION_Power_High, - [ACTION_OPT_REMOVE_OFFSET] = &ACTION_Remove_Offset, #else [ACTION_OPT_RXMODE] = &FUNCTION_NOP, #endif @@ -633,16 +630,4 @@ void ACTION_BackLightOnDemand(void) gUpdateStatus = true; } #endif - - void ACTION_Power_High(void) - { - gPowerHigh = !gPowerHigh; - gVfoConfigureMode = VFO_CONFIGURE_RELOAD; - } - - void ACTION_Remove_Offset(void) - { - gRemoveOffset = !gRemoveOffset; - gVfoConfigureMode = VFO_CONFIGURE_RELOAD; - } #endif \ No newline at end of file diff --git a/app/action.h b/app/action.h index 4c0c6a0..ae1eac5 100644 --- a/app/action.h +++ b/app/action.h @@ -45,8 +45,6 @@ void ACTION_SwitchDemodul(void); #if !defined(ENABLE_SPECTRUM) || !defined(ENABLE_FMRADIO) void ACTION_Mute(void); #endif - void ACTION_Power_High(void); - void ACTION_Remove_Offset(void); #endif void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld); diff --git a/app/main.c b/app/main.c index f177629..f2c9a5f 100644 --- a/app/main.c +++ b/app/main.c @@ -643,7 +643,7 @@ static void MAIN_Key_MENU(bool bKeyPressed, bool bKeyHeld) { #ifdef ENABLE_FEAT_F4HWN // Exclude work with list 1, 2, 3 or all list if (gScanStateDir != SCAN_OFF) { - if (FUNCTION_IsRx()) { + if (FUNCTION_IsRx() || gScanPauseDelayIn_10ms > 9) { gMR_ChannelExclude[gTxVfo->CHANNEL_SAVE] = true; gVfoConfigureMode = VFO_CONFIGURE; diff --git a/settings.h b/settings.h index 82c7d08..c546abb 100644 --- a/settings.h +++ b/settings.h @@ -124,13 +124,10 @@ enum ACTION_OPT_t { ACTION_OPT_BLMIN_TMP_OFF, //BackLight Minimum Temporay OFF #ifdef ENABLE_FEAT_F4HWN ACTION_OPT_RXMODE, - ACTION_OPT_MAINONLY, ACTION_OPT_PTT, ACTION_OPT_WN, ACTION_OPT_BACKLIGHT, ACTION_OPT_MUTE, - ACTION_OPT_POWER_HIGH, - ACTION_OPT_REMOVE_OFFSET, #endif #ifdef ENABLE_REGA ACTION_OPT_REGA_ALARM, diff --git a/ui/menu.c b/ui/menu.c index b631bc5..554eb05 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -353,14 +353,11 @@ const t_sidefunction gSubMenu_SIDEFUNCTIONS[] = #endif #ifdef ENABLE_FEAT_F4HWN {"RX MOD", ACTION_OPT_RXMODE}, - {"MAIN ONLY", ACTION_OPT_MAINONLY}, {"PTT", ACTION_OPT_PTT}, {"WIDE\nNAR", ACTION_OPT_WN}, #if !defined(ENABLE_SPECTRUM) || !defined(ENABLE_FMRADIO) {"MUTE", ACTION_OPT_MUTE}, #endif - {"POWER\nHIGH", ACTION_OPT_POWER_HIGH}, - {"REMOVE\nOFFSET", ACTION_OPT_REMOVE_OFFSET}, #endif };