Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgornekich <n.gorbadey@gmail.com>2021-09-28 16:10:13 +0300
committerGitHub <noreply@github.com>2021-09-28 16:10:13 +0300
commit61c8f3325aad9a15073b9ed73a72361a6e959249 (patch)
tree3f1d32ebeaba0a7212b29586a1f24eb8c4e5d9c1 /applications/applications.c
parent1c4e6ec74dded2318c451c50a376129dbc8352e8 (diff)
[FL-1217] Menu refactoring (#726)
* menu: remove dead code * loader: change views from modules instead of menu service * dolphin: start main menu with loader API * applications: don't start menu service * loader: add debug tools menu * gui modules: introduce menu model * loader: remove calls to menu service API * gui modules: implement menu module * loader: add menu view * gui menu: add animation * applications: remove menu service * gui modules: rename icon_menu -> menu * loader: clean up code * menu module: add documentation, format code * menu: remove unused parameter * desktop: use loader to launch primary menu * Applications: cleaner makefile app declaration. Loader: application autostart * Gui: cleanup menu and submenu API. Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
Diffstat (limited to 'applications/applications.c')
-rwxr-xr-xapplications/applications.c51
1 files changed, 11 insertions, 40 deletions
diff --git a/applications/applications.c b/applications/applications.c
index a33c540d..22a4ea4a 100755
--- a/applications/applications.c
+++ b/applications/applications.c
@@ -9,7 +9,6 @@ extern int32_t dolphin_srv(void* p);
extern int32_t gui_srv(void* p);
extern int32_t input_srv(void* p);
extern int32_t loader_srv(void* p);
-extern int32_t menu_srv(void* p);
extern int32_t notification_srv(void* p);
extern int32_t power_observer_srv(void* p);
extern int32_t power_srv(void* p);
@@ -87,8 +86,7 @@ const FlipperApplication FLIPPER_SERVICES[] = {
{.app = input_srv, .name = "Input", .stack_size = 1024, .icon = NULL},
#endif
-#ifdef SRV_MENU
- {.app = menu_srv, .name = "Menu", .stack_size = 1024, .icon = NULL},
+#ifdef SRV_LOADER
{.app = loader_srv, .name = "Loader", .stack_size = 1024, .icon = NULL},
#endif
@@ -107,43 +105,6 @@ const FlipperApplication FLIPPER_SERVICES[] = {
#ifdef SRV_STORAGE
{.app = storage_srv, .name = "Storage", .stack_size = 4096, .icon = NULL},
#endif
-
-/* Fake services (autorun) */
-#ifdef SRV_BLINK
- {.app = blink_test_app, .name = "Blink", .stack_size = 1024, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_LF_RFID
- {.app = lfrfid_app, .name = "125 kHz RFID", .stack_size = 2048, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_IRDA
- {.app = irda_app, .name = "Infrared", .stack_size = 1024 * 3, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_MUSIC_PLAYER
- {.app = music_player_app, .name = "Music Player", .stack_size = 1024, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_IBUTTON
- {.app = ibutton_app, .name = "iButton", .stack_size = 2048, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_GPIO_TEST
- {.app = gpio_test_app, .name = "GPIO Test", .stack_size = 1024, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_KEYPAD_TEST
- {.app = keypad_test_app, .name = "Keypad Test", .stack_size = 1024, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_ACCESSOR
- {.app = accessor_app, .name = "Accessor", .stack_size = 4096, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_STORAGE_TEST
- {.app = storage_test_app, .name = "Storage Test", .stack_size = 1024, .icon = &A_Plugins_14},
-#endif
};
const size_t FLIPPER_SERVICES_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(FlipperApplication);
@@ -184,25 +145,35 @@ const FlipperOnStartHook FLIPPER_ON_SYSTEM_START[] = {
#ifdef SRV_CLI
crypto_cli_init,
#endif
+
+#ifdef APP_IRDA
irda_cli_init,
+#endif
+
#ifdef APP_NFC
nfc_cli_init,
#endif
+
#ifdef APP_SUBGHZ
subghz_cli_init,
#endif
+
#ifdef APP_LF_RFID
lfrfid_cli_init,
#endif
+
#ifdef APP_IBUTTON
ibutton_cli_init,
#endif
+
#ifdef SRV_BT
bt_cli_init,
#endif
+
#ifdef SRV_POWER
power_cli_init,
#endif
+
#ifdef SRV_STORAGE
storage_cli_init,
#endif