From 8ce02a37a9551eca3bf9715ce1cde6b85499a778 Mon Sep 17 00:00:00 2001
From: OneOfEleven <OneOfEleven@users.noreply.github.com>
Date: Thu, 28 Sep 2023 23:32:08 +0100
Subject: [PATCH] Removed duplicate AM flag (IsAM)

---
 app/app.c           |  10 +++----
 app/menu.c          |  10 +++----
 audio.c             |   9 ++----
 firmware.bin        | Bin 57816 -> 57816 bytes
 firmware.packed.bin | Bin 57834 -> 57834 bytes
 functions.c         |   2 +-
 radio.c             |  67 ++++++++++++++++++++++----------------------
 radio.h             |   3 +-
 settings.c          |   2 +-
 ui/main.c           |   4 +--
 10 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/app/app.c b/app/app.c
index 0269301..b6f95d2 100644
--- a/app/app.c
+++ b/app/app.c
@@ -71,7 +71,7 @@ static void updateRSSI(const int vfo)
 
 	#ifdef ENABLE_AM_FIX
 		// add RF gain adjust compensation
-		if (gEeprom.VfoInfo[vfo].IsAM && gSetting_AM_fix)
+		if (gEeprom.VfoInfo[vfo].AM_mode && gSetting_AM_fix)
 			rssi -= rssi_gain_diff[vfo];
 	#endif
 	
@@ -433,7 +433,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	#endif
 
 	#ifdef ENABLE_AM_FIX
-		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM && reset_am_fix)
+		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && reset_am_fix)
 			AM_fix_reset(gEeprom.RX_CHANNEL);      // TODO: only reset it when moving channel/frequency
 	#endif
 
@@ -505,7 +505,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	uint8_t mixer     = orig_mixer;
 	uint8_t pga       = orig_pga;
 
-	if (gRxVfo->IsAM)
+	if (gRxVfo->AM_mode)
 	{	// AM
 /*
 		#ifndef ENABLE_AM_FIX
@@ -553,7 +553,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	#ifdef ENABLE_VOICE
 		if (gVoiceWriteIndex == 0)
 	#endif
-			BK4819_SetAF(gRxVfo->IsAM ? BK4819_AF_AM : BK4819_AF_OPEN);
+			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_OPEN);
 
 	FUNCTION_Select(Function);
 
@@ -1351,7 +1351,7 @@ void APP_TimeSlice10ms(void)
 	#endif
 
 	#ifdef ENABLE_AM_FIX
-		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM && gSetting_AM_fix)
+		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
 			AM_fix_10ms(gEeprom.RX_CHANNEL);
 	#endif
 
diff --git a/app/menu.c b/app/menu.c
index 3e10e41..0892870 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -625,8 +625,8 @@ void MENU_AcceptSetting(void)
 			break;
 
 		case MENU_AM:
-			gTxVfo->AM_CHANNEL_MODE = gSubMenuSelection;
-			gRequestSaveChannel     = 1;
+			gTxVfo->AM_mode     = gSubMenuSelection;
+			gRequestSaveChannel = 1;
 			return;
 
 		#ifdef ENABLE_AM_FIX
@@ -1013,7 +1013,7 @@ void MENU_ShowCurrentSetting(void)
 			break;
 
 		case MENU_AM:
-			gSubMenuSelection = gTxVfo->AM_CHANNEL_MODE;
+			gSubMenuSelection = gTxVfo->AM_mode;
 			break;
 
 		#ifdef ENABLE_AM_FIX
@@ -1459,9 +1459,9 @@ static void MENU_Key_STAR(const bool bKeyPressed, const bool bKeyHeld)
 	RADIO_SelectVfos();
 
 	#ifdef ENABLE_NOAA
-		if (IS_NOT_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE) && !gRxVfo->IsAM)
+		if (IS_NOT_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE) && gRxVfo->AM_mode == 0)
 	#else
-		if (!gRxVfo->IsAM)
+		if (gRxVfo->AM_mode == 0)
 	#endif
 	{
 		if (gMenuCursor == MENU_R_CTCS || gMenuCursor == MENU_R_DCS)
diff --git a/audio.c b/audio.c
index 79006a4..14de43d 100644
--- a/audio.c
+++ b/audio.c
@@ -267,7 +267,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 	
 				if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
 				{
-					if (gRxVfo->IsAM)
+					if (gRxVfo->AM_mode)
 						BK4819_SetAF(BK4819_AF_AM);
 					else
 						BK4819_SetAF(BK4819_AF_OPEN);
@@ -403,12 +403,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 		}
 	
 		if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
-		{
-			if (gRxVfo->IsAM)
-				BK4819_SetAF(BK4819_AF_AM);
-			else
-				BK4819_SetAF(BK4819_AF_OPEN);
-		}
+			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_OPEN);
 	
 		#ifdef ENABLE_FMRADIO
 			if (gFmRadioMode)
diff --git a/firmware.bin b/firmware.bin
index 1106721840dce09a84fb932e5fd59f9e603bf524..137053372d7239b0f26a4e2d42701529bb12e92b 100644
GIT binary patch
delta 3472
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

delta 3524
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
P#iphAS$V}Luj&3Dkj^Z7

diff --git a/firmware.packed.bin b/firmware.packed.bin
index 9be5749faf4c5c0c1917da91534a4432804f06d3..6aeb2fcbfae79d329fd7aa6cecda239106011b3c 100644
GIT binary patch
delta 5840
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
V9}%LkGF$1fg0vU&NC^3K{|7J7;Ozha

delta 5840
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

diff --git a/functions.c b/functions.c
index b77ed96..a9df9f7 100644
--- a/functions.c
+++ b/functions.c
@@ -46,7 +46,7 @@ void FUNCTION_Init(void)
 	{
 		gCurrentCodeType = gSelectedCodeType;
 		if (gCssScanMode == CSS_SCAN_MODE_OFF)
-			gCurrentCodeType = gRxVfo->IsAM ? CODE_TYPE_OFF : gRxVfo->pRX->CodeType;
+			gCurrentCodeType = gRxVfo->AM_mode ? CODE_TYPE_OFF : gRxVfo->pRX->CodeType;
 	}
 	#ifdef ENABLE_NOAA
 		else
diff --git a/radio.c b/radio.c
index c8ec9f8..8d90251 100644
--- a/radio.c
+++ b/radio.c
@@ -33,6 +33,7 @@
 #include "misc.h"
 #include "radio.h"
 #include "settings.h"
+#include "ui/menu.h"
 
 VFO_Info_t    *gTxVfo;
 VFO_Info_t    *gRxVfo;
@@ -135,10 +136,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t Band, uint32
 	#endif
 
 	if (ChannelSave == (FREQ_CHANNEL_FIRST + BAND2_108MHz))
-	{
-		pInfo->AM_CHANNEL_MODE = true;
-		pInfo->IsAM            = true;
-	}
+		pInfo->AM_mode = 1;
 
 	RADIO_ConfigureSquelchAndOutputPower(pInfo);
 }
@@ -220,8 +218,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 	Band = Attributes & MR_CH_BAND_MASK;
 	if (Band > BAND7_470MHz)
 	{
-//		Band = BAND6_400MHz;
-		Band = FREQUENCY_GetBand(gEeprom.ScreenChannel[VFO]);   // 111 bug fix, or have I broke it ?
+		Band = BAND6_400MHz;
+//		Band = FREQUENCY_GetBand(gEeprom.ScreenChannel[VFO]);   // 1of11 bug fix, or have I broke it ?
 	}
 
 	if (IS_MR_CHANNEL(Channel))
@@ -251,13 +249,15 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		uint8_t Tmp;
 		uint8_t Data[8];
 
+		// ***************
+
 		EEPROM_ReadBuffer(Base + 8, Data, sizeof(Data));
 
 		Tmp = Data[3] & 0x0F;
-		if (Tmp > 2)
+		if (Tmp > TX_OFFSET_FREQUENCY_DIRECTION_SUB)
 			Tmp = 0;
 		gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY_DIRECTION = Tmp;
-		gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE               = !!(Data[3] & 0x10);
+		gEeprom.VfoInfo[VFO].AM_mode = (Data[3] >> 4) & 1u;
 
 		Tmp = Data[6];
 		if (Tmp >= ARRAY_SIZE(StepFrequencyTable))
@@ -266,7 +266,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		gEeprom.VfoInfo[VFO].StepFrequency = StepFrequencyTable[Tmp];
 
 		Tmp = Data[7];
-		if (Tmp > 10)
+		if (Tmp > (ARRAY_SIZE(gSubMenu_SCRAMBLER) - 1))
 			Tmp = 0;
 		gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE = Tmp;
 
@@ -283,13 +283,13 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 				break;
 
 			case CODE_TYPE_CONTINUOUS_TONE:
-				if (Tmp >= 50)
+				if (Tmp > (ARRAY_SIZE(CTCSS_Options) - 1))
 					Tmp = 0;
 				break;
 
 			case CODE_TYPE_DIGITAL:
 			case CODE_TYPE_REVERSE_DIGITAL:
-				if (Tmp >= 104)
+				if (Tmp > (ARRAY_SIZE(DCS_Options) - 1))
 					Tmp = 0;
 				break;
 		}
@@ -305,13 +305,13 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 				break;
 
 			case CODE_TYPE_CONTINUOUS_TONE:
-				if (Tmp >= 50)
+				if (Tmp > (ARRAY_SIZE(CTCSS_Options) - 1))
 					Tmp = 0;
 				break;
 
 			case CODE_TYPE_DIGITAL:
 			case CODE_TYPE_REVERSE_DIGITAL:
-				if (Tmp >= 104)
+				if (Tmp > (ARRAY_SIZE(DCS_Options) - 1))
 					Tmp = 0;
 				break;
 		}
@@ -344,6 +344,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 			gEeprom.VfoInfo[VFO].DTMF_PTT_ID_TX_MODE  =   ((Data[5] >> 1) & 3u);
 		}
 
+		// ***************
+		
 		struct
 		{
 			uint32_t Frequency;
@@ -357,6 +359,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		if (Info.Offset >= 100000000)
 			Info.Offset = 1000000;
 		gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY = Info.Offset;
+
+		// ***************
 	}
 
 	Frequency = pRadio->freq_config_RX.Frequency;
@@ -410,16 +414,13 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 			pConfig->Frequency = 43300000;
 	}
 
-	if (gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE)
-	{
-		gEeprom.VfoInfo[VFO].IsAM                 = true;
-		gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE      = 0;
-		gEeprom.VfoInfo[VFO].DTMF_DECODING_ENABLE = false;
-		gEeprom.VfoInfo[VFO].freq_config_RX.CodeType    = CODE_TYPE_OFF;
-		gEeprom.VfoInfo[VFO].freq_config_TX.CodeType    = CODE_TYPE_OFF;
+	if (gEeprom.VfoInfo[VFO].AM_mode)
+	{	// freq/chan is in AM mode
+		gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE         = 0;
+		gEeprom.VfoInfo[VFO].DTMF_DECODING_ENABLE    = false;  // no reason to disable DTMF decoding, aircraft use DTMF on SSB
+		gEeprom.VfoInfo[VFO].freq_config_RX.CodeType = CODE_TYPE_OFF;
+		gEeprom.VfoInfo[VFO].freq_config_TX.CodeType = CODE_TYPE_OFF;
 	}
-	else
-		gEeprom.VfoInfo[VFO].IsAM = false;
 
 	#ifdef ENABLE_COMPANDER
 		gEeprom.VfoInfo[VFO].Compander = (Attributes & MR_CH_COMPAND) >> 4;
@@ -591,7 +592,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 		case BK4819_FILTER_BW_WIDE:
 		case BK4819_FILTER_BW_NARROW:
 			#ifdef ENABLE_AM_FIX
-//				BK4819_SetFilterBandwidth(Bandwidth, gRxVfo->IsAM && gSetting_AM_fix);
+//				BK4819_SetFilterBandwidth(Bandwidth, gRxVfo->AM_mode && gSetting_AM_fix);
 				BK4819_SetFilterBandwidth(Bandwidth, false);
 			#else
 				BK4819_SetFilterBandwidth(Bandwidth, false);
@@ -647,7 +648,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 		if (IS_NOT_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE))
 	#endif
 	{
-		if (!gRxVfo->IsAM)
+		if (gRxVfo->AM_mode == 0)
 		{
 			uint8_t CodeType = gSelectedCodeType;
 			uint8_t Code     = gSelectedCode;
@@ -722,15 +723,15 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	#ifdef ENABLE_NOAA
 		#ifdef ENABLE_FMRADIO
-			if (gEeprom.VOX_SWITCH && !gFmRadioMode && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && !gFmRadioMode && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
 		#else
-			if (gEeprom.VOX_SWITCH && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
 		#endif
 	#else
 		#ifdef ENABLE_FMRADIO
-			if (gEeprom.VOX_SWITCH && !gFmRadioMode && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && !gFmRadioMode && gCurrentVfo->AM_mode == 0)
 		#else
-			if (gEeprom.VOX_SWITCH && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && gCurrentVfo->AM_mode == 0)
 		#endif
 	#endif
 	{
@@ -742,13 +743,13 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	#ifdef ENABLE_COMPANDER
 		// RX expander
-		BK4819_SetCompander((!gRxVfo->IsAM && gRxVfo->Compander >= 2) ? gRxVfo->Compander : 0);
+		BK4819_SetCompander((gRxVfo->AM_mode == 0 && gRxVfo->Compander >= 2) ? gRxVfo->Compander : 0);
 	#endif
 
 	#if 0
 		// there's no reason the DTMF decoder can't be used in AM RX mode too
 		// aircraft comms use it on HF (AM and SSB)
-		if (gRxVfo->IsAM || (!gRxVfo->DTMF_DECODING_ENABLE && !gSetting_KILLED))
+		if (gRxVfo->AM_mode || (!gRxVfo->DTMF_DECODING_ENABLE && !gSetting_KILLED))
 		{
 			BK4819_DisableDTMF();
 		}
@@ -841,7 +842,7 @@ void RADIO_SetTxParameters(void)
 		case BK4819_FILTER_BW_WIDE:
 		case BK4819_FILTER_BW_NARROW:
 			#ifdef ENABLE_AM_FIX
-//				BK4819_SetFilterBandwidth(Bandwidth, gCurrentVfo->IsAM && gSetting_AM_fix);
+//				BK4819_SetFilterBandwidth(Bandwidth, gCurrentVfo->AM_mode && gSetting_AM_fix);
 				BK4819_SetFilterBandwidth(Bandwidth, false);
 			#else
 				BK4819_SetFilterBandwidth(Bandwidth, false);
@@ -853,7 +854,7 @@ void RADIO_SetTxParameters(void)
 
 	#ifdef ENABLE_COMPANDER
 		// TX compressor
-		BK4819_SetCompander((!gRxVfo->IsAM && (gRxVfo->Compander == 1 || gRxVfo->Compander >= 3)) ? gRxVfo->Compander : 0);
+		BK4819_SetCompander((gRxVfo->AM_mode == 0 && (gRxVfo->Compander == 1 || gRxVfo->Compander >= 3)) ? gRxVfo->Compander : 0);
 	#endif
 
 	BK4819_PrepareTransmit();
@@ -953,7 +954,7 @@ void RADIO_PrepareTX(void)
 	#endif
 	{
 		#ifndef ENABLE_TX_WHEN_AM
-			if (gCurrentVfo->IsAM)
+			if (gCurrentVfo->AM_mode)
 			{	// not allowed to TX if in AM mode
 				State = VFO_STATE_TX_DISABLE;
 			}
diff --git a/radio.h b/radio.h
index 70b39a6..1b85136 100644
--- a/radio.h
+++ b/radio.h
@@ -136,8 +136,7 @@ typedef struct VFO_Info_t
 
 	uint8_t        BUSY_CHANNEL_LOCK;
 
-	uint8_t        AM_CHANNEL_MODE;
-	bool           IsAM;
+	uint8_t        AM_mode;
 
 	#ifdef ENABLE_COMPANDER
 		uint8_t    Compander;
diff --git a/settings.c b/settings.c
index 56cd405..e0203a7 100644
--- a/settings.c
+++ b/settings.c
@@ -208,7 +208,7 @@ void SETTINGS_SaveChannel(uint8_t Channel, uint8_t VFO, const VFO_Info_t *pVFO,
 			State[0] =  pVFO->freq_config_RX.Code;
 			State[1] =  pVFO->freq_config_TX.Code;
 			State[2] = (pVFO->freq_config_TX.CodeType << 4) | pVFO->freq_config_RX.CodeType;
-			State[3] = (pVFO->AM_CHANNEL_MODE         << 4) | pVFO->TX_OFFSET_FREQUENCY_DIRECTION;
+			State[3] = ((pVFO->AM_mode & 1u)          << 4) | pVFO->TX_OFFSET_FREQUENCY_DIRECTION;
 			State[4] = 0
 				| (pVFO->BUSY_CHANNEL_LOCK << 4)
 				| (pVFO->OUTPUT_POWER      << 2)
diff --git a/ui/main.c b/ui/main.c
index b8ddb13..5259389 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -467,7 +467,7 @@ void UI_DisplayMain(void)
 		// ************
 
 		String[0] = '\0';
-		if (gEeprom.VfoInfo[vfo_num].IsAM)
+		if (gEeprom.VfoInfo[vfo_num].AM_mode)
 		{	// show the AM symbol
 			strcpy(String, "AM");
 		}
@@ -526,7 +526,7 @@ void UI_DisplayMain(void)
 	{	// we're free to use the middle empty line for something
 
 		#if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA)
-			if (gSetting_AM_fix && gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM)
+			if (gSetting_AM_fix && gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode)
 			{
 				switch (gCurrentFunction)
 				{