Merge pull request #5 from kamilsss655/am-fix-s-display-fix

Am fix s display fix
kamilsss655 · Dec 18, 2023 · 287594d · 287594d
2 parents fe6fbd6 + 94929be
commit 287594d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/am_fix.c b/am_fix.c
@@ -222,8 +222,8 @@ int16_t rssi_gain_diff[2] = {0, 0};
 // used to limit the max RF gain
 unsigned int max_index = ARRAY_SIZE(gain_table) - 1;
 
-// -89dBm, any higher and the AM demodulator starts to saturate/clip/distort
-const int16_t desired_rssi = (-89 + 160) * 2;
+// -110dBm, any higher and the AM demodulator starts to saturate/clip/distort
+const int16_t desired_rssi = (-110 + 180) * 2;
 
 void AM_fix_init(void)
 {	// called at boot-up
@@ -307,7 +307,7 @@ void AM_fix_10ms(const int vfo)
 		}
 	}
 #else
-	gCurrentRSSI[vfo] = rssi - rssi_gain_diff[vfo];
+	gCurrentRSSI[vfo] = rssi;
 #endif
 
 
@@ -374,7 +374,7 @@ void AM_fix_10ms(const int vfo)
 	}
 
 	// save the corrected RSSI level
-	gCurrentRSSI[vfo] = rssi - rssi_gain_diff[vfo];
+	gCurrentRSSI[vfo] = rssi;
 
 #ifdef ENABLE_AM_FIX_SHOW_DATA
 	if (counter == 0) {

diff --git a/app/app.c b/app/app.c
@@ -62,19 +62,23 @@
 #include "ui/menu.h"
 #include "ui/status.h"
 #include "ui/ui.h"
+#include "driver/systick.h"
 
 static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld);
 static void FlashlightTimeSlice();
 
 static void UpdateRSSI(const int vfo)
 {
+	while ((BK4819_ReadRegister(0x63) & 0b11111111) >= 255) {
+		SYSTICK_DelayUs(100);
+  	}
 	int16_t rssi = BK4819_GetRSSI();
 
-	#ifdef ENABLE_AM_FIX
-		// add RF gain adjust compensation
-		if (gEeprom.VfoInfo[vfo].Modulation == MODULATION_AM && gSetting_AM_fix)
-			rssi -= rssi_gain_diff[vfo];
-	#endif
+	// #ifdef ENABLE_AM_FIX
+	// 	// add RF gain adjust compensation
+	// 	if (gEeprom.VfoInfo[vfo].Modulation == MODULATION_AM && gSetting_AM_fix)
+	// 		rssi -= rssi_gain_diff[vfo];
+	// #endif
 
 	if (gCurrentRSSI[vfo] == rssi)
 		return;     // no change