diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 617bed0ec..90cacbbfa 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -92,7 +92,7 @@ void NavigationView::focus() { SystemMenuView::SystemMenuView(NavigationView& nav) { add_items<7>({ { - { "Receiver", [&nav](){ nav.push(portapack::receiver_model); } }, + { "Receiver", [&nav](){ nav.push(); } }, { "Capture", [&nav](){ nav.push(); } }, { "Analyze", [&nav](){ nav.push(); } }, { "Setup", [&nav](){ nav.push(); } }, diff --git a/firmware/application/ui_receiver.cpp b/firmware/application/ui_receiver.cpp index 82e7c4bdd..ed13ae839 100644 --- a/firmware/application/ui_receiver.cpp +++ b/firmware/application/ui_receiver.cpp @@ -363,10 +363,8 @@ void LNAGainField::on_focus() { /* ReceiverView **********************************************************/ ReceiverView::ReceiverView( - NavigationView& nav, - ReceiverModel& receiver_model -) : receiver_model(receiver_model) -{ + NavigationView& nav +) { add_children({ { &rssi, &channel, @@ -394,7 +392,7 @@ ReceiverView::ReceiverView( }; field_frequency.on_edit = [this, &nav]() { // TODO: Provide separate modal method/scheme? - auto new_view = nav.push(this->receiver_model.tuning_frequency()); + auto new_view = nav.push(receiver_model.tuning_frequency()); new_view->on_changed = [this](rf::Frequency f) { this->on_tuning_frequency_changed(f); this->field_frequency.set_value(f); diff --git a/firmware/application/ui_receiver.hpp b/firmware/application/ui_receiver.hpp index fa0d575c5..922e1f73e 100644 --- a/firmware/application/ui_receiver.hpp +++ b/firmware/application/ui_receiver.hpp @@ -354,7 +354,7 @@ constexpr Style style_options_group { class ReceiverView : public View { public: - ReceiverView(NavigationView& nav, ReceiverModel& receiver_model); + ReceiverView(NavigationView& nav); ~ReceiverView(); void on_show() override; @@ -363,8 +363,6 @@ public: void focus() override; private: - ReceiverModel& receiver_model; - RSSI rssi { { 19 * 8, 0, 11 * 8, 4 }, };