From e881f17f121681bb7078a7203c9b909088dc3f78 Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Fri, 14 Feb 2025 23:16:39 +0100 Subject: [PATCH] ENABLE_FEAT_F4HWN_RESUME_STATE rename --- Makefile | 6 +++--- app/action.c | 4 ++-- app/chFrScanner.c | 2 +- app/fm.c | 4 ++-- app/main.c | 4 ++-- compile-with-docker.sh | 2 +- main.c | 2 +- settings.c | 6 +++--- settings.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 1ba972b..8180f6e 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ ENABLE_FEAT_F4HWN_SPECTRUM ?= 1 ENABLE_FEAT_F4HWN_RX_TX_TIMER ?= 1 ENABLE_FEAT_F4HWN_CHARGING_C ?= 0 ENABLE_FEAT_F4HWN_SLEEP ?= 1 -ENABLE_FEAT_F4HWN_RESTORE_SCAN ?= 1 +ENABLE_FEAT_F4HWN_RESUME_STATE ?= 1 ENABLE_FEAT_F4HWN_NARROWER ?= 1 ENABLE_FEAT_F4HWN_CONTRAST ?= 1 ENABLE_FEAT_F4HWN_RESCUE_OPS ?= 0 @@ -444,8 +444,8 @@ endif ifeq ($(ENABLE_FEAT_F4HWN_SLEEP),1) CFLAGS += -DENABLE_FEAT_F4HWN_SLEEP endif -ifeq ($(ENABLE_FEAT_F4HWN_RESTORE_SCAN),1) - CFLAGS += -DENABLE_FEAT_F4HWN_RESTORE_SCAN +ifeq ($(ENABLE_FEAT_F4HWN_RESUME_STATE),1) + CFLAGS += -DENABLE_FEAT_F4HWN_RESUME_STATE endif ifeq ($(ENABLE_FEAT_F4HWN_NARROWER),1) CFLAGS += -DENABLE_FEAT_F4HWN_NARROWER diff --git a/app/action.c b/app/action.c index 1eac744..ae908d9 100644 --- a/app/action.c +++ b/app/action.c @@ -236,7 +236,7 @@ void ACTION_Scan(bool bRestart) // channel mode. Keep scanning but toggle between scan lists gEeprom.SCAN_LIST_DEFAULT = (gEeprom.SCAN_LIST_DEFAULT + 1) % 6; - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE SETTINGS_WriteCurrentState(); #endif @@ -245,7 +245,7 @@ void ACTION_Scan(bool bRestart) gScanPauseDelayIn_10ms = 1; gScheduleScanListen = false; } else { - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE if(gScanRangeStart == 0) // No ScanRange { gEeprom.CURRENT_STATE = 1; diff --git a/app/chFrScanner.c b/app/chFrScanner.c index 9112276..d17ad0c 100644 --- a/app/chFrScanner.c +++ b/app/chFrScanner.c @@ -215,7 +215,7 @@ void CHFRSCANNER_Stop(void) } } - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE gEeprom.CURRENT_STATE = 0; SETTINGS_WriteCurrentState(); #endif diff --git a/app/fm.c b/app/fm.c index 318904d..353f3f2 100644 --- a/app/fm.c +++ b/app/fm.c @@ -112,7 +112,7 @@ void FM_TurnOff(void) gUpdateStatus = true; - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE gEeprom.CURRENT_STATE = 0; SETTINGS_WriteCurrentState(); #endif @@ -623,7 +623,7 @@ void FM_Start(void) gEnableSpeaker = true; gUpdateStatus = true; - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE gEeprom.CURRENT_STATE = 3; SETTINGS_WriteCurrentState(); #endif diff --git a/app/main.c b/app/main.c index 8bd1419..2de8caa 100644 --- a/app/main.c +++ b/app/main.c @@ -431,7 +431,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) switch(Key) { case KEY_0...KEY_5: gEeprom.SCAN_LIST_DEFAULT = Key; - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE SETTINGS_WriteCurrentState(); #endif break; @@ -747,7 +747,7 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld) return; /* - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE if(gScanRangeStart == 0) // No ScanRange { gEeprom.CURRENT_STATE = 1; diff --git a/compile-with-docker.sh b/compile-with-docker.sh index 2e45070..7ead853 100755 --- a/compile-with-docker.sh +++ b/compile-with-docker.sh @@ -72,7 +72,7 @@ voxless() { ENABLE_FEAT_F4HWN_PMR=1 \ ENABLE_FEAT_F4HWN_GMRS_FRS_MURS=1 \ ENABLE_NOAA=0 \ - ENABLE_FEAT_F4HWN_RESTORE_SCAN=0 \ + ENABLE_FEAT_F4HWN_RESUME_STATE=0 \ ENABLE_FEAT_F4HWN_CHARGING_C=0 \ ENABLE_FEAT_F4HWN_NARROWER=0 \ ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \ diff --git a/main.c b/main.c index 43e1dd0..c93566b 100644 --- a/main.c +++ b/main.c @@ -291,7 +291,7 @@ void Main(void) #endif } - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE switch (gEeprom.CURRENT_STATE) { case 1: //gScanRangeStart = 0; diff --git a/settings.c b/settings.c index 4ea995d..daca4c3 100644 --- a/settings.c +++ b/settings.c @@ -83,7 +83,7 @@ void SETTINGS_InitEEPROM(void) gEeprom.TAIL_TONE_ELIMINATION = (Data[6] < 2) ? Data[6] : false; #endif - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE gEeprom.VFO_OPEN = Data[7] & 0x01; gEeprom.CURRENT_STATE = (Data[7] >> 1) & 0x07; gEeprom.CURRENT_LIST = (Data[7] >> 4) & 0x07; @@ -653,7 +653,7 @@ void SETTINGS_SaveSettings(void) State[6] = gEeprom.TAIL_TONE_ELIMINATION; #endif - #ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN + #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE State[7] = (gEeprom.VFO_OPEN & 0x01) | ((gEeprom.CURRENT_STATE & 0x07) << 1) | ((gEeprom.SCAN_LIST_DEFAULT & 0x07) << 4); #else State[7] = gEeprom.VFO_OPEN; @@ -1016,7 +1016,7 @@ State[1] = 0 EEPROM_WriteBuffer(0x1FF0, State); } -#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN +#ifdef ENABLE_FEAT_F4HWN_RESUME_STATE void SETTINGS_WriteCurrentState(void) { uint8_t State[8]; diff --git a/settings.h b/settings.h index 2af8415..c42be02 100644 --- a/settings.h +++ b/settings.h @@ -217,7 +217,7 @@ typedef struct { bool SCAN_LIST_ENABLED[3]; uint8_t SCANLIST_PRIORITY_CH1[3]; uint8_t SCANLIST_PRIORITY_CH2[3]; -#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN +#ifdef ENABLE_FEAT_F4HWN_RESUME_STATE uint8_t CURRENT_STATE; uint8_t CURRENT_LIST; #endif @@ -321,7 +321,7 @@ void SETTINGS_SaveChannel(uint8_t Channel, uint8_t VFO, const VFO_Info_t *pVFO, void SETTINGS_SaveBatteryCalibration(const uint16_t * batteryCalibration); void SETTINGS_UpdateChannel(uint8_t channel, const VFO_Info_t *pVFO, bool keep, bool check, bool save); void SETTINGS_WriteBuildOptions(void); -#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN +#ifdef ENABLE_FEAT_F4HWN_RESUME_STATE void SETTINGS_WriteCurrentState(void); #endif #ifdef ENABLE_FEAT_F4HWN_VOL