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

Improve ScnRev - scan resume mode

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

26
app/app.c
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) switch (gEeprom.SCAN_RESUME_MODE)
{ {
case 0: case 0:
@@ -405,14 +417,20 @@ Skip:
gScheduleScanListen = false; gScheduleScanListen = false;
break; break;
case 62: case 1:
gScanPauseDelayIn_10ms = scan_pause_delay_in_2_10ms * 5;
gScheduleScanListen = false;
break;
case 26:
CHFRSCANNER_Stop(); CHFRSCANNER_Stop();
break; break;
default: //default:
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;
break; // break;
} }
*/
} }
break; break;

18
app/chFrScanner.c
View File

@@ -102,11 +102,24 @@ void CHFRSCANNER_ContinueScanning(void)
void CHFRSCANNER_Found(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) 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; gScheduleScanListen = false;
gScanPauseMode = true; gScanPauseMode = true;
} }
@@ -116,6 +129,7 @@ void CHFRSCANNER_Found(void)
gScanPauseDelayIn_10ms = 0; gScanPauseDelayIn_10ms = 0;
gScheduleScanListen = false; gScheduleScanListen = false;
} }
*/
/* /*
switch (gEeprom.SCAN_RESUME_MODE) switch (gEeprom.SCAN_RESUME_MODE)

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: case MENU_SC_REV:
//*pMin = 0; //*pMin = 0;
*pMax = 61; *pMax = 26;
break; break;
case MENU_ROGER: 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_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_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.KEY_2_LONG_PRESS_ACTION = (Data[4] < ACTION_OPT_LEN) ? Data[4] : ACTION_OPT_NONE;
gEeprom.SCAN_RESUME_MODE = (Data[5] < 62) ? Data[5] : 1; gEeprom.SCAN_RESUME_MODE = (Data[5] < 27) ? Data[5] : 1;
gEeprom.AUTO_KEYPAD_LOCK = (Data[6] < 2) ? Data[6] : false; gEeprom.AUTO_KEYPAD_LOCK = (Data[6] < 2) ? Data[6] : false;
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
gEeprom.POWER_ON_DISPLAY_MODE = (Data[7] < 6) ? Data[7] : POWER_ON_DISPLAY_MODE_VOLTAGE; gEeprom.POWER_ON_DISPLAY_MODE = (Data[7] < 6) ? Data[7] : POWER_ON_DISPLAY_MODE_VOLTAGE;

18
ui/menu.c
View File

@@ -227,14 +227,12 @@ const char* const gSubMenu_RXMode[] =
}; };
#endif #endif
/* const char gSubMenu_SC_REV[][13] =
const char gSubMenu_SC_REV[][8] =
{ {
"TIMEOUT", "CARRIER\nFAST",
"CARRIER", "CARRIER\nSLOW",
"STOP" "STOP"
}; };
*/
const char* const gSubMenu_MDF[] = const char* const gSubMenu_MDF[] =
{ {
@@ -828,17 +826,13 @@ void UI_DisplayMenu(void)
#endif #endif
case MENU_SC_REV: case MENU_SC_REV:
if(gSubMenuSelection == 0) if(gSubMenuSelection < 3)
{ {
sprintf(String, "%s", "CARRIER"); strcpy(String, gSubMenu_SC_REV[gSubMenuSelection]);
}
else if(gSubMenuSelection < 61)
{
sprintf(String, "%02dm:%02ds", (((gSubMenuSelection) * 5) / 60), (((gSubMenuSelection) * 5) % 60));
} }
else else
{ {
sprintf(String, "%s", "STOP"); sprintf(String, "TIMEOUT\n%02dm:%02ds", (((gSubMenuSelection - 2) * 5) / 60), (((gSubMenuSelection - 2) * 5) % 60));
} }
break; break;

2
ui/menu.h
View File

@@ -160,7 +160,7 @@ extern const char* const gSubMenu_RXMode[4];
#ifdef ENABLE_VOICE #ifdef ENABLE_VOICE
extern const char gSubMenu_VOICE[3][4]; extern const char gSubMenu_VOICE[3][4];
#endif #endif
extern const char gSubMenu_SC_REV[3][8]; extern const char gSubMenu_SC_REV[3][13];
extern const char* const gSubMenu_MDF[4]; extern const char* const gSubMenu_MDF[4];
#ifdef ENABLE_ALARM #ifdef ENABLE_ALARM
extern const char gSubMenu_AL_MOD[2][5]; extern const char gSubMenu_AL_MOD[2][5];