Merge branch 'new_c_version' into dev [ci skip]

DarkFlippers · Feb 22, 2024 · b29a589 · b29a589
2 parents b8d5dfd + dbb8105
commit b29a589
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 8 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/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/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
@@ -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,,
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,4 @@ libs = env.BuildModules( @@
         ],
     )
-    env.Append(SDK_HEADERS=[File("#/lib/callback-connector/callback-connector.h")])
     Return("libs")