From b5cf2601352a171967ed3d357c3c160354ed3cea Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Mon, 23 Jan 2023 13:32:03 +0000 Subject: [PATCH] Fix dap link and unitemp --- applications/plugins/dap_link/dap_link.c | 31 +++++------------- .../plugins/unitemp/assets/sherlok_53x45.png | Bin 2382 -> 695 bytes .../unitemp/assets/sherlok_53x45_sfw.png | Bin 695 -> 0 bytes .../plugins/unitemp/views/General_view.c | 7 +--- 4 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 applications/plugins/unitemp/assets/sherlok_53x45_sfw.png diff --git a/applications/plugins/dap_link/dap_link.c b/applications/plugins/dap_link/dap_link.c index 99d1a2f76..c46c68788 100644 --- a/applications/plugins/dap_link/dap_link.c +++ b/applications/plugins/dap_link/dap_link.c @@ -16,8 +16,6 @@ #include #include "DAP_Link_icons.h" -#include "../../settings/xtreme_settings/xtreme_settings.h" - /***************************************************************************/ /****************************** DAP COMMON *********************************/ /***************************************************************************/ @@ -488,26 +486,15 @@ int32_t dap_link_app(void* p) { if(furi_hal_usb_is_locked()) { DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS); DialogMessage* message = dialog_message_alloc(); - if(XTREME_SETTINGS()->sfw_mode) { - dialog_message_set_header( - message, "Connection\nis active!", 3, 2, AlignLeft, AlignTop); - dialog_message_set_text( - message, - "Disconnect from\nPC or phone to\nuse this function.", - 3, - 30, - AlignLeft, - AlignTop); - } else { - dialog_message_set_header(message, "I am not\na whore!", 3, 2, AlignLeft, AlignTop); - dialog_message_set_text( - message, - "Pull out from\nPC or phone to\nuse me like this.", - 3, - 30, - AlignLeft, - AlignTop); - } + dialog_message_set_header( + message, "Connection\nis active!", 3, 2, AlignLeft, AlignTop); + dialog_message_set_text( + message, + "Disconnect from\nPC or phone to\nuse this function.", + 3, + 30, + AlignLeft, + AlignTop); dialog_message_set_icon(message, &I_ActiveConnection_50x64, 78, 0); dialog_message_show(dialogs, message); dialog_message_free(message); diff --git a/applications/plugins/unitemp/assets/sherlok_53x45.png b/applications/plugins/unitemp/assets/sherlok_53x45.png index 65571203eb5d8ec43473b5b2f8a6998320aa19b2..1f258737e351cc742771d8ddaa160184670cbad4 100644 GIT binary patch delta 666 zcmV;L0%iTq61N4A85ITq000hSBZdF~00DDSM?wIu&K&8HArpTIa7bBm000ie000ie z0hKEb8vpCGJ~(Ddji4m%z0%yb@h90fMRAz{k{Jb?QXc&I`E3Is6uB#gHCS_((WGc5 zBZ}F{t5&lg3zQ>y0JI2y3Ix?io`niPuaIst1zEQRaR{VL^2={1S= zI%xfjOot^jrO8<#8wa9TMPqplY_2`iei6rBKQ>!6R62jLgvK(;pY*H{V_g*MzpIoo26MG^y2O?D=Gp$eF$YEmLfCVp2Ob zkeeB9{ZB38t0$s8sR%ZzF6LCx99~D1OrZz`P!t!ijaFjqxz^#@q4fHZ zsF@cRl)Zn$bFIgC+r!(>Y6I8QN|X}CR`*pbusJ-(zFudHKIw`!o8XzyHDTLSgl87_ z(No60cgDRe*K))ZnoXao6^m~f19i5bIWJTHg>Vse&9{^XB|La4cf#zrlbD8Hg zwP)2Hi1%W>{l84vfT&Oeg%U5f6629+v1gCh&r5p3y%mwceEiy4M9-oaOJ>O9_}353 zAtHJhJnM+;a)13+O{O9|W79eveNX$J0%&B{1mt-S2zZ8{YU(7OG2Z{$zpYz*eYEe! z8lYL#_%V|r6whB8QnMdts=`N`il+4+PU>>`2DlzhAz7{Qu>b%707*qoM6N<$f_`#7 ALI3~& literal 2382 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 diff --git a/applications/plugins/unitemp/views/General_view.c b/applications/plugins/unitemp/views/General_view.c index c2da49b3d..e21b04de2 100644 --- a/applications/plugins/unitemp/views/General_view.c +++ b/applications/plugins/unitemp/views/General_view.c @@ -19,7 +19,6 @@ #include "unitemp_icons.h" #include -#include "../../../settings/xtreme_settings/xtreme_settings.h" static View* view; @@ -170,11 +169,7 @@ static void _draw_singleSensor(Canvas* canvas, Sensor* sensor, const uint8_t pos } static void _draw_view_noSensors(Canvas* canvas) { - if(XTREME_SETTINGS()->sfw_mode) { - canvas_draw_icon(canvas, 7, 17, &I_sherlok_53x45_sfw); - } else { - canvas_draw_icon(canvas, 7, 17, &I_sherlok_53x45); - } + canvas_draw_icon(canvas, 7, 17, &I_sherlok_53x45); //Рисование рамки canvas_draw_rframe(canvas, 0, 0, 128, 63, 7); canvas_draw_rframe(canvas, 0, 0, 128, 64, 7);