liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ibutton-app

Browse Source
This commit is contained in:
DrZlo13
2020-11-17 06:21:45 +10:00
parent 4eeac6579f 2ba3722de2
commit a8fdbc6376
41 changed files with 1371 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/applications.h
View File

@@ -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
};