From 87282fba46c999f5d47efc60b68c0cb731bb5ecf Mon Sep 17 00:00:00 2001 From: jbohack Date: Thu, 29 Dec 2022 22:57:23 -0500 Subject: [PATCH 1/2] typo in passport fixed and power off text changed for sfw_mode --- applications/settings/dolphin_passport/passport.c | 8 ++++---- .../scenes/power_settings_scene_power_off.c | 13 +++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index ea7f823c9..a25514c4c 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -43,14 +43,14 @@ static void render_callback(Canvas* canvas, void* ctx) { DolphinStats* stats = ctx; DesktopSettings* settings = malloc(sizeof(DesktopSettings)); - DESKTOP_SETTINGS_LOAD(settings) + DESKTOP_SETTINGS_LOAD(settings); char level_str[20]; char xp_str[12]; char mood_str[32]; uint8_t mood = 0; - if(Settings->sfw_mode) ( + if(settings->sfw_mode) { if(stats->butthurt <= 4) { mood = 0; snprintf(mood_str, 20, "Mood: Happy"); @@ -61,7 +61,7 @@ static void render_callback(Canvas* canvas, void* ctx) { mood = 2; snprintf(mood_str, 20, "Mood: Angry"); } - ) else ( + } else { if(stats->butthurt <= 4) { mood = 0; snprintf(mood_str, 20, "Status: Wet"); @@ -73,7 +73,7 @@ static void render_callback(Canvas* canvas, void* ctx) { snprintf(mood_str, 20, "Status: Desperate"); } - ) + } uint32_t xp_progress = 0; uint32_t xp_to_levelup = dolphin_state_xp_to_levelup(stats->icounter); uint32_t xp_above_last_levelup = dolphin_state_xp_above_last_levelup(stats->icounter); diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c index 1921c8782..d01a09955 100644 --- a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c +++ b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c @@ -1,4 +1,5 @@ #include "../power_settings_app.h" +#include "../../desktop_settings/desktop_settings_app.h" void power_settings_scene_power_off_dialog_callback(DialogExResult result, void* context) { furi_assert(context); @@ -10,9 +11,16 @@ void power_settings_scene_power_off_on_enter(void* context) { PowerSettingsApp* app = context; DialogEx* dialog = app->dialog; + DesktopSettings* settings = malloc(sizeof(DesktopSettings)); + DESKTOP_SETTINGS_LOAD(settings); + dialog_ex_set_header(dialog, "Turn Off Device?", 64, 2, AlignCenter, AlignTop); - dialog_ex_set_text( - dialog, " I will be\nwaiting for\n you master", 78, 16, AlignLeft, AlignTop); + if (settings->sfw_mode) { + dialog_ex_set_text(dialog, " I will be\nwaiting for\n you here", 78, 16, AlignLeft, AlignTop); + } + else { + dialog_ex_set_text(dialog, " I will be\nwaiting for\n you master", 78, 16, AlignLeft, AlignTop); + } dialog_ex_set_icon(dialog, 21, 13, &I_Cry_dolph_55x52); dialog_ex_set_left_button_text(dialog, "Back"); dialog_ex_set_right_button_text(dialog, "OFF"); @@ -20,6 +28,7 @@ void power_settings_scene_power_off_on_enter(void* context) { dialog_ex_set_context(dialog, app); view_dispatcher_switch_to_view(app->view_dispatcher, PowerSettingsAppViewDialog); + free(settings); } bool power_settings_scene_power_off_on_event(void* context, SceneManagerEvent event) { From 51bd4e3d99f104c5e51df9abbdec16ad23067f86 Mon Sep 17 00:00:00 2001 From: jbohack Date: Thu, 29 Dec 2022 23:06:29 -0500 Subject: [PATCH 2/2] modified crash text for sfw_mode --- .../desktop/scenes/desktop_scene_fault.c | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/applications/services/desktop/scenes/desktop_scene_fault.c b/applications/services/desktop/scenes/desktop_scene_fault.c index baba82f96..38151e6b9 100644 --- a/applications/services/desktop/scenes/desktop_scene_fault.c +++ b/applications/services/desktop/scenes/desktop_scene_fault.c @@ -1,6 +1,7 @@ #include #include "../desktop_i.h" +#include "../../../settings/desktop_settings/desktop_settings_app.h" #define DesktopFaultEventExit 0x00FF00FF @@ -12,20 +13,36 @@ void desktop_scene_fault_callback(void* context) { void desktop_scene_fault_on_enter(void* context) { Desktop* desktop = (Desktop*)context; + DesktopSettings* settings = malloc(sizeof(DesktopSettings)); + DESKTOP_SETTINGS_LOAD(settings); + Popup* popup = desktop->hw_mismatch_popup; popup_set_context(popup, desktop); - popup_set_header( - popup, - "Slut passed out\n but is now back", - 60, - 14 + STATUS_BAR_Y_SHIFT, - AlignCenter, - AlignCenter); + if (settings->sfw_mode) { + popup_set_header( + popup, + "Flipper crashed\n but has been rebooted", + 60, + 14 + STATUS_BAR_Y_SHIFT, + AlignCenter, + AlignCenter); + } + else { + popup_set_header( + popup, + "Slut passed out\n but is now back", + 60, + 14 + STATUS_BAR_Y_SHIFT, + AlignCenter, + AlignCenter); + } + char* message = (char*)furi_hal_rtc_get_fault_data(); popup_set_text(popup, message, 60, 37 + STATUS_BAR_Y_SHIFT, AlignCenter, AlignCenter); popup_set_callback(popup, desktop_scene_fault_callback); view_dispatcher_switch_to_view(desktop->view_dispatcher, DesktopViewIdHwMismatch); + free(settings); } bool desktop_scene_fault_on_event(void* context, SceneManagerEvent event) {