Merge pull request #238 from mrkusypl/feature_update_v5_2

Optimizing the Audio Scope code

App/app/app.c

@@ -1371,14 +1371,14 @@ void APP_TimeSlice10ms(void)
     }
 
 #ifdef ENABLE_FEAT_F4HWN_AUDIO_SCOPE
-    // Sample audio amplitude every 30ms
-    if ((gFlashLightBlinkCounter % 3) == 0)
+    if (gCurrentFunction == FUNCTION_TRANSMIT) { // during TX only (FM RX has no usable audio register)
+        if (gSetting_mic_bar && (gFlashLightBlinkCounter % (30 / 10)) == 0) { // once every 30ms
+            // Sample audio amplitude
             UI_AudioScope_AddSample();
-    // Refresh display every 30ms during TX only (FM RX has no usable audio register)
-    if ((gFlashLightBlinkCounter % 3) == 0 &&
-        gScreenToDisplay == DISPLAY_MAIN &&
-        gCurrentFunction == FUNCTION_TRANSMIT)
+            // Refresh display
             UI_DisplayAudioScope();
+        }
+    }
 #endif
 
     bool gUpdateDisplayCurrent = gUpdateDisplay;

App/ui/main.c

@@ -235,7 +235,7 @@ void UI_DisplayAudioBar(void)
 
 #ifdef ENABLE_FEAT_F4HWN_AUDIO_SCOPE
 
-#define SCOPE_SAMPLES   42
+#define SCOPE_SAMPLES   43
 
 static uint16_t g_scope_buf[SCOPE_SAMPLES];
 static uint8_t  g_scope_write = 0;
@@ -245,8 +245,6 @@ void UI_AudioScope_AddSample(void)
 {
     // REG_64 (VoiceAmplitudeOut) is only meaningful in TX (mic input).
     // FM RX audio is frequency-encoded — no register gives the instantaneous waveform.
-    if (gCurrentFunction != FUNCTION_TRANSMIT)
-        return;
 
     const uint16_t value = BK4819_GetVoiceAmplitudeOut();
     g_scope_buf[g_scope_write] = value;
@@ -258,15 +256,6 @@ void UI_DisplayAudioScope(void)
     if (gLowBattery && !gLowBatteryConfirmed)
         return;
 
-#ifdef ENABLE_FEAT_F4HWN
-    RxBlinkLed = 0;
-    RxBlinkLedCounter = 0;
-    BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
-    const unsigned int line = isMainOnly() ? 5 : 3;
-#else
-    const unsigned int line = 3;
-#endif
-
     if (gScreenToDisplay != DISPLAY_MAIN
 #ifdef ENABLE_DTMF_CALLING
         || gDTMF_CallState != DTMF_CALL_STATE_NONE
@@ -279,6 +268,15 @@ void UI_DisplayAudioScope(void)
         return;
 #endif
 
+#ifdef ENABLE_FEAT_F4HWN
+    RxBlinkLed = 0;
+    RxBlinkLedCounter = 0;
+    BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
+    const unsigned int line = isMainOnly() ? 5 : 3;
+#else
+    const unsigned int line = 3;
+#endif
+
     uint8_t *p_line = gFrameBuffer[line];
     memset(p_line, 0, LCD_WIDTH);
 
@@ -1563,7 +1561,7 @@ void UI_DisplayMain(void)
         const bool rx = FUNCTION_IsRx();
 
 #ifdef ENABLE_FEAT_F4HWN_AUDIO_SCOPE
-        if (gCurrentFunction == FUNCTION_TRANSMIT) {
+        if (gSetting_mic_bar && gCurrentFunction == FUNCTION_TRANSMIT) {
             // Reserve the line so no other element overwrites it.
             // Actual drawing is handled exclusively by the app.c timeslice.
             center_line = CENTER_LINE_AUDIO_SCOPE;