From 10d2911af2de8fe524a41cdfa80bd6eb7702d29f Mon Sep 17 00:00:00 2001 From: hedger Date: Wed, 21 Feb 2024 09:03:58 +0000 Subject: [PATCH 1/9] toolchain: bumped to v33 --- scripts/toolchain/fbtenv.cmd | 2 +- scripts/toolchain/fbtenv.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/toolchain/fbtenv.cmd b/scripts/toolchain/fbtenv.cmd index dff8269f3..037c52bc2 100644 --- a/scripts/toolchain/fbtenv.cmd +++ b/scripts/toolchain/fbtenv.cmd @@ -13,7 +13,7 @@ if not ["%FBT_NOENV%"] == [""] ( exit /b 0 ) -set "FLIPPER_TOOLCHAIN_VERSION=32" +set "FLIPPER_TOOLCHAIN_VERSION=33" if ["%FBT_TOOLCHAIN_PATH%"] == [""] ( set "FBT_TOOLCHAIN_PATH=%FBT_ROOT%" diff --git a/scripts/toolchain/fbtenv.sh b/scripts/toolchain/fbtenv.sh index c7007acdc..495cdba6f 100755 --- a/scripts/toolchain/fbtenv.sh +++ b/scripts/toolchain/fbtenv.sh @@ -4,7 +4,7 @@ # public variables DEFAULT_SCRIPT_PATH="$(pwd -P)"; -FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"32"}"; +FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"33"}"; if [ -z ${FBT_TOOLCHAIN_PATH+x} ] ; then FBT_TOOLCHAIN_PATH_WAS_SET=0; From d4433fabd41eb095734935741f2f6be67d0f449c Mon Sep 17 00:00:00 2001 From: hedger Date: Wed, 21 Feb 2024 11:06:12 +0000 Subject: [PATCH 2/9] fbt: fixed behavior on Win and fbtenv --- scripts/toolchain/fbtenv.cmd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/toolchain/fbtenv.cmd b/scripts/toolchain/fbtenv.cmd index 037c52bc2..15ed34b82 100644 --- a/scripts/toolchain/fbtenv.cmd +++ b/scripts/toolchain/fbtenv.cmd @@ -1,6 +1,7 @@ @echo off if not ["%FBT_ROOT%"] == [""] ( + echo "arleady set" goto already_set ) @@ -58,3 +59,5 @@ if not "%1" == "env" ( cd "%FBT_ROOT%" cmd /k ) + +exit /b 0 From b1ebb142c4a9935ecc7d2fe18a184187d354db60 Mon Sep 17 00:00:00 2001 From: hedger Date: Wed, 21 Feb 2024 14:30:51 +0000 Subject: [PATCH 3/9] ft: removed debug logging --- scripts/toolchain/fbtenv.cmd | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/toolchain/fbtenv.cmd b/scripts/toolchain/fbtenv.cmd index 15ed34b82..29b48369a 100644 --- a/scripts/toolchain/fbtenv.cmd +++ b/scripts/toolchain/fbtenv.cmd @@ -1,7 +1,6 @@ @echo off if not ["%FBT_ROOT%"] == [""] ( - echo "arleady set" goto already_set ) From 90a8009d43b87bf50c739c172de344599d716260 Mon Sep 17 00:00:00 2001 From: hedger Date: Wed, 21 Feb 2024 15:53:34 +0000 Subject: [PATCH 4/9] libs: moved callback-connector to accessor app --- applications/debug/accessor/accessor_view_manager.cpp | 2 +- .../debug/accessor}/callback-connector.h | 0 applications/debug/accessor/scene/accessor_scene_start.cpp | 2 +- lib/SConscript | 2 -- targets/f18/api_symbols.csv | 1 - targets/f7/api_symbols.csv | 1 - 6 files changed, 2 insertions(+), 6 deletions(-) rename {lib/callback-connector => applications/debug/accessor}/callback-connector.h (100%) diff --git a/applications/debug/accessor/accessor_view_manager.cpp b/applications/debug/accessor/accessor_view_manager.cpp index db723d68c..339bfde7b 100644 --- a/applications/debug/accessor/accessor_view_manager.cpp +++ b/applications/debug/accessor/accessor_view_manager.cpp @@ -1,6 +1,6 @@ #include "accessor_view_manager.h" #include "accessor_event.h" -#include +#include "callback-connector.h" AccessorAppViewManager::AccessorAppViewManager() { event_queue = furi_message_queue_alloc(10, sizeof(AccessorEvent)); diff --git a/lib/callback-connector/callback-connector.h b/applications/debug/accessor/callback-connector.h similarity index 100% rename from lib/callback-connector/callback-connector.h rename to applications/debug/accessor/callback-connector.h diff --git a/applications/debug/accessor/scene/accessor_scene_start.cpp b/applications/debug/accessor/scene/accessor_scene_start.cpp index 6f5a4d112..57841617c 100644 --- a/applications/debug/accessor/scene/accessor_scene_start.cpp +++ b/applications/debug/accessor/scene/accessor_scene_start.cpp @@ -1,7 +1,7 @@ #include "../accessor_app.h" #include "../accessor_view_manager.h" #include "../accessor_event.h" -#include +#include "callback-connector.h" #include "accessor_scene_start.h" void AccessorSceneStart::on_enter(AccessorApp* app) { diff --git a/lib/SConscript b/lib/SConscript index 0767dc0b2..812573932 100644 --- a/lib/SConscript +++ b/lib/SConscript @@ -48,6 +48,4 @@ libs = env.BuildModules( ], ) -env.Append(SDK_HEADERS=[File("#/lib/callback-connector/callback-connector.h")]) - Return("libs") diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index f2190e43f..bdfa8c7a4 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -40,7 +40,6 @@ Header,+,applications/services/storage/storage.h,, Header,+,lib/bit_lib/bit_lib.h,, Header,+,lib/ble_profile/extra_profiles/hid_profile.h,, Header,+,lib/ble_profile/extra_services/hid_service.h,, -Header,+,lib/callback-connector/callback-connector.h,, Header,+,lib/datetime/datetime.h,, Header,+,lib/digital_signal/digital_sequence.h,, Header,+,lib/digital_signal/digital_signal.h,, diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index fed083cad..d856dc694 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -41,7 +41,6 @@ Header,+,applications/services/storage/storage.h,, Header,+,lib/bit_lib/bit_lib.h,, Header,+,lib/ble_profile/extra_profiles/hid_profile.h,, Header,+,lib/ble_profile/extra_services/hid_service.h,, -Header,+,lib/callback-connector/callback-connector.h,, Header,+,lib/datetime/datetime.h,, Header,+,lib/digital_signal/digital_sequence.h,, Header,+,lib/digital_signal/digital_signal.h,, From 65b0aa8e99ac151003410148cb73e37afcbe8fca Mon Sep 17 00:00:00 2001 From: hedger Date: Wed, 21 Feb 2024 16:27:56 +0000 Subject: [PATCH 5/9] accessor: naming fix --- applications/debug/accessor/accessor_view_manager.cpp | 2 +- .../accessor/{callback-connector.h => callback_connector.h} | 0 applications/debug/accessor/scene/accessor_scene_start.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename applications/debug/accessor/{callback-connector.h => callback_connector.h} (100%) diff --git a/applications/debug/accessor/accessor_view_manager.cpp b/applications/debug/accessor/accessor_view_manager.cpp index 339bfde7b..955c0b286 100644 --- a/applications/debug/accessor/accessor_view_manager.cpp +++ b/applications/debug/accessor/accessor_view_manager.cpp @@ -1,6 +1,6 @@ #include "accessor_view_manager.h" #include "accessor_event.h" -#include "callback-connector.h" +#include "callback_connector.h" AccessorAppViewManager::AccessorAppViewManager() { event_queue = furi_message_queue_alloc(10, sizeof(AccessorEvent)); diff --git a/applications/debug/accessor/callback-connector.h b/applications/debug/accessor/callback_connector.h similarity index 100% rename from applications/debug/accessor/callback-connector.h rename to applications/debug/accessor/callback_connector.h diff --git a/applications/debug/accessor/scene/accessor_scene_start.cpp b/applications/debug/accessor/scene/accessor_scene_start.cpp index 57841617c..d31001d2d 100644 --- a/applications/debug/accessor/scene/accessor_scene_start.cpp +++ b/applications/debug/accessor/scene/accessor_scene_start.cpp @@ -1,7 +1,7 @@ #include "../accessor_app.h" #include "../accessor_view_manager.h" #include "../accessor_event.h" -#include "callback-connector.h" +#include "callback_connector.h" #include "accessor_scene_start.h" void AccessorSceneStart::on_enter(AccessorApp* app) { From b0a741233feeadf33564684a4d4632955f093867 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 22 Feb 2024 18:28:36 +0300 Subject: [PATCH 6/9] Fix usbdisk filename by Willy-JL --- applications/system/js_app/modules/js_usbdisk/js_usbdisk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/system/js_app/modules/js_usbdisk/js_usbdisk.c b/applications/system/js_app/modules/js_usbdisk/js_usbdisk.c index 8ff744b84..2fe0887ef 100644 --- a/applications/system/js_app/modules/js_usbdisk/js_usbdisk.c +++ b/applications/system/js_app/modules/js_usbdisk/js_usbdisk.c @@ -1,5 +1,6 @@ #include "../../js_modules.h" #include +#include #include "mass_storage_usb.h" #define TAG "JsUsbdisk" @@ -128,7 +129,10 @@ static void js_usbdisk_start(struct mjs* mjs) { furi_hal_usb_unlock(); usbdisk->was_ejected = false; - usbdisk->usb = mass_storage_usb_start(usbdisk->path, fn); + FuriString* name = furi_string_alloc(); + path_extract_filename_no_ext(usbdisk->path, name); + usbdisk->usb = mass_storage_usb_start(furi_string_get_cstr(name), fn); + furi_string_free(name); mjs_return(mjs, MJS_UNDEFINED); } From 1c56a30d35365554d725787e08ee606be5fd7070 Mon Sep 17 00:00:00 2001 From: hedger Date: Thu, 22 Feb 2024 15:43:21 +0000 Subject: [PATCH 7/9] fbt: added "USERPROFILE" to forwarded vars --- scripts/fbt/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/fbt/util.py b/scripts/fbt/util.py index 629467568..02de6cbee 100644 --- a/scripts/fbt/util.py +++ b/scripts/fbt/util.py @@ -23,6 +23,7 @@ FORWARDED_ENV_VARIABLES = [ "PYTHONNOUSERSITE", "TMP", "TEMP", + "USERPROFILE", # ccache "CCACHE_DISABLE", # Colors for tools From 03bb446f75aeb46364f6e3c28ab653d2e5337b9e Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Thu, 22 Feb 2024 23:50:19 +0000 Subject: [PATCH 8/9] Update apps --- applications/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/external b/applications/external index 0a2b6900f..94a1e5980 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 0a2b6900fee0826880bbc0a0486379bc97539534 +Subproject commit 94a1e5980b0272d1e20837eb941e0105bf7addc2 From f2eff7be1db49ce16b81297d649af20a3fba29b8 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Thu, 22 Feb 2024 23:56:54 +0000 Subject: [PATCH 9/9] Merge NFC magic revert (gen2 writer corrupts magic tags) --- applications/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/external b/applications/external index 94a1e5980..f05a4ba59 160000 --- a/applications/external +++ b/applications/external @@ -1 +1 @@ -Subproject commit 94a1e5980b0272d1e20837eb941e0105bf7addc2 +Subproject commit f05a4ba59b4fbbd496582e016e767cd77ffd98a5