Applications: unified entry point naming scheme, drop dead code, cleanup. (#628)
This commit is contained in:
あく
GitHub
@@ -1,103 +1,106 @@
|
||||
#include "applications.h"
|
||||
#include <assets_icons.h>
|
||||
|
||||
// Services and apps decalartion
|
||||
int32_t application_vertical_screen(void* p);
|
||||
int32_t irda_monitor_app(void* p);
|
||||
int32_t flipper_test_app(void* p);
|
||||
int32_t application_blink(void* p);
|
||||
int32_t application_uart_write(void* p);
|
||||
int32_t application_input_dump(void* p);
|
||||
int32_t u8g2_example(void* p);
|
||||
int32_t input_task(void* p);
|
||||
int32_t menu_task(void* p);
|
||||
int32_t coreglitch_demo_0(void* p);
|
||||
int32_t u8g2_qrcode(void* p);
|
||||
int32_t gui_task(void* p);
|
||||
int32_t irda(void* p);
|
||||
int32_t loader(void* p);
|
||||
int32_t nfc_task(void* p);
|
||||
int32_t dolphin_task(void* p);
|
||||
int32_t power_task(void* p);
|
||||
int32_t bt_task(void* p);
|
||||
int32_t application_vibro(void* p);
|
||||
int32_t app_gpio_test(void* p);
|
||||
int32_t app_ibutton(void* p);
|
||||
int32_t cli_task(void* p);
|
||||
int32_t music_player(void* p);
|
||||
int32_t sdnfc(void* p);
|
||||
int32_t subghz_app(void* p);
|
||||
int32_t gui_test(void* p);
|
||||
int32_t keypad_test(void* p);
|
||||
int32_t scene_app(void* p);
|
||||
int32_t passport(void* p);
|
||||
int32_t app_accessor(void* p);
|
||||
int32_t app_archive(void* p);
|
||||
int32_t notification_app(void* p);
|
||||
int32_t scened_app(void* p);
|
||||
int32_t lfrfid_app(void* p);
|
||||
int32_t lfrfid_debug_app(void* p);
|
||||
int32_t storage_app(void* p);
|
||||
int32_t storage_app_test(void* p);
|
||||
int32_t dialogs_app(void* p);
|
||||
int32_t power_observer(void* p);
|
||||
// Services
|
||||
extern int32_t bt_srv(void* p);
|
||||
extern int32_t cli_srv(void* p);
|
||||
extern int32_t dialogs_srv(void* p);
|
||||
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);
|
||||
extern int32_t storage_srv(void* p);
|
||||
|
||||
// Apps
|
||||
extern int32_t accessor_app(void* p);
|
||||
extern int32_t archive_app(void* p);
|
||||
extern int32_t blink_test_app(void* p);
|
||||
extern int32_t flipper_test_app(void* p);
|
||||
extern int32_t gpio_test_app(void* p);
|
||||
extern int32_t ibutton_app(void* p);
|
||||
extern int32_t irda_app(void* p);
|
||||
extern int32_t irda_monitor_app(void* p);
|
||||
extern int32_t keypad_test_app(void* p);
|
||||
extern int32_t lfrfid_app(void* p);
|
||||
extern int32_t lfrfid_debug_app(void* p);
|
||||
extern int32_t nfc_app(void* p);
|
||||
extern int32_t passport_app(void* p);
|
||||
extern int32_t scene_app(void* p);
|
||||
extern int32_t scened_app(void* p);
|
||||
extern int32_t storage_test_app(void* p);
|
||||
extern int32_t subghz_app(void* p);
|
||||
extern int32_t vibro_test_app(void* p);
|
||||
|
||||
// Plugins
|
||||
extern int32_t music_player_app(void* p);
|
||||
|
||||
// On system start hooks declaration
|
||||
void irda_cli_init();
|
||||
void nfc_cli_init();
|
||||
void subghz_cli_init();
|
||||
void bt_cli_init();
|
||||
void lfrfid_cli_init();
|
||||
void ibutton_cli_init();
|
||||
void storage_cli_init();
|
||||
extern void bt_cli_init();
|
||||
extern void ibutton_cli_init();
|
||||
extern void irda_cli_init();
|
||||
extern void lfrfid_cli_init();
|
||||
extern void nfc_cli_init();
|
||||
extern void storage_cli_init();
|
||||
extern void subghz_cli_init();
|
||||
|
||||
// Settings
|
||||
int32_t notification_app_settings(void* p);
|
||||
int32_t storage_settings(void* p);
|
||||
extern int32_t notification_settings_app(void* p);
|
||||
extern int32_t storage_settings_app(void* p);
|
||||
|
||||
const FlipperApplication FLIPPER_SERVICES[] = {
|
||||
/* Services */
|
||||
#ifdef SRV_BT
|
||||
{.app = bt_srv, .name = "BT", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_CLI
|
||||
{.app = cli_task, .name = "cli_task", .stack_size = 4096, .icon = &A_Plugins_14},
|
||||
{.app = cli_srv, .name = "Cli", .stack_size = 4096, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_EXAMPLE_BLINK
|
||||
{.app = application_blink, .name = "blink", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_INPUT
|
||||
{.app = input_task, .name = "input_task", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_EXAMPLE_INPUT_DUMP
|
||||
{.app = application_input_dump,
|
||||
.name = "input dump",
|
||||
.stack_size = 1024,
|
||||
.icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_GUI
|
||||
// TODO: fix stack size when sd api will be in separate thread
|
||||
{.app = gui_task, .name = "gui_task", .stack_size = 8192, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_MENU
|
||||
{.app = menu_task, .name = "menu_task", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = loader, .name = "loader", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#ifdef SRV_DIALOGS
|
||||
{.app = dialogs_srv, .name = "Dialogs", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_DOLPHIN
|
||||
{.app = dolphin_task, .name = "dolphin_task", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = dolphin_srv, .name = "Dolphin", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_GUI
|
||||
{.app = gui_srv, .name = "Gui", .stack_size = 8192, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_INPUT
|
||||
{.app = input_srv, .name = "Input", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_MENU
|
||||
{.app = menu_srv, .name = "Menu", .stack_size = 1024, .icon = NULL},
|
||||
{.app = loader_srv, .name = "Loader", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_NOTIFICATION
|
||||
{.app = notification_srv, .name = "Notification", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_POWER
|
||||
{.app = power_task, .name = "power_task", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = power_srv, .name = "Power", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_POWER_OBSERVER
|
||||
{.app = power_observer, .name = "power_observer", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = power_observer_srv, .name = "PowerObserver", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_BT
|
||||
{.app = bt_task, .name = "bt_task", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#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
|
||||
@@ -105,66 +108,31 @@ const FlipperApplication FLIPPER_SERVICES[] = {
|
||||
#endif
|
||||
|
||||
#ifdef SRV_IRDA
|
||||
{.app = irda, .name = "irda", .stack_size = 1024 * 3, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_EXAMPLE_QRCODE
|
||||
{.app = u8g2_qrcode, .name = "u8g2_qrcode", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_EXAMPLE_DISPLAY
|
||||
{.app = u8g2_example, .name = "u8g2_example", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_SPEAKER_DEMO
|
||||
{.app = coreglitch_demo_0,
|
||||
.name = "coreglitch_demo_0",
|
||||
.stack_size = 1024,
|
||||
.icon = &A_Plugins_14},
|
||||
{.app = irda_app, .name = "Infrared", .stack_size = 1024 * 3, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_MUSIC_PLAYER
|
||||
{.app = music_player, .name = "music player", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = music_player_app, .name = "Music Player", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_IBUTTON
|
||||
{.app = app_ibutton, .name = "ibutton", .stack_size = 2048, .icon = &A_Plugins_14},
|
||||
{.app = ibutton_app, .name = "iButton", .stack_size = 2048, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_GPIO_DEMO
|
||||
{.app = app_gpio_test, .name = "gpio test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_SDNFC
|
||||
{.app = sdnfc, .name = "sdnfc", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_GUI_TEST
|
||||
{.app = gui_test, .name = "gui_test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#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, .name = "keypad_test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = keypad_test_app, .name = "Keypad Test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_ACCESSOR
|
||||
{.app = app_accessor, .name = "accessor", .stack_size = 4096, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_NOTIFICATION
|
||||
{.app = notification_app, .name = "notification", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_STORAGE
|
||||
{.app = storage_app, .name = "storage", .stack_size = 4096, .icon = &A_Plugins_14},
|
||||
{.app = accessor_app, .name = "Accessor", .stack_size = 4096, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_STORAGE_TEST
|
||||
{.app = storage_app_test, .name = "storage test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_DIALOGS
|
||||
{.app = dialogs_app, .name = "dialogs", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = storage_test_app, .name = "Storage Test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -174,29 +142,27 @@ const size_t FLIPPER_SERVICES_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(FlipperA
|
||||
const FlipperApplication FLIPPER_APPS[] = {
|
||||
|
||||
#ifdef APP_IBUTTON
|
||||
{.app = app_ibutton, .name = "iButton", .stack_size = 2048, .icon = &A_iButton_14},
|
||||
{.app = ibutton_app, .name = "iButton", .stack_size = 2048, .icon = &A_iButton_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_NFC
|
||||
{.app = nfc_task, .name = "NFC", .stack_size = 4096, .icon = &A_NFC_14},
|
||||
{.app = nfc_app, .name = "NFC", .stack_size = 4096, .icon = &A_NFC_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_SUBGHZ
|
||||
// TODO: decrease stack after SD API refactoring
|
||||
{.app = subghz_app, .name = "Sub-1 GHz", .stack_size = 4096, .icon = &A_Sub1ghz_14},
|
||||
{.app = subghz_app, .name = "Sub-1 GHz", .stack_size = 2048, .icon = &A_Sub1ghz_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_LF_RFID
|
||||
// TODO: fix stack size when sd api will be in separate thread
|
||||
{.app = lfrfid_app, .name = "125 kHz RFID", .stack_size = 2048, .icon = &A_125khz_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_IRDA
|
||||
{.app = irda, .name = "Infrared", .stack_size = 1024 * 3, .icon = &A_Infrared_14},
|
||||
{.app = irda_app, .name = "Infrared", .stack_size = 1024 * 3, .icon = &A_Infrared_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_GPIO_DEMO
|
||||
{.app = app_gpio_test, .name = "GPIO", .stack_size = 1024, .icon = &A_GPIO_14},
|
||||
#ifdef APP_GPIO_TEST
|
||||
{.app = gpio_test_app, .name = "GPIO", .stack_size = 1024, .icon = &A_GPIO_14},
|
||||
#endif
|
||||
|
||||
};
|
||||
@@ -233,51 +199,28 @@ const size_t FLIPPER_ON_SYSTEM_START_COUNT =
|
||||
const FlipperApplication FLIPPER_PLUGINS[] = {
|
||||
|
||||
#ifdef APP_MUSIC_PLAYER
|
||||
{.app = music_player, .name = "music player", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = music_player_app, .name = "Music Player", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_SPEAKER_DEMO
|
||||
{.app = coreglitch_demo_0,
|
||||
.name = "coreglitch_demo_0",
|
||||
.stack_size = 1024,
|
||||
.icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
const size_t FLIPPER_PLUGINS_COUNT = sizeof(FLIPPER_PLUGINS) / sizeof(FlipperApplication);
|
||||
|
||||
// Plugin menu
|
||||
const FlipperApplication FLIPPER_DEBUG_APPS[] = {
|
||||
#ifdef APP_EXAMPLE_BLINK
|
||||
{.app = application_blink, .name = "blink", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_EXAMPLE_INPUT_DUMP
|
||||
{.app = application_input_dump,
|
||||
.name = "input dump",
|
||||
.stack_size = 1024,
|
||||
.icon = &A_Plugins_14},
|
||||
#ifdef APP_BLINK
|
||||
{.app = blink_test_app, .name = "Blink Test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_VIBRO_DEMO
|
||||
{.app = application_vibro, .name = "vibro", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_SDNFC
|
||||
{.app = sdnfc, .name = "sdnfc", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_GUI_TEST
|
||||
{.app = gui_test, .name = "gui_test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = vibro_test_app, .name = "Vibro Test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_KEYPAD_TEST
|
||||
{.app = keypad_test, .name = "keypad_test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = keypad_test_app, .name = "Keypad Test", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_ACCESSOR
|
||||
{.app = app_accessor, .name = "accessor", .stack_size = 4096, .icon = &A_Plugins_14},
|
||||
{.app = accessor_app, .name = "Accessor", .stack_size = 4096, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_UNIT_TESTS
|
||||
@@ -288,13 +231,6 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = {
|
||||
{.app = irda_monitor_app, .name = "Irda Monitor", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_VERTICAL_SCREEN
|
||||
{.app = application_vertical_screen,
|
||||
.name = "Vertical Screen",
|
||||
.stack_size = 1024,
|
||||
.icon = &A_Plugins_14},
|
||||
#endif
|
||||
|
||||
#ifdef APP_SCENED
|
||||
{.app = scened_app, .name = "Templated Scene", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
#endif
|
||||
@@ -308,7 +244,7 @@ const size_t FLIPPER_DEBUG_APPS_COUNT = sizeof(FLIPPER_DEBUG_APPS) / sizeof(Flip
|
||||
|
||||
#ifdef APP_ARCHIVE
|
||||
const FlipperApplication FLIPPER_ARCHIVE =
|
||||
{.app = app_archive, .name = "Archive", .stack_size = 4096, .icon = &A_FileManager_14};
|
||||
{.app = archive_app, .name = "Archive", .stack_size = 4096, .icon = &A_FileManager_14};
|
||||
#endif
|
||||
|
||||
#ifdef SRV_DOLPHIN
|
||||
@@ -316,8 +252,8 @@ const FlipperApplication FLIPPER_SCENE =
|
||||
{.app = scene_app, .name = "Scenes", .stack_size = 1024, .icon = &A_Games_14};
|
||||
|
||||
const FlipperApplication FLIPPER_SCENE_APPS[] = {
|
||||
{.app = passport, .name = "Passport", .stack_size = 1024, .icon = &A_Games_14},
|
||||
{.app = music_player, .name = "Music player", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
{.app = passport_app, .name = "Passport", .stack_size = 1024, .icon = &A_Games_14},
|
||||
{.app = music_player_app, .name = "Music player", .stack_size = 1024, .icon = &A_Plugins_14},
|
||||
};
|
||||
|
||||
const size_t FLIPPER_SCENE_APPS_COUNT = sizeof(FLIPPER_SCENE_APPS) / sizeof(FlipperApplication);
|
||||
@@ -327,11 +263,11 @@ const size_t FLIPPER_SCENE_APPS_COUNT = sizeof(FLIPPER_SCENE_APPS) / sizeof(Flip
|
||||
// Settings menu
|
||||
const FlipperApplication FLIPPER_SETTINGS_APPS[] = {
|
||||
#ifdef SRV_NOTIFICATION
|
||||
{.app = notification_app_settings, .name = "Notification", .stack_size = 1024, .icon = NULL},
|
||||
{.app = notification_settings_app, .name = "Notification", .stack_size = 1024, .icon = NULL},
|
||||
#endif
|
||||
|
||||
#ifdef SRV_STORAGE
|
||||
{.app = storage_settings, .name = "Storage", .stack_size = 2048, .icon = NULL},
|
||||
{.app = storage_settings_app, .name = "Storage", .stack_size = 2048, .icon = NULL},
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user