From 9c7d6a38e5fe3332085b58baf0b8ddf2b3fe72b8 Mon Sep 17 00:00:00 2001
From: OneOfEleven <OneOfEleven@users.noreply.github.com>
Date: Thu, 5 Oct 2023 22:59:26 +0100
Subject: [PATCH] Remember scan ALL channels option across power cycles

---
 app/app.c           |   6 +++---
 board.c             |   3 ++-
 firmware.bin        | Bin 53752 -> 53752 bytes
 firmware.packed.bin | Bin 53770 -> 53770 bytes
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/app.c b/app/app.c
index 684884e..4279eaa 100644
--- a/app/app.c
+++ b/app/app.c
@@ -660,7 +660,7 @@ static void MR_NextChannel(void)
 					if (RADIO_CheckValidChannel(chan1, false, 0))
 					{
 						gCurrentScanList = SCAN_NEXT_CHAN_SCANLIST1;
-						gNextMrChannel = chan1;
+						gNextMrChannel   = chan1;
 						break;
 					}
 				}
@@ -1079,14 +1079,14 @@ void APP_Update(void)
 			if (gCurrentFunction == FUNCTION_INCOMING)
 				APP_StartListening(gMonitor ? FUNCTION_MONITOR : FUNCTION_RECEIVE, true);
 			else
-				FREQ_NextChannel();
+				FREQ_NextChannel();  // switch to next frequency
 		}
 		else
 		{
 			if (gCurrentCodeType == CODE_TYPE_OFF && gCurrentFunction == FUNCTION_INCOMING)
 				APP_StartListening(gMonitor ? FUNCTION_MONITOR : FUNCTION_RECEIVE, true);
 			else
-				MR_NextChannel();
+				MR_NextChannel();    // switch to next channel
 		}
 
 		gScanPauseMode      = false;
diff --git a/board.c b/board.c
index 259b0a5..a632726 100644
--- a/board.c
+++ b/board.c
@@ -687,7 +687,8 @@ void BOARD_EEPROM_Init(void)
 	
 	// 0F18..0F1F
 	EEPROM_ReadBuffer(0x0F18, Data, 8);
-	gEeprom.SCAN_LIST_DEFAULT = (Data[0] < 2) ? Data[0] : false;
+//	gEeprom.SCAN_LIST_DEFAULT = (Data[0] < 2) ? Data[0] : false;
+	gEeprom.SCAN_LIST_DEFAULT = (Data[0] < 3) ? Data[0] : false;  // we now have 'all' channel scan option
 	for (i = 0; i < 2; i++)
 	{
 		const unsigned int j = 1 + (i * 3);
diff --git a/firmware.bin b/firmware.bin
index a6a9476c1cf3dd44e680fa2122c9f751657d15ca..56821b471d3b2955ef2b2338ce4708655e709a02 100644
GIT binary patch
delta 42
rcmeydnEA(I<_#<cj7*zZ4f49#Q<F_oEmKl9SM9cAgLC#Dv=jgUQ1lOh

delta 42
rcmeydnEA(I<_#<cjEtLE4f49#O_PmH%#tlOSM9cAgLC#Dv=jgUKJ^Y-

diff --git a/firmware.packed.bin b/firmware.packed.bin
index d847bb87997d0f76a607d11649c51ec113a60eba..3c786dcdc32540d4ea186373467d50c780ead4ab 100644
GIT binary patch
delta 58
zcmV-A0LA}`qyvhi1F!}l2QBx61zEofvkf2z5CJl?6)<j#2RA-qEv?lAvx>Vu1_z_Y
QMPGw_`m@i$IS>NOA510{egFUf

delta 58
zcmV-A0LA}`qyvhi1F!}l2YvT~R93iGvkf2z5CJi>6)<j#2WLKHe4^4=vx>Vu1_$%T
QLk^64rnAq%IS>M}mxS6EG5`Po