diff --git a/app/app.c b/app/app.c index e8e4a75..90d5c0c 100644 --- a/app/app.c +++ b/app/app.c @@ -401,6 +401,20 @@ Skip: } */ + if(gEeprom.SCAN_RESUME_MODE < 41) + { + if(gEeprom.SCAN_RESUME_MODE == 0) + { + CHFRSCANNER_Stop(); + } + else + { + gScanPauseDelayIn_10ms = scan_pause_delay_in_6_10ms + (scan_pause_delay_in_6_10ms * 24 * gEeprom.SCAN_RESUME_MODE); + gScheduleScanListen = false; + } + } + + /* 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); @@ -411,6 +425,7 @@ Skip: { CHFRSCANNER_Stop(); } + */ /* switch (gEeprom.SCAN_RESUME_MODE) diff --git a/app/chFrScanner.c b/app/chFrScanner.c index c7966f5..65aac97 100644 --- a/app/chFrScanner.c +++ b/app/chFrScanner.c @@ -102,9 +102,9 @@ void CHFRSCANNER_ContinueScanning(void) void CHFRSCANNER_Found(void) { - if (gEeprom.SCAN_RESUME_MODE > 2) { + if (gEeprom.SCAN_RESUME_MODE > 40) { if (!gScanPauseMode) { - gScanPauseDelayIn_10ms = scan_pause_delay_in_5_10ms * (gEeprom.SCAN_RESUME_MODE - 2) * 5; + gScanPauseDelayIn_10ms = scan_pause_delay_in_5_10ms * (gEeprom.SCAN_RESUME_MODE - 40) * 5; gScanPauseMode = true; } } else { diff --git a/app/menu.c b/app/menu.c index 17ae392..3e37120 100644 --- a/app/menu.c +++ b/app/menu.c @@ -176,7 +176,7 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax) case MENU_SC_REV: //*pMin = 0; - *pMax = 26; + *pMax = 64; break; case MENU_ROGER: diff --git a/settings.c b/settings.c index 2f83125..b57e0fe 100644 --- a/settings.c +++ b/settings.c @@ -119,7 +119,7 @@ void SETTINGS_InitEEPROM(void) gEeprom.KEY_1_LONG_PRESS_ACTION = (Data[2] < ACTION_OPT_LEN) ? Data[2] : ACTION_OPT_NONE; gEeprom.KEY_2_SHORT_PRESS_ACTION = (Data[3] < ACTION_OPT_LEN) ? Data[3] : ACTION_OPT_SCAN; gEeprom.KEY_2_LONG_PRESS_ACTION = (Data[4] < ACTION_OPT_LEN) ? Data[4] : ACTION_OPT_NONE; - gEeprom.SCAN_RESUME_MODE = (Data[5] < 27) ? Data[5] : 1; + gEeprom.SCAN_RESUME_MODE = (Data[5] < 65) ? Data[5] : 1; gEeprom.AUTO_KEYPAD_LOCK = (Data[6] < 2) ? Data[6] : false; #ifdef ENABLE_FEAT_F4HWN gEeprom.POWER_ON_DISPLAY_MODE = (Data[7] < 6) ? Data[7] : POWER_ON_DISPLAY_MODE_VOLTAGE; diff --git a/ui/menu.c b/ui/menu.c index febc668..d704170 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -835,13 +835,17 @@ void UI_DisplayMenu(void) #endif case MENU_SC_REV: - if(gSubMenuSelection < 3) + if(gSubMenuSelection == 0) { - strcpy(String, gSubMenu_SC_REV[gSubMenuSelection]); + strcpy(String, "STOP"); + } + else if(gSubMenuSelection < 41) + { + sprintf(String, "CARRIER\n%02ds:%03dms", ((gSubMenuSelection * 250) / 1000), ((gSubMenuSelection * 250) % 1000)); } else { - sprintf(String, "TIMEOUT\n%02dm:%02ds", (((gSubMenuSelection - 2) * 5) / 60), (((gSubMenuSelection - 2) * 5) % 60)); + sprintf(String, "TIMEOUT\n%02dm:%02ds", (((gSubMenuSelection - 40) * 5) / 60), (((gSubMenuSelection - 40) * 5) % 60)); } break; @@ -995,7 +999,7 @@ void UI_DisplayMenu(void) } else if(gSubMenuSelection < 121) { - sprintf(String, "%02dh:%02dm", (gSubMenuSelection / 60), (gSubMenuSelection % 60)); + sprintf(String, "%dh:%02dm", (gSubMenuSelection / 60), (gSubMenuSelection % 60)); } break; #endif