BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improve ScnRev

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-09-30 06:07:16 +02:00
parent 0aaa6ed4e6
commit 2cb10d12b3
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/app.c
View File

@@ -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)

4
app/chFrScanner.c
View File

@@ -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 {

2
app/menu.c
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 = 26;
*pMax = 64;
break;
case MENU_ROGER:

2
settings.c
View File

@@ -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;

12
ui/menu.c
View File

@@ -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