From 235a1a2f142e5083df2476aec4e72c4d2893f98f Mon Sep 17 00:00:00 2001
From: Krzysiek Egzmont <egzumer@gmail.com>
Date: Sat, 2 Dec 2023 18:00:45 +0100
Subject: [PATCH] Refactor

---
 app/app.c       |  3 +--
 app/menu.c      | 46 +++++++++++++++++-----------------------------
 driver/bk4819.c |  2 +-
 3 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/app/app.c b/app/app.c
index 8000ba9..4416cae 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1191,7 +1191,6 @@ void APP_TimeSlice10ms(void)
 	#endif
 
 	#ifdef ENABLE_AM_FIX
-//		if (gEeprom.VfoInfo[gEeprom.RX_VFO].Modulation != MODULATION_FM && gSetting_AM_fix)
 		if (gRxVfo->Modulation == MODULATION_AM && gSetting_AM_fix)
 			AM_fix_10ms(gEeprom.RX_VFO);
 	#endif
@@ -2015,7 +2014,7 @@ Skip:
 		gRequestSaveVFO = false;
 	}
 
-	if (gRequestSaveChannel > 0)
+	if (gRequestSaveChannel > 0) // TODO: remove the gRequestSaveChannel, why use global variable for that??
 	{
 		if (!bKeyHeld)
 		{
diff --git a/app/menu.c b/app/menu.c
index a3b8042..496c19f 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -375,7 +375,6 @@ void MENU_AcceptSetting(void)
 {
 	int32_t        Min;
 	int32_t        Max;
-	uint8_t        Code;
 	FREQ_Config_t *pConfig = &gTxVfo->freq_config_RX;
 
 	if (!MENU_GetLimits(UI_MENU_GetCurrentMenuId(), &Min, &Max))
@@ -414,62 +413,51 @@ void MENU_AcceptSetting(void)
 
 			// Fallthrough
 
-		case MENU_R_DCS:
-			if (gSubMenuSelection == 0)
-			{
-				if (pConfig->CodeType != CODE_TYPE_DIGITAL && pConfig->CodeType != CODE_TYPE_REVERSE_DIGITAL)
-				{
+		case MENU_R_DCS: {
+			if (gSubMenuSelection == 0) {
+				if (pConfig->CodeType != CODE_TYPE_DIGITAL && pConfig->CodeType != CODE_TYPE_REVERSE_DIGITAL) {
 					gRequestSaveChannel = 1;
 					return;
 				}
-				Code              = 0;
+				pConfig->Code = 0;
 				pConfig->CodeType = CODE_TYPE_OFF;
 			}
-			else
-			if (gSubMenuSelection < 105)
-			{
+			else if (gSubMenuSelection < 105) {
 				pConfig->CodeType = CODE_TYPE_DIGITAL;
-				Code              = gSubMenuSelection - 1;
+				pConfig->Code = gSubMenuSelection - 1;
 			}
-			else
-			{
+			else {
 				pConfig->CodeType = CODE_TYPE_REVERSE_DIGITAL;
-				Code              = gSubMenuSelection - 105;
+				pConfig->Code = gSubMenuSelection - 105;
 			}
 
-			pConfig->Code       = Code;
 			gRequestSaveChannel = 1;
 			return;
-
+		}
 		case MENU_T_CTCS:
 			pConfig = &gTxVfo->freq_config_TX;
 			[[fallthrough]];
-		case MENU_R_CTCS:
-			if (gSubMenuSelection == 0)
-			{
-				if (pConfig->CodeType != CODE_TYPE_CONTINUOUS_TONE)
-				{
+		case MENU_R_CTCS: {
+			if (gSubMenuSelection == 0) {
+				if (pConfig->CodeType != CODE_TYPE_CONTINUOUS_TONE) {
 					gRequestSaveChannel = 1;
 					return;
 				}
-				Code              = 0;
-				pConfig->Code     = Code;
+				pConfig->Code     = 0;
 				pConfig->CodeType = CODE_TYPE_OFF;
 
 				BK4819_ExitSubAu();
 			}
-			else
-			{
+			else {
+				pConfig->Code     = gSubMenuSelection - 1;
 				pConfig->CodeType = CODE_TYPE_CONTINUOUS_TONE;
-				Code              = gSubMenuSelection - 1;
-				pConfig->Code     = Code;
 
-				BK4819_SetCTCSSFrequency(CTCSS_Options[Code]);
+				BK4819_SetCTCSSFrequency(CTCSS_Options[pConfig->Code]);
 			}
 
 			gRequestSaveChannel = 1;
 			return;
-
+		}
 		case MENU_SFT_D:
 			gTxVfo->TX_OFFSET_FREQUENCY_DIRECTION = gSubMenuSelection;
 			gRequestSaveChannel                   = 1;
diff --git a/driver/bk4819.c b/driver/bk4819.c
index df3a3da..2ed8d38 100644
--- a/driver/bk4819.c
+++ b/driver/bk4819.c
@@ -669,7 +669,7 @@ void BK4819_SetupPowerAmplifier(const uint8_t bias, const uint32_t frequency)
 	//               7 = max
 	//               0 = min
 	//
-	//                                  280MHz       gain 1 = 1  gain 2 = 0  gain 1 = 4  gain 2 = 2
+	//                                  280MHz       g1=1  g2=0 (-14.9dBm),  g1=4  g2=2 (0.13dBm)
 	const uint8_t gain   = (frequency < 28000000) ? (1u << 3) | (0u << 0) : (4u << 3) | (2u << 0);
 	const uint8_t enable = 1;
 	BK4819_WriteRegister(BK4819_REG_36, (bias << 8) | (enable << 7) | (gain << 0));