Improve ScnRev - scan resume mode

This commit is contained in:
Armel FAUVEAU
2024-09-23 20:10:40 +02:00
parent 5bfe710bb9
commit 7fdc2cc3f9
6 changed files with 47 additions and 21 deletions

View File

@@ -398,6 +398,18 @@ Skip:
}
*/
if(gEeprom.SCAN_RESUME_MODE < 2)
{
gScanPauseDelayIn_10ms = scan_pause_delay_in_6_10ms + (scan_pause_delay_in_6_10ms * 24 * gEeprom.SCAN_RESUME_MODE);
gScheduleScanListen = false;
}
else if(gEeprom.SCAN_RESUME_MODE == 2)
{
CHFRSCANNER_Stop();
}
/*
switch (gEeprom.SCAN_RESUME_MODE)
{
case 0:
@@ -405,14 +417,20 @@ Skip:
gScheduleScanListen = false;
break;
case 62:
case 1:
gScanPauseDelayIn_10ms = scan_pause_delay_in_2_10ms * 5;
gScheduleScanListen = false;
break;
case 26:
CHFRSCANNER_Stop();
break;
default:
gScanPauseDelayIn_10ms = scan_pause_delay_in_1_10ms * gEeprom.SCAN_RESUME_MODE;
break;
//default:
// gScanPauseDelayIn_10ms = scan_pause_delay_in_5_10ms * (gEeprom.SCAN_RESUME_MODE - 1) * 5;
// break;
}
*/
}
break;

View File

@@ -102,11 +102,24 @@ void CHFRSCANNER_ContinueScanning(void)
void CHFRSCANNER_Found(void)
{
if(gEeprom.SCAN_RESUME_MODE > 0 && gEeprom.SCAN_RESUME_MODE < 61)
if (gEeprom.SCAN_RESUME_MODE > 2) {
if (!gScanPauseMode) {
gScanPauseDelayIn_10ms = scan_pause_delay_in_5_10ms * (gEeprom.SCAN_RESUME_MODE - 2) * 5;
gScanPauseMode = true;
}
} else {
gScanPauseDelayIn_10ms = 0;
}
// gScheduleScanListen is always false...
gScheduleScanListen = false;
/*
if(gEeprom.SCAN_RESUME_MODE > 1 && gEeprom.SCAN_RESUME_MODE < 26)
{
if (!gScanPauseMode)
{
gScanPauseDelayIn_10ms = scan_pause_delay_in_1_10ms * gEeprom.SCAN_RESUME_MODE;
gScanPauseDelayIn_10ms = scan_pause_delay_in_5_10ms * (gEeprom.SCAN_RESUME_MODE - 1) * 5;
gScheduleScanListen = false;
gScanPauseMode = true;
}
@@ -116,6 +129,7 @@ void CHFRSCANNER_Found(void)
gScanPauseDelayIn_10ms = 0;
gScheduleScanListen = false;
}
*/
/*
switch (gEeprom.SCAN_RESUME_MODE)

View File

@@ -176,7 +176,7 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
case MENU_SC_REV:
//*pMin = 0;
*pMax = 61;
*pMax = 26;
break;
case MENU_ROGER: