FIX #194: Spectrum going crazy when AM-fix is active

egzumer · Dec 7, 2023 · dc6d312 · dc6d312
1 parent 754d2ce
commit dc6d312
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/app/spectrum.c b/app/spectrum.c
@@ -290,8 +290,12 @@ uint16_t GetRssi() {
   while ((BK4819_ReadRegister(0x63) & 0b11111111) >= 255) {
     SYSTICK_DelayUs(100);
   }
-
-  return BK4819_GetRSSI();
+  uint16_t rssi = BK4819_GetRSSI();
+#ifdef ENABLE_AM_FIX
+  if(settings.modulationType==MODULATION_AM && gSetting_AM_fix)
+    rssi += AM_fix_get_gain_diff()*2;
+#endif
+  return rssi;
 }
 
 static void ToggleAudio(bool on) {
@@ -1121,8 +1125,11 @@ static void UpdateListening() {
 
 static void Tick() {
 #ifdef ENABLE_AM_FIX
-  if(settings.modulationType == MODULATION_AM) {
+  if (gNextTimeslice) {
+    gNextTimeslice = false;
+    if(settings.modulationType == MODULATION_AM) {
       AM_fix_10ms(vfo, !lockAGC); //allow AM_Fix to apply its AGC action
+    }
   }
 #endif