From f091db3270997c4bcaf06a67dfbddd1d8ea2e6c3 Mon Sep 17 00:00:00 2001 From: gullradriel <3157857+gullradriel@users.noreply.github.com> Date: Fri, 5 Apr 2024 23:29:18 +0200 Subject: [PATCH] Mic audio ak4951 fix + SSTV description (#2088) * fixed too long description, thanks to ImDroided * fixed ak4951 RxAudio not working on startup when enabled --------- Co-authored-by: gullradriel --- firmware/application/apps/ui_mictx.cpp | 30 +++++++++++++------------- sdcard/FREQMAN/SSTV.TXT | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/firmware/application/apps/ui_mictx.cpp b/firmware/application/apps/ui_mictx.cpp index 005303dc..34066266 100644 --- a/firmware/application/apps/ui_mictx.cpp +++ b/firmware/application/apps/ui_mictx.cpp @@ -523,21 +523,6 @@ MicTXView::MicTXView( }; check_mic_to_HP.set_value(mic_to_HP_enabled); - check_rxactive.on_select = [this](Checkbox&, bool v) { - // vumeter.set_value(0); //Start with a clean vumeter - rx_enabled = v; - check_mic_to_HP.hidden(rx_enabled); // Toggle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option) - if ((rx_enabled) && (transmitting)) - check_mic_to_HP.set_value(transmitting); // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time. - - if (rx_enabled) - check_va.set_value(false); // Disallow voice activation during RX audio (for now) - Future TODO: Should allow VOX during RX audio - - rxaudio(v); // Activate-Deactivate audio RX (receiver) accordingly - set_dirty(); // Refresh interface - }; - check_rxactive.set_value(rx_enabled); - tx_button.on_select = [this](Button&) { if (!transmitting) { set_tx(true); @@ -590,6 +575,21 @@ MicTXView::MicTXView( // Trigger receiver to update modulation. if (rx_enabled) receiver_model.set_squelch_level(receiver_model.squelch_level()); + + check_rxactive.on_select = [this](Checkbox&, bool v) { + // vumeter.set_value(0); //Start with a clean vumeter + rx_enabled = v; + check_mic_to_HP.hidden(rx_enabled); // Toggle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option) + if ((rx_enabled) && (transmitting)) + check_mic_to_HP.set_value(transmitting); // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time. + + if (rx_enabled) + check_va.set_value(false); // Disallow voice activation during RX audio (for now) - Future TODO: Should allow VOX during RX audio + + rxaudio(v); // Activate-Deactivate audio RX (receiver) accordingly + set_dirty(); // Refresh interface + }; + check_rxactive.set_value(rx_enabled); } MicTXView::MicTXView( diff --git a/sdcard/FREQMAN/SSTV.TXT b/sdcard/FREQMAN/SSTV.TXT index 2384c71d..7e5cd77c 100644 --- a/sdcard/FREQMAN/SSTV.TXT +++ b/sdcard/FREQMAN/SSTV.TXT @@ -1,5 +1,5 @@ # Common SSTV frequencies -# frequencies marked Active have more frequent transmissions +# 'Active' => most used f=3640000,d=SSTV 80M f=7043000,d=SSTV 40M - Active f=7170000,d=SSTV 40M - Active