From b45043aab292ca46583c66e24533f17abcd0637a Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Sun, 1 Oct 2023 10:27:10 +0100 Subject: [PATCH] Rename compile option ENABLE_NO_SCAN_TIMEOUT to ENABLE_CODE_SCAN_TIMEOUT --- Makefile | 6 +++--- README.md | 2 +- app/app.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 22d76f0..571b92f 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ ENABLE_BOOT_BEEPS := 0 ENABLE_COMPANDER := 1 ENABLE_SHOW_CHARGE_LEVEL := 0 ENABLE_REVERSE_BAT_SYMBOL := 1 -ENABLE_NO_SCAN_TIMEOUT := 1 +ENABLE_CODE_SCAN_TIMEOUT := 0 ENABLE_AM_FIX := 1 ENABLE_AM_FIX_SHOW_DATA := 1 ENABLE_SQUELCH_LOWER := 1 @@ -213,8 +213,8 @@ endif ifeq ($(ENABLE_REVERSE_BAT_SYMBOL),1) CFLAGS += -DENABLE_REVERSE_BAT_SYMBOL endif -ifeq ($(ENABLE_NO_SCAN_TIMEOUT),1) - CFLAGS += -DENABLE_NO_SCAN_TIMEOUT +ifeq ($(ENABLE_CODE_SCAN_TIMEOUT),1) + CFLAGS += -DENABLE_CODE_SCAN_TIMEOUT endif ifeq ($(ENABLE_AM_FIX),1) CFLAGS += -DENABLE_AM_FIX diff --git a/README.md b/README.md index 1203f3e..9b4fe41 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ ENABLE_BOOT_BEEPS := 0 give user audio feedback on volume knob ENABLE_COMPANDER := 1 compander option (per channel) ENABLE_SHOW_CHARGE_LEVEL := 0 show the charge level when the radio is on charge ENABLE_REVERSE_BAT_SYMBOL := 1 mirror the battery symbol on the status bar (+ pole on the right) -ENABLE_NO_SCAN_TIMEOUT := 1 remove the 32 sec timeout from the CTCSS/DCS scan (press exit butt to end scan) +ENABLE_CODE_SCAN_TIMEOUT := 0 enable/disable 32-sec CTCSS/DCS scan timeout (press exit butt to end scan if disabled) ENABLE_AM_FIX := 1 dynamically adjust the front end gains when in AM mode to helo prevent AM demodulator saturation - ignore the on-screen RSSI (for now) ENABLE_AM_FIX_SHOW_DATA := 1 show debug data for the AM fix ENABLE_SQUELCH_LOWER := 1 squelch settings more sensitive - plan to let user adjust it in the menu diff --git a/app/app.c b/app/app.c index 152f66a..b440648 100644 --- a/app/app.c +++ b/app/app.c @@ -1832,7 +1832,7 @@ void APP_TimeSlice500ms(void) } else #endif - #ifdef ENABLE_NO_SCAN_TIMEOUT + #ifndef ENABLE_CODE_SCAN_TIMEOUT if (gScreenToDisplay != DISPLAY_SCANNER) #endif GUI_SelectNextDisplay(DISPLAY_MAIN); @@ -1918,7 +1918,7 @@ void APP_TimeSlice500ms(void) { gScanProgressIndicator++; - #ifndef ENABLE_NO_SCAN_TIMEOUT + #ifdef ENABLE_CODE_SCAN_TIMEOUT if (gScanProgressIndicator > 32) { if (gScanCssState == SCAN_CSS_STATE_SCANNING && !gScanSingleFrequency)