From b003ede76c46ef1c7c0cc85c7467b75901b494f8 Mon Sep 17 00:00:00 2001 From: nminaylov Date: Fri, 14 Oct 2022 17:46:23 +0300 Subject: [PATCH 1/2] Fix number of dolphin_apps --- applications/services/dolphin/helpers/dolphin_deed.c | 6 ++---- applications/services/dolphin/helpers/dolphin_deed.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/applications/services/dolphin/helpers/dolphin_deed.c b/applications/services/dolphin/helpers/dolphin_deed.c index d3c40298d..ce3e058b5 100644 --- a/applications/services/dolphin/helpers/dolphin_deed.c +++ b/applications/services/dolphin/helpers/dolphin_deed.c @@ -35,9 +35,9 @@ static const DolphinDeedWeight dolphin_deed_weights[] = { {2, DolphinAppIbutton}, // DolphinDeedIbuttonAdd {3, DolphinAppBadusb}, // DolphinDeedBadUsbPlayScript - {3, DolphinAppU2f}, // DolphinDeedU2fAuthorized + {3, DolphinAppPlugin}, // DolphinDeedU2fAuthorized - {1, DolphinAppGpio}, // DolphinDeedGpioUartBridge + {1, DolphinAppPlugin}, // DolphinDeedGpioUartBridge {1, DolphinAppPlugin}, // DolphinDeedPluginStart {1, DolphinAppPlugin}, // DolphinDeedPluginGameStart @@ -51,8 +51,6 @@ static uint8_t dolphin_deed_limits[] = { 20, // DolphinAppIr 20, // DolphinAppIbutton 20, // DolphinAppBadusb - 20, // DolphinAppU2f - 20, // DolphinAppGpio 20, // DolphinAppPlugin }; diff --git a/applications/services/dolphin/helpers/dolphin_deed.h b/applications/services/dolphin/helpers/dolphin_deed.h index 969f0d5cc..abe027d79 100644 --- a/applications/services/dolphin/helpers/dolphin_deed.h +++ b/applications/services/dolphin/helpers/dolphin_deed.h @@ -13,8 +13,6 @@ typedef enum { DolphinAppIr, DolphinAppIbutton, DolphinAppBadusb, - DolphinAppU2f, - DolphinAppGpio, DolphinAppPlugin, DolphinAppMAX, } DolphinApp; @@ -55,7 +53,6 @@ typedef enum { DolphinDeedBadUsbPlayScript, DolphinDeedU2fAuthorized, - DolphinDeedGpioUartBridge, DolphinDeedPluginStart, From 55bad280ee2640745cec7b4182a2c5f7f91d3082 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Fri, 14 Oct 2022 17:59:53 +0300 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b245de3b4..c4e5ebd44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,5 @@ ### New changes -* Add 433Mhz Security+ 1.0/2.0 in add manually in subghz -* Update Minesweeper (https://github.com/panki27/minesweeper) ------ -* SubGHz: Fix DTM Neo (keeloq) encoder -* fbt: fix flash usb without resources -* OFW: DesktopSettings: reset submenu before running dialog +* OFW PR: Fix dolphin level reset on update (OFW PR 1874 by nminaylov) #### [🎲 Download extra apps pack](https://download-directory.github.io/?url=https://github.com/UberGuidoZ/Flipper/tree/main/Applications/Unleashed)