From 4de25a20391906e94cf8d24763b77c846da682f5 Mon Sep 17 00:00:00 2001 From: Brumi-2021 <86470699+Brumi-2021@users.noreply.github.com> Date: Sun, 30 Jan 2022 10:58:43 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=80=9CAntenna=5FDC=5FBias=5Fmissin?= =?UTF-8?q?g=5Fin=5FAIS=5Fand=5FRADIOSONDE=E2=80=9D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4a57af64ce2a11d539b317637325ed78fdb75aa7. --- firmware/application/apps/ais_app.cpp | 14 ++++---------- firmware/application/apps/ui_sonde.cpp | 12 +++--------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/firmware/application/apps/ais_app.cpp b/firmware/application/apps/ais_app.cpp index a919ce11..7d42be86 100644 --- a/firmware/application/apps/ais_app.cpp +++ b/firmware/application/apps/ais_app.cpp @@ -307,13 +307,8 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } { recent_entry_detail_view.hidden(true); target_frequency_ = initial_target_frequency; - - receiver_model.set_tuning_frequency(tuning_frequency()); - receiver_model.set_sampling_rate(sampling_rate); - receiver_model.set_baseband_bandwidth(baseband_bandwidth); - receiver_model.enable(); // Before using radio::enable(), but not updating Ant.DC-Bias. -/* radio::enable({ // this can be removed, previous version,no DC-bias control. + radio::enable({ tuning_frequency(), sampling_rate, baseband_bandwidth, @@ -321,8 +316,8 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } { receiver_model.rf_amp(), static_cast(receiver_model.lna()), static_cast(receiver_model.vga()), - }); */ - + }); + options_channel.on_change = [this](size_t, OptionsField::value_t v) { this->on_frequency_changed(v); }; @@ -342,8 +337,7 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } { } AISAppView::~AISAppView() { -/* radio::disable(); */ - receiver_model.disable(); // to switch off all, including DC bias. + radio::disable(); baseband::shutdown(); } diff --git a/firmware/application/apps/ui_sonde.cpp b/firmware/application/apps/ui_sonde.cpp index f38fc3dd..12da24b2 100644 --- a/firmware/application/apps/ui_sonde.cpp +++ b/firmware/application/apps/ui_sonde.cpp @@ -100,12 +100,7 @@ SondeView::SondeView(NavigationView& nav) { use_crc = v; }; - receiver_model.set_tuning_frequency(tuning_frequency()); - receiver_model.set_sampling_rate(sampling_rate); - receiver_model.set_baseband_bandwidth(baseband_bandwidth); - receiver_model.enable(); // Before using radio::enable(), but not updating Ant.DC-Bias. - - /* radio::enable({ // this can be removed, previous version, no DC-bias ant. control. + radio::enable({ tuning_frequency(), sampling_rate, baseband_bandwidth, @@ -113,7 +108,7 @@ SondeView::SondeView(NavigationView& nav) { receiver_model.rf_amp(), static_cast(receiver_model.lna()), static_cast(receiver_model.vga()), - }); */ + }); // QR code with geo URI @@ -158,8 +153,7 @@ SondeView::SondeView(NavigationView& nav) { SondeView::~SondeView() { baseband::set_pitch_rssi(0, false); -/* radio::disable(); */ - receiver_model.disable(); // to switch off all, including DC bias. + radio::disable(); baseband::shutdown(); audio::output::stop(); }