Merge pull request #18 from lvlhead/fmradio

Feature and improvement
prokrypt · Jul 26, 2024 · 0b6cf2a · 0b6cf2a
2 parents 94a591d + 00713f1
commit 0b6cf2a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/app/chFrScanner.c b/app/chFrScanner.c
@@ -179,6 +179,7 @@ void CHFRSCANNER_Stop(void)
 	dualscan=1;
 
 	RADIO_SetupRegisters(true);
+	gBoldBothVFO = false;
 	gUpdateDisplay = true;
 }
 
@@ -261,11 +262,15 @@ static void NextMemChannel(void)
 			case SCAN_NEXT_CHAN_DUAL_WATCH:
 				// dual watch is enabled - include the other VFO in the scan
 				if (dwchan && !gMonitor){
+					if (dualscan%2==0)
+						gBoldBothVFO = false;
 					if (++dualscan%4==0) {
 						dualscan=0;
 						currentScanList = SCAN_NEXT_CHAN_DUAL_WATCH;
-						if (!gMR_ChannelExclude[dwchan-1])
+						if (!gMR_ChannelExclude[dwchan-1]) {
 							gNextMrChannel   = dwchan-1;
+							gBoldBothVFO = true;
+						}
 						break;
 					}
 				}

diff --git a/app/chFrScanner.h b/app/chFrScanner.h
@@ -25,4 +25,4 @@ void CHFRSCANNER_ContinueScanning(void);
 	extern uint32_t lastFoundFrqOrChanOld;
 #endif
 
-#endif
+#endif
diff --git a/frequencies.c b/frequencies.c
@@ -149,7 +149,7 @@ uint32_t FREQUENCY_RoundToStep(uint32_t freq, uint16_t step)
 	if(step == 833) {
         uint32_t base = freq/2500*2500;
         int chno = (freq - base) / 700;    // convert entered aviation 8.33Khz channel number scheme to actual frequency. 
-        return base + (chno * 833) + (chno == 3);
+        return base + (chno * step) + (chno == 3);
 	}
 
 	if(step == 1)

diff --git a/misc.c b/misc.c
@@ -284,6 +284,7 @@ uint8_t           gIsLocked = 0xFF;
 #ifdef ENABLE_FEAT_F4HWN
 	bool          gK5startup = true;
 	bool          gBackLight = false;
+	bool          gBoldBothVFO = false;
 	uint8_t       gBacklightTimeOriginal;
 	uint8_t       gBacklightBrightnessOld;
 	uint8_t       gPttOnePushCounter = 0;

diff --git a/misc.h b/misc.h
@@ -350,6 +350,7 @@ extern volatile uint8_t      boot_counter_10ms;
 #ifdef ENABLE_FEAT_F4HWN
 	extern bool                  gK5startup;
 	extern bool                  gBackLight;
+	extern bool                  gBoldBothVFO;
 	extern uint8_t               gBacklightTimeOriginal;
 	extern uint8_t               gBacklightBrightnessOld;
 	extern uint8_t               gPttOnePushCounter;

diff --git a/ui/helper.c b/ui/helper.c
@@ -192,9 +192,9 @@ void UI_DrawPixelBuffer(uint8_t (*buffer)[128], uint8_t x, uint8_t y, bool black
 static void sort(int16_t *a, int16_t *b)
 {
 	if(*a > *b) {
-		int16_t t = *a;
-		*a = *b;
-		*b = t;
+		*a ^= *b;
+		*b ^= *a;
+		*a ^= *b;
 	}
 }
 

diff --git a/ui/main.c b/ui/main.c
@@ -986,7 +986,7 @@ void UI_DisplayMain(void)
 							}
 							else
 							{
-								if(activeTxVFO == vfo_num) {
+								if((activeTxVFO == vfo_num) || gBoldBothVFO) {
 									UI_PrintStringSmallBold(String, 32 + 4, 0, line);
 								}
 								else