FIX #441: Setting ENABLE_NO_CODE_SCAN_TIMEOUT at 1 or 0 has no effect
This commit is contained in:
2
Makefile
2
Makefile
@@ -318,7 +318,7 @@ ifeq ($(ENABLE_REVERSE_BAT_SYMBOL),1)
|
|||||||
CFLAGS += -DENABLE_REVERSE_BAT_SYMBOL
|
CFLAGS += -DENABLE_REVERSE_BAT_SYMBOL
|
||||||
endif
|
endif
|
||||||
ifeq ($(ENABLE_NO_CODE_SCAN_TIMEOUT),1)
|
ifeq ($(ENABLE_NO_CODE_SCAN_TIMEOUT),1)
|
||||||
CFLAGS += -DENABLE_CODE_SCAN_TIMEOUT
|
CFLAGS += -DENABLE_NO_CODE_SCAN_TIMEOUT
|
||||||
endif
|
endif
|
||||||
ifeq ($(ENABLE_AM_FIX),1)
|
ifeq ($(ENABLE_AM_FIX),1)
|
||||||
CFLAGS += -DENABLE_AM_FIX
|
CFLAGS += -DENABLE_AM_FIX
|
||||||
|
@@ -1471,7 +1471,7 @@ void APP_TimeSlice500ms(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (disp == DISPLAY_INVALID
|
if (disp == DISPLAY_INVALID
|
||||||
#ifndef ENABLE_NO_CODE_SCAN_TIMEOUT
|
#ifdef ENABLE_NO_CODE_SCAN_TIMEOUT
|
||||||
&& !SCANNER_IsScanning()
|
&& !SCANNER_IsScanning()
|
||||||
#endif
|
#endif
|
||||||
) {
|
) {
|
||||||
|
@@ -505,7 +505,7 @@ void SCANNER_TimeSlice500ms(void)
|
|||||||
{
|
{
|
||||||
if (SCANNER_IsScanning() && gScannerSaveState == SCAN_SAVE_NO_PROMPT && gScanCssState < SCAN_CSS_STATE_FOUND) {
|
if (SCANNER_IsScanning() && gScannerSaveState == SCAN_SAVE_NO_PROMPT && gScanCssState < SCAN_CSS_STATE_FOUND) {
|
||||||
gScanProgressIndicator++;
|
gScanProgressIndicator++;
|
||||||
#ifdef ENABLE_NO_CODE_SCAN_TIMEOUT
|
#ifndef ENABLE_NO_CODE_SCAN_TIMEOUT
|
||||||
if (gScanProgressIndicator > 32) {
|
if (gScanProgressIndicator > 32) {
|
||||||
if (gScanCssState == SCAN_CSS_STATE_SCANNING && !gScanSingleFrequency)
|
if (gScanCssState == SCAN_CSS_STATE_SCANNING && !gScanSingleFrequency)
|
||||||
gScanCssState = SCAN_CSS_STATE_FOUND;
|
gScanCssState = SCAN_CSS_STATE_FOUND;
|
||||||
|
Reference in New Issue
Block a user