RX fixed bandwidth adjustments + squelch sensitivity adjustments

pdrbsts · Oct 5, 2023 · 9b2ce88 · 9b2ce88
1 parent b343993
commit 9b2ce88
Show file tree

Hide file tree

Showing 6 changed files with 586 additions and 450 deletions.
diff --git a/README.md b/README.md
@@ -61,13 +61,13 @@ ENABLE_COPY_CHAN_TO_VFO       := 1       copy current channel into the other VFO
 
 # New/modified function keys
 
-* Long-press 'M' = Copy selected channel into same VFO, then switch VFO to frequency mode
+* Long-press 'M' .. Copy selected channel into same VFO, then switch VFO to frequency mode
 *
-* Long-press '7' = Toggle selected channel scanlist setting .. if VOX  is disable in Makefile
-    or
-* Long-press '5' = Toggle selected channel scanlist setting .. if NOAA is disable in Makefile
+* Long-press '7' .. Toggle selected channel scanlist setting .. if VOX  is disabled in Makefile
+*       or
+* Long-press '5' .. Toggle selected channel scanlist setting .. if NOAA is disabled in Makefile
 *
-* Long-press '*' = Start scanning, then toggle scanlist scan 1, 2 or ALL channels (if in channel scan mode)
+* Long-press '*' .. Start scanning, then toggles scanlist scan 1, 2 or ALL channel scanning
 
 # Some changes made from the Quansheng firmware
 

diff --git a/app/app.c b/app/app.c
@@ -152,7 +152,7 @@ static void APP_CheckForIncoming(void)
 		gUpdateStatus    = true;
 	}
 	else
-	{
+	{	// RF scanning
 		if (gRxReceptionMode != RX_MODE_NONE)
 		{
 			if (gCurrentFunction != FUNCTION_INCOMING)
@@ -163,7 +163,6 @@ static void APP_CheckForIncoming(void)
 				updateRSSI(gEeprom.RX_VFO);
 				gUpdateRSSI = true;
 			}
-
 			return;
 		}
 
@@ -1068,7 +1067,8 @@ void APP_Update(void)
 	#else
 		if (gScreenToDisplay != DISPLAY_SCANNER && gScanState != SCAN_OFF && gScheduleScanListen && !gPttIsPressed)
 	#endif
-	{
+	{	// scanning
+
 		if (IS_FREQ_CHANNEL(gNextMrChannel))
 		{
 			if (gCurrentFunction == FUNCTION_INCOMING)

diff --git a/app/main.c b/app/main.c
@@ -549,16 +549,24 @@ static void MAIN_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)
 
 				#ifdef ENABLE_COPY_CHAN_TO_VFO
 
-					if (gEeprom.VFO_OPEN &&
-						gScanState == SCAN_OFF &&
-						gCssScanMode == CSS_SCAN_MODE_OFF)
-					{	// copy channel to VFO
+					if (gEeprom.VFO_OPEN && gCssScanMode == CSS_SCAN_MODE_OFF)
+					{
 
+						if (gScanState != SCAN_OFF)
+						{
+							if (gCurrentFunction != FUNCTION_INCOMING ||
+							    gRxReceptionMode == RX_MODE_NONE      ||
+								ScanPauseDelayIn_10ms == 0)
+							{	// scan is running (not paused)
+								return;
+							}
+						}
+
 						const unsigned int vfo = get_rx_VFO();
 
 						if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo]))
-						{	// swap to the VFO
-
+						{	// copy channel to VFO, then swap to the VFO
+							
 							const unsigned int channel = FREQ_CHANNEL_FIRST + gEeprom.VfoInfo[vfo].Band;
 
 							gEeprom.ScreenChannel[vfo] = channel;