From ed5ebc4854881c4ee809324f820829ac7c365054 Mon Sep 17 00:00:00 2001 From: Krzysiek Egzmont Date: Sun, 28 Jan 2024 21:58:44 +0100 Subject: [PATCH] FIX #441: Setting ENABLE_NO_CODE_SCAN_TIMEOUT at 1 or 0 has no effect --- Makefile | 2 +- app/app.c | 2 +- app/scanner.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 00e49d8f4..c2202ce76 100644 --- a/Makefile +++ b/Makefile @@ -318,7 +318,7 @@ ifeq ($(ENABLE_REVERSE_BAT_SYMBOL),1) CFLAGS += -DENABLE_REVERSE_BAT_SYMBOL endif ifeq ($(ENABLE_NO_CODE_SCAN_TIMEOUT),1) - CFLAGS += -DENABLE_CODE_SCAN_TIMEOUT + CFLAGS += -DENABLE_NO_CODE_SCAN_TIMEOUT endif ifeq ($(ENABLE_AM_FIX),1) CFLAGS += -DENABLE_AM_FIX diff --git a/app/app.c b/app/app.c index 330cc81aa..f78c09f68 100644 --- a/app/app.c +++ b/app/app.c @@ -1471,7 +1471,7 @@ void APP_TimeSlice500ms(void) #endif if (disp == DISPLAY_INVALID -#ifndef ENABLE_NO_CODE_SCAN_TIMEOUT +#ifdef ENABLE_NO_CODE_SCAN_TIMEOUT && !SCANNER_IsScanning() #endif ) { diff --git a/app/scanner.c b/app/scanner.c index a8b5e96e8..1bd0d552e 100644 --- a/app/scanner.c +++ b/app/scanner.c @@ -505,7 +505,7 @@ void SCANNER_TimeSlice500ms(void) { if (SCANNER_IsScanning() && gScannerSaveState == SCAN_SAVE_NO_PROMPT && gScanCssState < SCAN_CSS_STATE_FOUND) { gScanProgressIndicator++; -#ifdef ENABLE_NO_CODE_SCAN_TIMEOUT +#ifndef ENABLE_NO_CODE_SCAN_TIMEOUT if (gScanProgressIndicator > 32) { if (gScanCssState == SCAN_CSS_STATE_SCANNING && !gScanSingleFrequency) gScanCssState = SCAN_CSS_STATE_FOUND;