diff options
| author | DrZlo13 <who.just.the.doctor@gmail.com> | 2020-11-16 23:21:45 +0300 |
|---|---|---|
| committer | DrZlo13 <who.just.the.doctor@gmail.com> | 2020-11-16 23:21:45 +0300 |
| commit | a8fdbc6376d4ee02f285c671af833e11dce01bdb (patch) | |
| tree | c85efa0e84bd5e959383177ff95edc6aa9c6523b /applications/applications.h | |
| parent | 4eeac6579f0287ce7c010a10450a18df2ec908f5 (diff) | |
| parent | 2ba3722de202de49150a02155689bbbc6964f70e (diff) | |
Merge branch 'master' into ibutton-app
Diffstat (limited to 'applications/applications.h')
| -rw-r--r-- | applications/applications.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/applications/applications.h b/applications/applications.h index 8c5c7e96..01520473 100644 --- a/applications/applications.h +++ b/applications/applications.h @@ -36,12 +36,18 @@ void sd_card_test(void* p); void application_vibro(void* p); void app_gpio_test(void* p); void app_ibutton(void* p); +void cli_task(void* p); +void music_player(void* p); const FlipperStartupApp FLIPPER_STARTUP[] = { #ifdef APP_DISPLAY {.app = display_u8g2, .name = "display_u8g2", .libs = {0}}, #endif +#ifdef APP_CLI + {.app = cli_task, .name = "cli_task", .libs = {0}}, +#endif + #ifdef APP_EXAMPLE_BLINK {.app = application_blink, .name = "blink", .libs = {1, FURI_LIB{"input_task"}}}, #endif @@ -69,7 +75,7 @@ const FlipperStartupApp FLIPPER_STARTUP[] = { #endif #ifdef APP_POWER - {.app = power_task, .name = "power_task", .libs = {1, FURI_LIB{"gui_task"}}}, + {.app = power_task, .name = "power_task", .libs = {2, FURI_LIB{"cli_task", "gui_task"}}}, #endif #ifdef APP_CC1101 @@ -117,6 +123,10 @@ const FlipperStartupApp FLIPPER_STARTUP[] = { {.app = sd_card_test, .name = "sd_card_test", .libs = {1, FURI_LIB{"gui_task"}}}, #endif +#ifdef APP_MUSIC_PLAYER + {.app = music_player, .name = "music player", .libs = {1, FURI_LIB{"gui_task"}}}, +#endif + #ifdef APP_GPIO_DEMO { .app = app_gpio_test, @@ -173,4 +183,8 @@ const FlipperStartupApp FLIPPER_APPS[] = { #ifdef BUILD_IBUTTON {.app = app_ibutton, .name = "ibutton", .libs = {1, FURI_LIB{"gui_task"}}}, #endif + +#ifdef BUILD_MUSIC_PLAYER + {.app = music_player, .name = "music player", .libs = {1, FURI_LIB{"gui_task"}}}, +#endif };
\ No newline at end of file |