TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 20:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Really go home before starting app from serial (#1762)

Browse Source
This commit is contained in:
E.T 2024-01-12 17:33:41 +01:00 committed by GitHub
parent eaac40df3a
commit 0a8194fa10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/ui_navigation.cpp
View File

@ -146,7 +146,7 @@ std::vector<AppInfoConsole> NavigationView::fixedAppListFC = {
{"lookingglass", "Looking Glass", RX}}; {"lookingglass", "Looking Glass", RX}};
bool NavigationView::StartAppByName(const char* name) { bool NavigationView::StartAppByName(const char* name) {
pop(); home(false);
if (strcmp(name, "adsbrx") == 0) { if (strcmp(name, "adsbrx") == 0) {
push<ADSBRxView>(); push<ADSBRxView>();
return true; return true;
@ -660,6 +660,14 @@ void NavigationView::pop(bool trigger_update) {
if (on_pop) on_pop(); if (on_pop) on_pop();
} }
void NavigationView::home(bool trigger_update) {
while (view_stack.size() > 1) {
pop(false);
}
if (trigger_update) update_view();
}
void NavigationView::display_modal( void NavigationView::display_modal(
const std::string& title, const std::string& title,
const std::string& message) { const std::string& message) {

1
firmware/application/ui_navigation.hpp
View File

@ -91,6 +91,7 @@ class NavigationView : public View {
View* push_view(std::unique_ptr<View> new_view); View* push_view(std::unique_ptr<View> new_view);
void replace(View* v); void replace(View* v);
void pop(bool trigger_update = true); void pop(bool trigger_update = true);
void home(bool trigger_update);
void display_modal(const std::string& title, const std::string& message); void display_modal(const std::string& title, const std::string& message);
void display_modal( void display_modal(