From f81999ea4a0dff606e0a19c6e50f3459e2ec3689 Mon Sep 17 00:00:00 2001 From: Nikolay Minaylov Date: Fri, 14 Oct 2022 20:35:53 +0300 Subject: [PATCH 1/3] Fix number of dolphin_apps (#1874) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: あく --- 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 865baed0bbcd30fc378f2e92eb00ebc20be8dcdd Mon Sep 17 00:00:00 2001 From: Kevin Kwok Date: Fri, 14 Oct 2022 11:07:23 -0700 Subject: [PATCH 2/3] Fix FileNotFoundError in ./fbt flash_usb (#1876) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix FileNotFoundError in ./fbt flash_usb * scripts: update.py: proper fix for file naming Co-authored-by: あく Co-authored-by: hedger --- scripts/update.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/update.py b/scripts/update.py index 6be1dce06..3259c5b09 100755 --- a/scripts/update.py +++ b/scripts/update.py @@ -78,8 +78,12 @@ class Main(App): def generate(self): stage_basename = "updater.bin" # used to be basename(self.args.stage) - dfu_basename = "firmware.dfu" # used to be basename(self.args.dfu) - radiobin_basename = "radio.bin" # used to be basename(self.args.radiobin) + dfu_basename = ( + "firmware.dfu" if self.args.dfu else "" + ) # used to be basename(self.args.dfu) + radiobin_basename = ( + "radio.bin" if self.args.radiobin else "" + ) # used to be basename(self.args.radiobin) resources_basename = "" radio_version = 0 From f06930e4ae98bfad66c38f9bea5bb67601c64001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Sat, 15 Oct 2022 03:23:06 +0900 Subject: [PATCH 3/3] Desktop: fix fap in settings (#1877) --- applications/main/fap_loader/application.fam | 1 + .../scenes/desktop_settings_scene_favorite.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/applications/main/fap_loader/application.fam b/applications/main/fap_loader/application.fam index bd0403e0e..784ee9508 100644 --- a/applications/main/fap_loader/application.fam +++ b/applications/main/fap_loader/application.fam @@ -3,6 +3,7 @@ App( name="Applications", apptype=FlipperAppType.APP, entry_point="fap_loader_app", + cdefines=["APP_FAP_LOADER"], requires=[ "gui", "storage", diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c index 07ba9925f..bdd9589ed 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c @@ -11,9 +11,16 @@ static bool favorite_fap_selector_item_callback( uint8_t** icon_ptr, FuriString* item_name) { UNUSED(context); +#ifdef APP_FAP_LOADER Storage* storage = furi_record_open(RECORD_STORAGE); bool success = fap_loader_load_name_and_icon(file_path, storage, icon_ptr, item_name); furi_record_close(RECORD_STORAGE); +#else + UNUSED(file_path); + UNUSED(icon_ptr); + UNUSED(item_name); + bool success = false; +#endif return success; }