Fix - Squelch level when filter mode changes

app/spectrum.c

@@ -51,6 +51,8 @@ uint16_t RssiValue[128] = {0};
 uint16_t SquelchLevel;
 uint8_t bExit;
 uint8_t bRXMode;
+uint8_t bResetSquelch;
+uint8_t bRestartScan;
 uint8_t bFilterEnabled;
 uint8_t bNarrow;
 uint16_t RssiLow;
@@ -193,6 +195,7 @@ void ChangeHoldFreq(uint8_t Up) {
 	} else {
 		CurrentFreqIndex = (CurrentFreqIndex + CurrentStepCount -1) % CurrentStepCount;
 	}
+	CurrentFreq = FreqMin + (CurrentFreqIndex * CurrentFreqStep);
 }
 
 void ChangeSquelchLevel(uint8_t Up) {
@@ -206,6 +209,8 @@ void ChangeSquelchLevel(uint8_t Up) {
 void ToggleFilter(void) {
 	bFilterEnabled ^= 1;
 	BK4819_EnableFilter(bFilterEnabled);
+	bResetSquelch = TRUE;
+	bRestartScan = TRUE;
 	DrawLabels();
 }
 
@@ -445,6 +450,8 @@ void Spectrum_Loop(void) {
 	uint32_t FreqToCheck;
 	CurrentFreqIndex = 0;
 	CurrentFreq = FreqMin;
+	bResetSquelch = TRUE;
+	bRestartScan = FALSE;
 
 	UI_DrawStatusIcon(139, ICON_BATTERY, true, COLOR_FOREGROUND);
 	UI_DrawBattery();
@@ -453,11 +460,17 @@ void Spectrum_Loop(void) {
 
 	while (1) {
 		FreqToCheck = FreqMin;
-		RssiLow = 330;
-		RssiHigh = 72;
+		bRestartScan = TRUE;
 
 		for (uint8_t i = 0; i < CurrentStepCount; i++) {
 
+			if (bRestartScan) {
+				bRestartScan = FALSE;
+				RssiLow = 330;
+				RssiHigh = 72;
+				i = 0;
+			}
+
 			BK4819_set_rf_frequency(FreqToCheck, TRUE);
 
 			DELAY_WaitMS(CurrentScanDelay);
@@ -483,7 +496,8 @@ void Spectrum_Loop(void) {
 			}
 		}
 
-		if (SquelchLevel == 0) {
+		if (bResetSquelch) {
+			bResetSquelch = FALSE;
 			SquelchLevel = RssiHigh + 5;
 		}