From 20e041c407f38f6deb3928b354e2dd7c47a365c9 Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Mon, 30 Sep 2024 20:48:00 +0200 Subject: [PATCH] Improve ScnRev --- app/app.c | 2 +- app/chFrScanner.c | 4 ++-- app/menu.c | 2 +- settings.c | 2 +- ui/menu.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/app.c b/app/app.c index f9baba4..5ed209c 100644 --- a/app/app.c +++ b/app/app.c @@ -401,7 +401,7 @@ Skip: } */ - if(gEeprom.SCAN_RESUME_MODE < 41) + if(gEeprom.SCAN_RESUME_MODE < 81) { if(gEeprom.SCAN_RESUME_MODE == 0) { diff --git a/app/chFrScanner.c b/app/chFrScanner.c index 65aac97..b249dc6 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 > 40) { + if (gEeprom.SCAN_RESUME_MODE > 80) { if (!gScanPauseMode) { - gScanPauseDelayIn_10ms = scan_pause_delay_in_5_10ms * (gEeprom.SCAN_RESUME_MODE - 40) * 5; + gScanPauseDelayIn_10ms = scan_pause_delay_in_5_10ms * (gEeprom.SCAN_RESUME_MODE - 80) * 5; gScanPauseMode = true; } } else { diff --git a/app/menu.c b/app/menu.c index 3e37120..d239e00 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 = 64; + *pMax = 104; break; case MENU_ROGER: diff --git a/settings.c b/settings.c index b57e0fe..ac7a0cc 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] < 65) ? Data[5] : 1; + gEeprom.SCAN_RESUME_MODE = (Data[5] < 105) ? Data[5] : 14; 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 476e1d9..237ae97 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -832,13 +832,13 @@ void UI_DisplayMenu(void) { strcpy(String, "STOP"); } - else if(gSubMenuSelection < 41) + else if(gSubMenuSelection < 81) { sprintf(String, "CARRIER\n%02ds:%03dms", ((gSubMenuSelection * 250) / 1000), ((gSubMenuSelection * 250) % 1000)); } else { - sprintf(String, "TIMEOUT\n%02dm:%02ds", (((gSubMenuSelection - 40) * 5) / 60), (((gSubMenuSelection - 40) * 5) % 60)); + sprintf(String, "TIMEOUT\n%02dm:%02ds", (((gSubMenuSelection - 80) * 5) / 60), (((gSubMenuSelection - 80) * 5) % 60)); } break;