Scan Delay Menu Option

OEFW-community · Apr 27, 2024 · ab6c7b8 · ab6c7b8
1 parent d4560ec
commit ab6c7b8
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/app/menu.c b/app/menu.c
@@ -65,6 +65,7 @@ static const char Menu[][14] = {
 	"VOX Delay     ",
 	"RX Save Mode  ",
 	"Scan Direction",
+	"Scan Delay    ",
 	"Scan Resume   ",
 	"Scan Blink    ",
 	"Squelch Mode  ",
@@ -477,6 +478,11 @@ void MENU_AcceptSetting(void)
 		SETTINGS_SaveGlobals();
 		break;
 
+	case MENU_SCAN_DELAY:
+		gExtendedSettings.ScanDelay = (gSettingCurrentValue + gSettingIndex) % gSettingMaxValues;
+		SETTINGS_SaveGlobals();
+		break;
+
 	case MENU_SCAN_RESUME:
 		gExtendedSettings.ScanResume = ((gSettingCurrentValue + gSettingIndex) % gSettingMaxValues) + 1;
 		SETTINGS_SaveGlobals();
@@ -889,6 +895,13 @@ void MENU_DrawSetting(void)
 		UI_DrawSettingRepeaterMode(gSettingCurrentValue);
 		break;
 
+	case MENU_SCAN_DELAY:
+		gSettingCurrentValue = gExtendedSettings.ScanDelay;
+		gSettingMaxValues = 62;
+		DISPLAY_Fill(0, 159, 1, 55, COLOR_BACKGROUND);
+		UI_DrawSettingNumList(gSettingCurrentValue, gSettingMaxValues);
+		break;
+
 	case MENU_SCAN_RESUME:
 		gSettingCurrentValue = gExtendedSettings.ScanResume - 1;
 		gSettingMaxValues = 3;
@@ -1328,6 +1341,10 @@ void MENU_ScrollSetting(uint8_t Key)
 		UI_DrawSettingRepeaterMode(gSettingCurrentValue);
 		break;
 
+	case MENU_SCAN_DELAY:
+		UI_DrawSettingNumList(gSettingCurrentValue, 62);
+		break;
+
 	case MENU_SCAN_RESUME:
 		UI_DrawSettingScanResume(gSettingCurrentValue);
 		break;

diff --git a/app/menu.h b/app/menu.h
@@ -47,6 +47,7 @@ enum {
 	MENU_VOX_DELAY,
 	MENU_SAVE_MODE,
 	MENU_SCAN_DIR,
+	MENU_SCAN_DELAY,
 	MENU_SCAN_RESUME,
 	MENU_SCAN_BLINK,
 	MENU_SQUELCH_MODE,

diff --git a/radio/settings.c b/radio/settings.c
@@ -117,6 +117,9 @@ void SETTINGS_LoadSettings(void)
 		gExtendedSettings.SqNoiseBase = 0x44;
 		gExtendedSettings.SqGlitchBase = 0x11;
 	}
+	if (gExtendedSettings.ScanDelay == 63) {
+		gExtendedSettings.ScanDelay = 35;
+	}
 
 	gFrequencyStep = FREQUENCY_GetStep(gSettings.FrequencyStep);
 

diff --git a/radio/settings.h b/radio/settings.h
@@ -179,7 +179,7 @@ typedef struct __attribute__((packed)) {
 	uint8_t SqGlitchBase;
 	//0x14
 	uint8_t SqMode: 2;
-	uint8_t Undefined2: 6; // free for use
+	uint8_t ScanDelay: 6;
 	//0x15...
 } gExtendedSettings_t;
 

diff --git a/task/keyaction.c b/task/keyaction.c
@@ -236,7 +236,7 @@ void KeypressAction(uint8_t Action) {
 				gManualScanDirection = gSettings.ScanDirection;
 				gScannerMode ^= 1;
 				bBeep740 = gScannerMode;
-				SCANNER_Countdown = 15;
+				SCANNER_Countdown = gExtendedSettings.ScanDelay;
 				UI_DrawScan();
 				break;
 

diff --git a/task/scanner.c b/task/scanner.c
@@ -57,7 +57,7 @@ void Task_Scanner(void) {
 #ifdef ENABLE_FM_RADIO
 				gFM_Mode > FM_MODE_OFF ? 50 :
 #endif
-				15;
+				gExtendedSettings.ScanDelay;
 		if (gExtendedSettings.ScanBlink) {
 			gpio_bits_flip(GPIOA, BOARD_GPIOA_LED_GREEN);
 		}