BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

ENABLE_FEAT_F4HWN_RESUME_STATE rename

Browse Source
This commit is contained in:
Armel FAUVEAU
2025-02-14 23:16:39 +01:00
parent a118418649
commit e881f17f12
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -46,7 +46,7 @@ ENABLE_FEAT_F4HWN_SPECTRUM ?= 1
ENABLE_FEAT_F4HWN_RX_TX_TIMER ?= 1 ENABLE_FEAT_F4HWN_RX_TX_TIMER ?= 1
ENABLE_FEAT_F4HWN_CHARGING_C ?= 0 ENABLE_FEAT_F4HWN_CHARGING_C ?= 0
ENABLE_FEAT_F4HWN_SLEEP ?= 1 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_NARROWER ?= 1
ENABLE_FEAT_F4HWN_CONTRAST ?= 1 ENABLE_FEAT_F4HWN_CONTRAST ?= 1
ENABLE_FEAT_F4HWN_RESCUE_OPS ?= 0 ENABLE_FEAT_F4HWN_RESCUE_OPS ?= 0
@@ -444,8 +444,8 @@ endif
ifeq ($(ENABLE_FEAT_F4HWN_SLEEP),1) ifeq ($(ENABLE_FEAT_F4HWN_SLEEP),1)
CFLAGS += -DENABLE_FEAT_F4HWN_SLEEP CFLAGS += -DENABLE_FEAT_F4HWN_SLEEP
endif endif
ifeq ($(ENABLE_FEAT_F4HWN_RESTORE_SCAN),1) ifeq ($(ENABLE_FEAT_F4HWN_RESUME_STATE),1)
CFLAGS += -DENABLE_FEAT_F4HWN_RESTORE_SCAN CFLAGS += -DENABLE_FEAT_F4HWN_RESUME_STATE
endif endif
ifeq ($(ENABLE_FEAT_F4HWN_NARROWER),1) ifeq ($(ENABLE_FEAT_F4HWN_NARROWER),1)
CFLAGS += -DENABLE_FEAT_F4HWN_NARROWER CFLAGS += -DENABLE_FEAT_F4HWN_NARROWER

4
app/action.c
View File

@@ -236,7 +236,7 @@ void ACTION_Scan(bool bRestart)
// channel mode. Keep scanning but toggle between scan lists // channel mode. Keep scanning but toggle between scan lists
gEeprom.SCAN_LIST_DEFAULT = (gEeprom.SCAN_LIST_DEFAULT + 1) % 6; gEeprom.SCAN_LIST_DEFAULT = (gEeprom.SCAN_LIST_DEFAULT + 1) % 6;
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
SETTINGS_WriteCurrentState(); SETTINGS_WriteCurrentState();
#endif #endif
@@ -245,7 +245,7 @@ void ACTION_Scan(bool bRestart)
gScanPauseDelayIn_10ms = 1; gScanPauseDelayIn_10ms = 1;
gScheduleScanListen = false; gScheduleScanListen = false;
} else { } else {
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
if(gScanRangeStart == 0) // No ScanRange if(gScanRangeStart == 0) // No ScanRange
{ {
gEeprom.CURRENT_STATE = 1; gEeprom.CURRENT_STATE = 1;

2
app/chFrScanner.c
View File

@@ -215,7 +215,7 @@ void CHFRSCANNER_Stop(void)
} }
} }
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
gEeprom.CURRENT_STATE = 0; gEeprom.CURRENT_STATE = 0;
SETTINGS_WriteCurrentState(); SETTINGS_WriteCurrentState();
#endif #endif

4
app/fm.c
View File

@@ -112,7 +112,7 @@ void FM_TurnOff(void)
gUpdateStatus = true; gUpdateStatus = true;
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
gEeprom.CURRENT_STATE = 0; gEeprom.CURRENT_STATE = 0;
SETTINGS_WriteCurrentState(); SETTINGS_WriteCurrentState();
#endif #endif
@@ -623,7 +623,7 @@ void FM_Start(void)
gEnableSpeaker = true; gEnableSpeaker = true;
gUpdateStatus = true; gUpdateStatus = true;
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
gEeprom.CURRENT_STATE = 3; gEeprom.CURRENT_STATE = 3;
SETTINGS_WriteCurrentState(); SETTINGS_WriteCurrentState();
#endif #endif

4
app/main.c
View File

@@ -431,7 +431,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
switch(Key) { switch(Key) {
case KEY_0...KEY_5: case KEY_0...KEY_5:
gEeprom.SCAN_LIST_DEFAULT = Key; gEeprom.SCAN_LIST_DEFAULT = Key;
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
SETTINGS_WriteCurrentState(); SETTINGS_WriteCurrentState();
#endif #endif
break; break;
@@ -747,7 +747,7 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
return; return;
/* /*
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
if(gScanRangeStart == 0) // No ScanRange if(gScanRangeStart == 0) // No ScanRange
{ {
gEeprom.CURRENT_STATE = 1; gEeprom.CURRENT_STATE = 1;

2
compile-with-docker.sh
View File

@@ -72,7 +72,7 @@ voxless() {
ENABLE_FEAT_F4HWN_PMR=1 \ ENABLE_FEAT_F4HWN_PMR=1 \
ENABLE_FEAT_F4HWN_GMRS_FRS_MURS=1 \ ENABLE_FEAT_F4HWN_GMRS_FRS_MURS=1 \
ENABLE_NOAA=0 \ ENABLE_NOAA=0 \
ENABLE_FEAT_F4HWN_RESTORE_SCAN=0 \ ENABLE_FEAT_F4HWN_RESUME_STATE=0 \
ENABLE_FEAT_F4HWN_CHARGING_C=0 \ ENABLE_FEAT_F4HWN_CHARGING_C=0 \
ENABLE_FEAT_F4HWN_NARROWER=0 \ ENABLE_FEAT_F4HWN_NARROWER=0 \
ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \ ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \

2
main.c
View File

@@ -291,7 +291,7 @@ void Main(void)
#endif #endif
} }
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
switch (gEeprom.CURRENT_STATE) { switch (gEeprom.CURRENT_STATE) {
case 1: case 1:
//gScanRangeStart = 0; //gScanRangeStart = 0;

6
settings.c
View File

@@ -83,7 +83,7 @@ void SETTINGS_InitEEPROM(void)
gEeprom.TAIL_TONE_ELIMINATION = (Data[6] < 2) ? Data[6] : false; gEeprom.TAIL_TONE_ELIMINATION = (Data[6] < 2) ? Data[6] : false;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
gEeprom.VFO_OPEN = Data[7] & 0x01; gEeprom.VFO_OPEN = Data[7] & 0x01;
gEeprom.CURRENT_STATE = (Data[7] >> 1) & 0x07; gEeprom.CURRENT_STATE = (Data[7] >> 1) & 0x07;
gEeprom.CURRENT_LIST = (Data[7] >> 4) & 0x07; gEeprom.CURRENT_LIST = (Data[7] >> 4) & 0x07;
@@ -653,7 +653,7 @@ void SETTINGS_SaveSettings(void)
State[6] = gEeprom.TAIL_TONE_ELIMINATION; State[6] = gEeprom.TAIL_TONE_ELIMINATION;
#endif #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); State[7] = (gEeprom.VFO_OPEN & 0x01) | ((gEeprom.CURRENT_STATE & 0x07) << 1) | ((gEeprom.SCAN_LIST_DEFAULT & 0x07) << 4);
#else #else
State[7] = gEeprom.VFO_OPEN; State[7] = gEeprom.VFO_OPEN;
@@ -1016,7 +1016,7 @@ State[1] = 0
EEPROM_WriteBuffer(0x1FF0, State); EEPROM_WriteBuffer(0x1FF0, State);
} }
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
void SETTINGS_WriteCurrentState(void) void SETTINGS_WriteCurrentState(void)
{ {
uint8_t State[8]; uint8_t State[8];

4
settings.h
View File

@@ -217,7 +217,7 @@ typedef struct {
bool SCAN_LIST_ENABLED[3]; bool SCAN_LIST_ENABLED[3];
uint8_t SCANLIST_PRIORITY_CH1[3]; uint8_t SCANLIST_PRIORITY_CH1[3];
uint8_t SCANLIST_PRIORITY_CH2[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_STATE;
uint8_t CURRENT_LIST; uint8_t CURRENT_LIST;
#endif #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_SaveBatteryCalibration(const uint16_t * batteryCalibration);
void SETTINGS_UpdateChannel(uint8_t channel, const VFO_Info_t *pVFO, bool keep, bool check, bool save); void SETTINGS_UpdateChannel(uint8_t channel, const VFO_Info_t *pVFO, bool keep, bool check, bool save);
void SETTINGS_WriteBuildOptions(void); void SETTINGS_WriteBuildOptions(void);
#ifdef ENABLE_FEAT_F4HWN_RESTORE_SCAN #ifdef ENABLE_FEAT_F4HWN_RESUME_STATE
void SETTINGS_WriteCurrentState(void); void SETTINGS_WriteCurrentState(void);
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_VOL #ifdef ENABLE_FEAT_F4HWN_VOL