Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-30 02:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Lock menu fix main settings button

Browse Source
This commit is contained in:
Willy-JL
2023-03-25 00:25:06 +00:00
parent 24d42a46ae
commit fb13943360
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/loader/loader.c
+15 -1
View File
@@ -14,7 +14,8 @@
#define TAG "LoaderSrv"
#define LOADER_THREAD_FLAG_SHOW_MENU (1 << 0)
#define LOADER_THREAD_FLAG_ALL (LOADER_THREAD_FLAG_SHOW_MENU)
#define LOADER_THREAD_FLAG_SHOW_SETTINGS (1 << 1)
#define LOADER_THREAD_FLAG_ALL (LOADER_THREAD_FLAG_SHOW_MENU | LOADER_THREAD_FLAG_SHOW_SETTINGS)
static Loader* loader_instance = NULL;
@@ -497,6 +498,11 @@ void loader_show_menu() {
furi_thread_flags_set(loader_instance->loader_thread, LOADER_THREAD_FLAG_SHOW_MENU);
}
void loader_show_settings() {
furi_assert(loader_instance);
furi_thread_flags_set(loader_instance->loader_thread, LOADER_THREAD_FLAG_SHOW_SETTINGS);
}
void loader_update_menu() {
menu_reset(loader_instance->primary_menu);
loader_build_menu();
@@ -531,6 +537,14 @@ int32_t loader_srv(void* p) {
view_dispatcher_switch_to_view(
loader_instance->view_dispatcher, LoaderMenuViewPrimary);
view_dispatcher_run(loader_instance->view_dispatcher);
} else if(flags & LOADER_THREAD_FLAG_SHOW_SETTINGS) {
view_set_previous_callback(
submenu_get_view(loader_instance->settings_menu), loader_hide_menu);
view_dispatcher_switch_to_view(
loader_instance->view_dispatcher, LoaderMenuViewSettings);
view_dispatcher_run(loader_instance->view_dispatcher);
view_set_previous_callback(
submenu_get_view(loader_instance->settings_menu), loader_back_to_primary_menu);
}
}
applications/services/loader/loader.h
+3
View File
@@ -50,6 +50,9 @@ bool loader_is_locked(const Loader* instance);
/** Show primary loader */
void loader_show_menu();
/** Show settings menu */
void loader_show_settings();
/** Show primary loader */
void loader_update_menu();