diff --git a/firmware/application/ui_receiver.cpp b/firmware/application/ui_receiver.cpp index d4996dbab..09b6540c8 100644 --- a/firmware/application/ui_receiver.cpp +++ b/firmware/application/ui_receiver.cpp @@ -371,10 +371,8 @@ ReceiverView::ReceiverView( &audio, &field_frequency, &field_lna, - //&options_baseband_bandwidth, &field_vga, &options_modulation, - //&options_baseband_oversampling, &field_volume, &view_frequency_options, &view_rf_gain_options, @@ -404,13 +402,7 @@ ReceiverView::ReceiverView( field_lna.on_show_options = [this]() { this->on_show_options_rf_gain(); }; - /* - options_baseband_bandwidth.set_by_value(receiver_model.baseband_bandwidth()); - options_baseband_bandwidth.on_change = [this](size_t n, OptionsField::value_t v) { - (void)n; - this->on_baseband_bandwidth_changed(v); - }; - */ + field_vga.set_value(receiver_model.vga()); field_vga.on_change = [this](int32_t v_db) { this->on_vga_changed(v_db); @@ -421,13 +413,7 @@ ReceiverView::ReceiverView( (void)n; this->on_modulation_changed(static_cast(v)); }; -/* - options_baseband_oversampling.set_by_value(receiver_model.baseband_oversampling()); - options_baseband_oversampling.on_change = [this](size_t n, OptionsField::value_t v) { - (void)n; - this->on_baseband_oversampling_changed(v); - }; -*/ + field_volume.set_value((receiver_model.headphone_volume() - wolfson::wm8731::headphone_gain_range.max).decibel() + 99); field_volume.on_change = [this](int32_t v) { this->on_headphone_volume_changed(v); @@ -555,8 +541,4 @@ void ReceiverView::on_headphone_volume_changed(int32_t v) { receiver_model.set_headphone_volume(new_volume); } -// void ReceiverView::on_baseband_oversampling_changed(int32_t v) { -// receiver_model.set_baseband_oversampling(v); -// } - } /* namespace ui */ diff --git a/firmware/application/ui_receiver.hpp b/firmware/application/ui_receiver.hpp index 1c9c84cbc..e75ad075f 100644 --- a/firmware/application/ui_receiver.hpp +++ b/firmware/application/ui_receiver.hpp @@ -382,11 +382,7 @@ private: LNAGainField field_lna { { 15 * 8, 0 * 16 } }; - /* - BasebandBandwidthField options_baseband_bandwidth { - { 15 * 8, 1 * 16 }, - }; - */ + NumberField field_vga { { 18 * 8, 0 * 16}, 2, @@ -405,24 +401,6 @@ private: { "SPEC", toUType(ReceiverModel::Mode::SpectrumAnalysis) }, } }; -/* - OptionsField options_baseband_oversampling { - { 24 * 8, 1 * 16 }, - 1, - { - { "4", 4 }, - { "6", 6 }, - { "8", 8 }, - } - }; -*/ - NumberField field_vregmode { - { 24 * 8, 1 * 16 }, - 1, - { 0, 1 }, - 1, - ' ', - }; NumberField field_volume { { 28 * 8, 0 * 16 }, @@ -455,7 +433,6 @@ private: void on_frequency_step_changed(rf::Frequency f); void on_reference_ppm_correction_changed(int32_t v); void on_headphone_volume_changed(int32_t v); -// void on_baseband_oversampling_changed(int32_t v); void on_edit_frequency(); };