FIX #158: Don't allow to enter DTMF input when scan range is active

egzumer · Nov 29, 2023 · f9e10da · f9e10da
1 parent 5ad8229
commit f9e10da
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/app/main.c b/app/main.c
@@ -631,23 +631,23 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 
 	if (bKeyPressed) // just pressed
 	{	
-		// gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
-		gBeepToPlay = BEEP_880HZ_40MS_OPTIONAL;
 		return;
 	}
 
 	// just released
 
 	if (!gWasFKeyPressed) // pressed without the F-key
 	{	
-
-		#ifdef ENABLE_NOAA
-			if (gScanStateDir == SCAN_OFF && !IS_NOAA_CHANNEL(gTxVfo->CHANNEL_SAVE))
-		#else
-			if (gScanStateDir == SCAN_OFF)
-		#endif
+		if (gScanStateDir == SCAN_OFF 
+#ifdef ENABLE_NOAA
+			&& !IS_NOAA_CHANNEL(gTxVfo->CHANNEL_SAVE)
+#endif
+#ifdef ENABLE_SCAN_RANGES
+			&& gScanRangeStart == 0
+#endif		
+		)
 		{	// start entering a DTMF string
-
+			gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
 			memmove(gDTMF_InputBox, gDTMF_String, MIN(sizeof(gDTMF_InputBox), sizeof(gDTMF_String) - 1));
 			gDTMF_InputBox_Index  = 0;
 			gDTMF_InputMode       = true;
@@ -656,6 +656,8 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 
 			gRequestDisplayScreen = DISPLAY_MAIN;
 		}
+		else
+			gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
 	}
 	else
 	{	// with the F-key
@@ -676,7 +678,6 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 	}
 
 	gPttWasReleased = true;
-
 	gUpdateStatus   = true;
 }