Force channel-only mode by disabling VFO access

Author: aditaa

board.c

@@ -532,7 +532,7 @@ void BOARD_EEPROM_Init(void)
 	gEeprom.DUAL_WATCH            = (Data[4] < 3) ? Data[4] : DUAL_WATCH_CHAN_A;
 	gEeprom.BACKLIGHT             = (Data[5] < 6) ? Data[5] : 5;
 	gEeprom.TAIL_NOTE_ELIMINATION = (Data[6] < 2) ? Data[6] : true;
-	gEeprom.VFO_OPEN              = (Data[7] < 2) ? Data[7] : true;
+	gEeprom.VFO_OPEN              = false;
 
 	// 0E80..0E87
 	EEPROM_ReadBuffer(0x0E80, Data, 8);
@@ -685,8 +685,10 @@ void BOARD_EEPROM_Init(void)
 	gSetting_350EN          = (Data[5] < 2) ? Data[5] : true;
 	gSetting_ScrambleEnable = (Data[6] < 2) ? Data[6] : true;
 
-	if (!gEeprom.VFO_OPEN) {
+	if (IS_FREQ_CHANNEL(gEeprom.ScreenChannel[0])) {
 		gEeprom.ScreenChannel[0] = gEeprom.MrChannel[0];
+	}
+	if (IS_FREQ_CHANNEL(gEeprom.ScreenChannel[1])) {
 		gEeprom.ScreenChannel[1] = gEeprom.MrChannel[1];
 	}
 
@@ -776,4 +778,3 @@ void BOARD_FactoryReset(bool bIsAll)
 		}
 	}
 }
-

radio.c

@@ -166,13 +166,28 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Configure)
 		}
 #endif
 		if (IS_MR_CHANNEL(Channel)) {
-			Channel = RADIO_FindNextChannel(Channel, RADIO_CHANNEL_UP, false, VFO);
-			if (Channel == 0xFF) {
-				Channel = gEeprom.FreqChannel[VFO];
-				gEeprom.ScreenChannel[VFO] = gEeprom.FreqChannel[VFO];
+			uint8_t NextChannel = RADIO_FindNextChannel(Channel, RADIO_CHANNEL_UP, false, VFO);
+
+			if (NextChannel == 0xFF) {
+				if (gEeprom.VFO_OPEN) {
+					Channel = gEeprom.FreqChannel[VFO];
+					gEeprom.ScreenChannel[VFO] = Channel;
+				} else {
+					NextChannel = gEeprom.MrChannel[VFO];
+					if (!IS_MR_CHANNEL(NextChannel) || gMR_ChannelAttributes[NextChannel] == 0xFF) {
+						NextChannel = RADIO_FindNextChannel(MR_CHANNEL_FIRST, RADIO_CHANNEL_UP, false, VFO);
+						if (NextChannel == 0xFF) {
+							NextChannel = MR_CHANNEL_FIRST;
+						}
+					}
+					gEeprom.MrChannel[VFO] = NextChannel;
+					gEeprom.ScreenChannel[VFO] = NextChannel;
+					Channel = NextChannel;
+				}
 			} else {
-				gEeprom.ScreenChannel[VFO] = Channel;
-				gEeprom.MrChannel[VFO] = Channel;
+				gEeprom.ScreenChannel[VFO] = NextChannel;
+				gEeprom.MrChannel[VFO] = NextChannel;
+				Channel = NextChannel;
 			}
 		}
 	} else {
@@ -181,15 +196,25 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Configure)
 
 	Attributes = gMR_ChannelAttributes[Channel];
 	if (Attributes == 0xFF) {
-		uint8_t Index;
-
 		if (IS_MR_CHANNEL(Channel)) {
-			Channel = gEeprom.FreqChannel[VFO];
-			gEeprom.ScreenChannel[VFO] = gEeprom.FreqChannel[VFO];
+			uint8_t Fallback = RADIO_FindNextChannel(MR_CHANNEL_FIRST, RADIO_CHANNEL_UP, false, VFO);
+
+			if (Fallback != 0xFF && gMR_ChannelAttributes[Fallback] != 0xFF) {
+				Channel = Fallback;
+				gEeprom.ScreenChannel[VFO] = Fallback;
+				gEeprom.MrChannel[VFO] = Fallback;
+				Attributes = gMR_ChannelAttributes[Channel];
+			} else {
+				Channel = gEeprom.FreqChannel[VFO];
+				gEeprom.ScreenChannel[VFO] = Channel;
+			}
+		}
+		if (Attributes == 0xFF) {
+			uint8_t Index = Channel - FREQ_CHANNEL_FIRST;
+
+			RADIO_InitInfo(pRadio, Channel, Index, gLowerLimitFrequencyBandTable[Index]);
+			return;
 		}
-		Index = Channel - FREQ_CHANNEL_FIRST;
-		RADIO_InitInfo(pRadio, Channel, Index, gLowerLimitFrequencyBandTable[Index]);
-		return;
 	}
 
 	Band = Attributes & MR_CH_BAND_MASK;
@@ -853,4 +878,3 @@ void RADIO_SendEndOfTransmission(void)
 	}
 	BK4819_ExitDTMF_TX(true);
 }
-

settings.c

@@ -101,7 +101,8 @@ void SETTINGS_SaveSettings(void)
 	State[4] = gEeprom.DUAL_WATCH;
 	State[5] = gEeprom.BACKLIGHT;
 	State[6] = gEeprom.TAIL_NOTE_ELIMINATION;
-	State[7] = gEeprom.VFO_OPEN;
+	gEeprom.VFO_OPEN = false;
+	State[7] = false;
 
 	EEPROM_WriteBuffer(0x0E78, State);
 
@@ -267,4 +268,3 @@ void SETTINGS_UpdateChannel(uint8_t Channel, const VFO_Info_t *pVFO, bool bUpdat
 		gMR_ChannelAttributes[Channel] = Attributes;
 	}
 }
-