mirror of
https://github.com/armel/uv-k1-k5v3-firmware-custom.git
synced 2026-10-02 03:15:37 +00:00
FIX #441: Setting ENABLE_NO_CODE_SCAN_TIMEOUT at 1 or 0 has no effect
This commit is contained in:
1 parent
c74c0d20fc
commit
ed5ebc4854
3 files changed
+3
-3
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
) {
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user