TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-05-29 12:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make NavigationView an implicit first argument to any instance pushed onto nav stack.

Browse Source
This commit is contained in:
Jared Boone 2015-12-14 11:18:59 -08:00
parent 0828c66b8a
commit a340cbb74b
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/application/ui_debug.cpp
View File

@ -108,22 +108,22 @@ void RegistersWidget::draw_values(
DebugMenuView::DebugMenuView(NavigationView& nav) { DebugMenuView::DebugMenuView(NavigationView& nav) {
add_items<7>({ { add_items<7>({ {
{ "Memory", [&nav](){ nav.push<DebugMemoryView>(nav); } }, { "Memory", [&nav](){ nav.push<DebugMemoryView>(); } },
{ "Radio State", [&nav](){ nav.push<NotImplementedView>(nav); } }, { "Radio State", [&nav](){ nav.push<NotImplementedView>(); } },
{ "SD Card", [&nav](){ nav.push<NotImplementedView>(nav); } }, { "SD Card", [&nav](){ nav.push<NotImplementedView>(); } },
{ "RFFC5072", [&nav](){ nav.push<RegistersView>( { "RFFC5072", [&nav](){ nav.push<RegistersView>(
nav, "RFFC5072", RegistersWidgetConfig { 31, 2, 4, 4 }, "RFFC5072", RegistersWidgetConfig { 31, 2, 4, 4 },
[](const size_t register_number) { return radio::first_if.read(register_number); } [](const size_t register_number) { return radio::first_if.read(register_number); }
); } }, ); } },
{ "MAX2837", [&nav](){ nav.push<RegistersView>( { "MAX2837", [&nav](){ nav.push<RegistersView>(
nav, "MAX2837", RegistersWidgetConfig { 32, 2, 3, 4 }, "MAX2837", RegistersWidgetConfig { 32, 2, 3, 4 },
[](const size_t register_number) { return radio::second_if.read(register_number); } [](const size_t register_number) { return radio::second_if.read(register_number); }
); } }, ); } },
{ "Si5351C", [&nav](){ nav.push<RegistersView>( { "Si5351C", [&nav](){ nav.push<RegistersView>(
nav, "Si5351C", RegistersWidgetConfig { 96, 2, 2, 8 }, "Si5351C", RegistersWidgetConfig { 96, 2, 2, 8 },
[](const size_t register_number) { return portapack::clock_generator.read_register(register_number); } [](const size_t register_number) { return portapack::clock_generator.read_register(register_number); }
); } }, ); } },
{ "WM8731", [&nav](){ nav.push<NotImplementedView>(nav); } }, { "WM8731", [&nav](){ nav.push<NotImplementedView>(); } },
} }); } });
on_left = [&nav](){ nav.pop(); }; on_left = [&nav](){ nav.pop(); };
} }

16
firmware/application/ui_navigation.cpp
View File

@ -92,13 +92,13 @@ void NavigationView::focus() {
SystemMenuView::SystemMenuView(NavigationView& nav) { SystemMenuView::SystemMenuView(NavigationView& nav) {
add_items<7>({ { add_items<7>({ {
{ "Receiver", [&nav](){ nav.push<ReceiverView>(nav, portapack::receiver_model); } }, { "Receiver", [&nav](){ nav.push<ReceiverView>(portapack::receiver_model); } },
{ "Capture", [&nav](){ nav.push<NotImplementedView>(nav); } }, { "Capture", [&nav](){ nav.push<NotImplementedView>(); } },
{ "Analyze", [&nav](){ nav.push<NotImplementedView>(nav); } }, { "Analyze", [&nav](){ nav.push<NotImplementedView>(); } },
{ "Setup", [&nav](){ nav.push<SetupMenuView>(nav); } }, { "Setup", [&nav](){ nav.push<SetupMenuView>(); } },
{ "About", [&nav](){ nav.push<AboutView>(nav); } }, { "About", [&nav](){ nav.push<AboutView>(); } },
{ "Debug", [&nav](){ nav.push<DebugMenuView>(nav); } }, { "Debug", [&nav](){ nav.push<DebugMenuView>(); } },
{ "HackRF", [&nav](){ nav.push<HackRFFirmwareView>(nav); } }, { "HackRF", [&nav](){ nav.push<HackRFFirmwareView>(); } },
} }); } });
} }
@ -134,7 +134,7 @@ SystemView::SystemView(
// Initial view. // Initial view.
// TODO: Restore from non-volatile memory? // TODO: Restore from non-volatile memory?
navigation_view.push<SystemMenuView>(navigation_view); navigation_view.push<SystemMenuView>();
} }
Context& SystemView::context() const { Context& SystemView::context() const {

2
firmware/application/ui_navigation.hpp
View File

@ -59,7 +59,7 @@ public:
template<class T, class... Args> template<class T, class... Args>
T* push(Args&&... args) { T* push(Args&&... args) {
return reinterpret_cast<T*>(push_view(std::unique_ptr<View>(new T(std::forward<Args>(args)...)))); return reinterpret_cast<T*>(push_view(std::unique_ptr<View>(new T(*this, std::forward<Args>(args)...))));
} }
void pop(); void pop();

2
firmware/application/ui_receiver.cpp
View File

@ -423,7 +423,7 @@ ReceiverView::ReceiverView(
}; };
field_frequency.on_edit = [this, &nav]() { field_frequency.on_edit = [this, &nav]() {
// TODO: Provide separate modal method/scheme? // TODO: Provide separate modal method/scheme?
auto new_view = nav.push<FrequencyKeypadView>(nav, this->receiver_model.tuning_frequency()); auto new_view = nav.push<FrequencyKeypadView>(this->receiver_model.tuning_frequency());
new_view->on_changed = [this](rf::Frequency f) { new_view->on_changed = [this](rf::Frequency f) {
this->on_tuning_frequency_changed(f); this->on_tuning_frequency_changed(f);
this->field_frequency.set_value(f); this->field_frequency.set_value(f);

6
firmware/application/ui_setup.cpp
View File

@ -159,9 +159,9 @@ void AboutView::focus() {
SetupMenuView::SetupMenuView(NavigationView& nav) { SetupMenuView::SetupMenuView(NavigationView& nav) {
add_items<3>({ { add_items<3>({ {
{ "Date/Time", [&nav](){ nav.push<SetDateTimeView>(nav); } }, { "Date/Time", [&nav](){ nav.push<SetDateTimeView>(); } },
{ "Frequency Correction", [&nav](){ nav.push<SetFrequencyCorrectionView>(nav); } }, { "Frequency Correction", [&nav](){ nav.push<SetFrequencyCorrectionView>(); } },
{ "Touch", [&nav](){ nav.push<NotImplementedView>(nav); } }, { "Touch", [&nav](){ nav.push<NotImplementedView>(); } },
} }); } });
on_left = [&nav](){ nav.pop(); }; on_left = [&nav](){ nav.pop(); };
} }