Merge branch 'Flipper-XFW:dev' into rgb_flickering_fix

Flipper-XFW · Feb 24, 2024 · b52c394 · b52c394
2 parents 97c531f + f2eff7b
commit b52c394
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 9 deletions.
diff --git 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/lib/callback-connector/callback-connector.h → ...tions/debug/accessor/callback_connector.h b/lib/callback-connector/callback-connector.h → ...tions/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
@@ -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) {

diff --git a/applications/external b/applications/external
diff --git a/lib/SConscript b/lib/SConscript
@@ -50,6 +50,4 @@ libs = env.BuildModules(
     ],
 )
 
-env.Append(SDK_HEADERS=[File("#/lib/callback-connector/callback-connector.h")])
-
 Return("libs")
diff --git a/scripts/fbt/util.py b/scripts/fbt/util.py
@@ -23,6 +23,7 @@
     "PYTHONNOUSERSITE",
     "TMP",
     "TEMP",
+    "USERPROFILE",
     # ccache
     "CCACHE_DISABLE",
     # Colors for tools

diff --git 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%"
@@ -58,3 +58,5 @@ if not "%1" == "env" (
     cd "%FBT_ROOT%"
     cmd /k
 )
+
+exit /b 0
diff --git 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;

diff --git 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
@@ -52,7 +52,6 @@ Header,+,build/icons/assets_icons.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,,
+1 −0		atomicdiceroller/flipper_atomicdiceroller.c
+0 −2		bt_trigger/bt_trigger.h
+1 −1		doom/application.fam
+1 −1		doom/assets.h
+1 −1		doom/display.h
+2 −1		geiger/flipper_geiger.c
+1 −1		nfc_magic/application.fam
+12 −26		nfc_magic/lib/magic/nfc_magic_scanner.c
+0 −178		nfc_magic/lib/magic/protocols/gen2/crypto1.c
+0 −45		nfc_magic/lib/magic/protocols/gen2/crypto1.h
+0 −569		nfc_magic/lib/magic/protocols/gen2/gen2_poller.c
+0 −88		nfc_magic/lib/magic/protocols/gen2/gen2_poller.h
+0 −633		nfc_magic/lib/magic/protocols/gen2/gen2_poller_i.c
+0 −139		nfc_magic/lib/magic/protocols/gen2/gen2_poller_i.h
+0 −2		nfc_magic/lib/magic/protocols/nfc_magic_protocols.c
+0 −2		nfc_magic/lib/magic/protocols/nfc_magic_protocols.h
+2 −19		nfc_magic/nfc_magic_app.c
+0 −37		nfc_magic/nfc_magic_app_i.h
+1 −6		nfc_magic/scenes/nfc_magic_scene_config.h
+1 −15		nfc_magic/scenes/nfc_magic_scene_file_select.c
+0 −55		nfc_magic/scenes/nfc_magic_scene_gen2_menu.c
+0 −120		nfc_magic/scenes/nfc_magic_scene_gen2_write_check.c
+5 −5		nfc_magic/scenes/nfc_magic_scene_gen4_actions_menu.c
+14 −15		nfc_magic/scenes/nfc_magic_scene_gen4_set_cfg.c
+1 −1		nfc_magic/scenes/nfc_magic_scene_gen4_set_direct_write_block_0_mode.c
+1 −1		nfc_magic/scenes/nfc_magic_scene_gen4_set_shd_mode.c
+2 −8		nfc_magic/scenes/nfc_magic_scene_magic_info.c
+0 −311		nfc_magic/scenes/nfc_magic_scene_mf_classic_dict_attack.c
+0 −65		nfc_magic/scenes/nfc_magic_scene_mf_classic_menu.c
+0 −121		nfc_magic/scenes/nfc_magic_scene_mf_classic_write_check.c
+6 −48		nfc_magic/scenes/nfc_magic_scene_wipe.c
+5 −50		nfc_magic/scenes/nfc_magic_scene_write.c
+0 −245		nfc_magic/views/dict_attack.c
+0 −50		nfc_magic/views/dict_attack.h
+3 −0		video_game_module_tool/.catalog/CHANGELOG.md
+1 −1		video_game_module_tool/application.fam
+8 −29		video_game_module_tool/flasher/flasher.c
+0 −3		video_game_module_tool/flasher/swd.c
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,4 @@ libs = env.BuildModules( @@
         ],
     )
-    env.Append(SDK_HEADERS=[File("#/lib/callback-connector/callback-connector.h")])
     Return("libs")