Merge pull request #53 from kamilsss655/rc17.3

Rc17.3
kamilsss655 · Jan 9, 2024 · a566155 · a566155
2 parents b5577c8 + 684aea4
commit a566155
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/app/app.c b/app/app.c
@@ -474,9 +474,6 @@ void APP_StartListening(FUNCTION_Type_t Function)
 		gUpdateStatus    = true;
 	}
 
-	BK4819_InitAGC(gEeprom.RX_AGC, gTxVfo->Modulation);
-	BK4819_SetAGC(gEeprom.RX_AGC!=RX_AGC_OFF);
-
 	// AF gain - original QS values
 	// if (gRxVfo->Modulation != MODULATION_FM){
 	// 	BK4819_WriteRegister(BK4819_REG_48, 0xB3A8);

diff --git a/app/common.c b/app/common.c
@@ -47,9 +47,8 @@ void COMMON_SwitchToVFOMode()
     #ifdef ENABLE_VOICE
         gAnotherVoiceID        = VOICE_ID_FREQUENCY_MODE;
     #endif
-    const uint8_t Vfo = gEeprom.TX_VFO;
-    SETTINGS_SaveVfoIndices();
-    RADIO_ConfigureChannel(Vfo, VFO_CONFIGURE_RELOAD);
+    gRequestSaveVFO     = true;
+    gVfoConfigureMode   = VFO_CONFIGURE_RELOAD;
     return;
 }
 void COMMON_SwitchToChannelMode()

diff --git a/driver/bk4819.c b/driver/bk4819.c
@@ -58,9 +58,6 @@ void BK4819_Init(void)
 
 	BK4819_SetDefaultAmplifierSettings();
 
-	BK4819_InitAGC(gEeprom.RX_AGC, gTxVfo->Modulation);
-	BK4819_SetAGC(gEeprom.RX_AGC!=RX_AGC_OFF);
-
 	BK4819_WriteRegister(BK4819_REG_19, 0b0001000001000001);   // <15> MIC AGC  1 = disable  0 = enable
 
 	BK4819_WriteRegister(BK4819_REG_7D, 0xE940);

diff --git a/main.c b/main.c
@@ -91,6 +91,9 @@ void Main(void)
 
 	RADIO_SetupRegisters(true);
 
+	BK4819_InitAGC(gEeprom.RX_AGC, gTxVfo->Modulation);
+	BK4819_SetAGC(gEeprom.RX_AGC!=RX_AGC_OFF);
+
 	for (i = 0; i < ARRAY_SIZE(gBatteryVoltages); i++)
 		BOARD_ADC_GetBatteryInfo(&gBatteryVoltages[i], &gBatteryCurrent);
 

diff --git a/radio.c b/radio.c
@@ -403,6 +403,9 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 
 	pVfo->Compander = att.compander;
 
+	BK4819_InitAGC(gEeprom.RX_AGC, gTxVfo->Modulation);
+	BK4819_SetAGC(gEeprom.RX_AGC!=RX_AGC_OFF);
+
 	RADIO_ConfigureSquelchAndOutputPower(pVfo);
 }