Clock, iButton and u2f in Menu

This commit is contained in:
RogueMaster
2022-09-21 01:47:13 -04:00
parent 401406b7c4
commit 6dd38fac0d

View File

@@ -58,13 +58,21 @@ static void loader_submenu_callback(void* context, uint32_t index) {
} }
static void loader_clock_callback(void* context, uint32_t index) { static void loader_clock_callback(void* context, uint32_t index) {
UNUSED(context);
UNUSED(index); UNUSED(index);
Desktop* desktop = desktop_alloc(); LoaderStatus status = loader_start(NULL, "Applications", EXT_PATH("/apps/Main/Clock.fap"));
LoaderStatus status = loader_start( }
desktop->loader, "Applications", EXT_PATH("/apps/Main/Clock.fap"));
if(status != LoaderStatusOk) { static void loader_ibutton_callback(void* context, uint32_t index) {
FURI_LOG_E(TAG, "loader_start failed: %d", status); UNUSED(context);
} UNUSED(index);
LoaderStatus status = loader_start(NULL, "Applications", EXT_PATH("/apps/Main/ibutton.fap"));
}
static void loader_u2f_callback(void* context, uint32_t index) {
UNUSED(context);
UNUSED(index);
LoaderStatus status = loader_start(NULL, "Applications", EXT_PATH("/apps/Main/u2f.fap"));
} }
static void loader_cli_print_usage() { static void loader_cli_print_usage() {
@@ -384,14 +392,14 @@ static void loader_free(Loader* instance) {
static void loader_build_menu() { static void loader_build_menu() {
FURI_LOG_I(TAG, "Building main menu"); FURI_LOG_I(TAG, "Building main menu");
size_t i; size_t i;
menu_add_item( menu_add_item(
loader_instance->primary_menu, loader_instance->primary_menu,
"Clock", "Clock",
&A_Clock_14, &A_Clock_14,
0, 0,
loader_clock_callback, loader_clock_callback,
(void*)LoaderMenuViewPlugins); (void*)NULL);
for(i = 1; i < FLIPPER_APPS_COUNT; i++) { for(i = 0; i < FLIPPER_APPS_COUNT; i++) {
menu_add_item( menu_add_item(
loader_instance->primary_menu, loader_instance->primary_menu,
FLIPPER_APPS[i].name, FLIPPER_APPS[i].name,
@@ -409,6 +417,20 @@ static void loader_build_menu() {
loader_submenu_callback, loader_submenu_callback,
(void*)LoaderMenuViewPlugins); (void*)LoaderMenuViewPlugins);
} }
menu_add_item(
loader_instance->primary_menu,
"iButton",
&A_iButton_14,
i++,
loader_ibutton_callback,
(void*)NULL);
menu_add_item(
loader_instance->primary_menu,
"U2F",
&A_U2F_14,
i++,
loader_u2f_callback,
(void*)NULL);
// if(FLIPPER_GAMES_COUNT != 0) { // if(FLIPPER_GAMES_COUNT != 0) {
// menu_add_item( // menu_add_item(
// loader_instance->primary_menu, // loader_instance->primary_menu,