portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-08-16 04:43:28 +00:00
Code Issues Packages Projects Releases 10 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
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/ui_navigation.cpp
+8 -8
View File
@@ -92,13 +92,13 @@ void NavigationView::focus() {
SystemMenuView::SystemMenuView(NavigationView& nav) {
add_items<7>({ {
{ "Receiver", [&nav](){ nav.push<ReceiverView>(nav, portapack::receiver_model); } },
{ "Capture", [&nav](){ nav.push<NotImplementedView>(nav); } },
{ "Analyze", [&nav](){ nav.push<NotImplementedView>(nav); } },
{ "Setup", [&nav](){ nav.push<SetupMenuView>(nav); } },
{ "About", [&nav](){ nav.push<AboutView>(nav); } },
{ "Debug", [&nav](){ nav.push<DebugMenuView>(nav); } },
{ "HackRF", [&nav](){ nav.push<HackRFFirmwareView>(nav); } },
{ "Receiver", [&nav](){ nav.push<ReceiverView>(portapack::receiver_model); } },
{ "Capture", [&nav](){ nav.push<NotImplementedView>(); } },
{ "Analyze", [&nav](){ nav.push<NotImplementedView>(); } },
{ "Setup", [&nav](){ nav.push<SetupMenuView>(); } },
{ "About", [&nav](){ nav.push<AboutView>(); } },
{ "Debug", [&nav](){ nav.push<DebugMenuView>(); } },
{ "HackRF", [&nav](){ nav.push<HackRFFirmwareView>(); } },
} });
}
@@ -134,7 +134,7 @@ SystemView::SystemView(
// Initial view.
// TODO: Restore from non-volatile memory?
navigation_view.push<SystemMenuView>(navigation_view);
navigation_view.push<SystemMenuView>();
}
Context& SystemView::context() const {