From 3ca43727adede143e2270bc76e859fb7df96acc6 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 13 Mar 2024 04:25:06 +0000 Subject: [PATCH] New boot icon sequence (inspired by mayhem 2.0) Icons used for settings and asset packs could be improved yeah --- furi/flipper.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/furi/flipper.c b/furi/flipper.c index 50c6659e0..8b59c5ead 100644 --- a/furi/flipper.c +++ b/furi/flipper.c @@ -98,14 +98,6 @@ void flipper_migrate_files() { furi_record_close(RECORD_STORAGE); } - -static void flipper_boot_status(Canvas* canvas, const char* text) { - FURI_LOG_I(TAG, text); - canvas_reset(canvas); - canvas_draw_icon(canvas, 33, 16, &I_Updating_Logo_62x15); - canvas_draw_str_aligned(canvas, 64, 44, AlignCenter, AlignCenter, text); - canvas_commit(canvas); -} #endif void flipper_start_service(const FlipperInternalApplication* service) { @@ -123,12 +115,17 @@ void flipper_init() { furi_hal_light_sequence("rgb WB"); flipper_print_version("Firmware", furi_hal_version_get_firmware_version()); FURI_LOG_I(TAG, "Boot mode %d", furi_hal_rtc_get_boot_mode()); + #ifndef FURI_RAM_EXEC Canvas* canvas = canvas_init(); + canvas_draw_icon(canvas, 33, 16, &I_Updating_Logo_62x15); + if(furi_hal_is_normal_boot()) { + canvas_draw_icon(canvas, 19, 44, &I_SDcardMounted_11x8); + } + canvas_commit(canvas); +#endif // Start storage service first, thanks OFW :/ - flipper_boot_status(canvas, "Initializing Storage"); -#endif flipper_start_service(&FLIPPER_SERVICES[0]); #ifndef FURI_RAM_EXEC @@ -137,28 +134,32 @@ void flipper_init() { furi_record_open(RECORD_STORAGE); furi_record_close(RECORD_STORAGE); - flipper_boot_status(canvas, "Migrating Files"); + canvas_draw_icon(canvas, 39, 43, &I_dir_10px); + canvas_commit(canvas); flipper_migrate_files(); - flipper_boot_status(canvas, "Starting Namespoof"); + canvas_draw_icon(canvas, 59, 42, &I_Apps_10px); + canvas_commit(canvas); namespoof_init(); - flipper_boot_status(canvas, "Loading Settings"); + canvas_draw_icon(canvas, 79, 44, &I_Rpc_active_7x8); + canvas_commit(canvas); momentum_settings_load(); - furi_hal_light_sequence("rgb RB"); - flipper_boot_status(canvas, "Loading Asset Packs"); + furi_hal_light_sequence("rgb RB"); + canvas_draw_icon(canvas, 99, 44, &I_Hidden_window_9x8); + canvas_commit(canvas); asset_packs_init(); } else { FURI_LOG_I(TAG, "Special boot, skipping optional components"); } - flipper_boot_status(canvas, "Initializing Services"); #endif // Everything else for(size_t i = 1; i < FLIPPER_SERVICES_COUNT; i++) { flipper_start_service(&FLIPPER_SERVICES[i]); } + #ifndef FURI_RAM_EXEC canvas_free(canvas); #endif