DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-29 00:09:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'new_c_version' into dev [ci skip]

Browse Source
This commit is contained in:
MX 2024-02-22 04:43:42 +03:00
commit b29a5896a4
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
8 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/debug/accessor/accessor_view_manager.cpp
View File

@ -1,6 +1,6 @@
#include "accessor_view_manager.h" #include "accessor_view_manager.h"
#include "accessor_event.h" #include "accessor_event.h"
#include <callback-connector.h> #include "callback_connector.h"
AccessorAppViewManager::AccessorAppViewManager() { AccessorAppViewManager::AccessorAppViewManager() {
event_queue = furi_message_queue_alloc(10, sizeof(AccessorEvent)); event_queue = furi_message_queue_alloc(10, sizeof(AccessorEvent));

0
lib/callback-connector/callback-connector.h → applications/debug/accessor/callback_connector.h
View File

2
applications/debug/accessor/scene/accessor_scene_start.cpp
View File

@ -1,7 +1,7 @@
#include "../accessor_app.h" #include "../accessor_app.h"
#include "../accessor_view_manager.h" #include "../accessor_view_manager.h"
#include "../accessor_event.h" #include "../accessor_event.h"
#include <callback-connector.h> #include "callback_connector.h"
#include "accessor_scene_start.h" #include "accessor_scene_start.h"
void AccessorSceneStart::on_enter(AccessorApp* app) { void AccessorSceneStart::on_enter(AccessorApp* app) {

2
lib/SConscript
View File

@ -48,6 +48,4 @@ libs = env.BuildModules(
], ],
) )
env.Append(SDK_HEADERS=[File("#/lib/callback-connector/callback-connector.h")])
Return("libs") Return("libs")

4
scripts/toolchain/fbtenv.cmd
View File

@ -13,7 +13,7 @@ if not ["%FBT_NOENV%"] == [""] (
exit /b 0 exit /b 0
) )
set "FLIPPER_TOOLCHAIN_VERSION=32" set "FLIPPER_TOOLCHAIN_VERSION=33"
if ["%FBT_TOOLCHAIN_PATH%"] == [""] ( if ["%FBT_TOOLCHAIN_PATH%"] == [""] (
set "FBT_TOOLCHAIN_PATH=%FBT_ROOT%" set "FBT_TOOLCHAIN_PATH=%FBT_ROOT%"
@ -58,3 +58,5 @@ if not "%1" == "env" (
cd "%FBT_ROOT%" cd "%FBT_ROOT%"
cmd /k cmd /k
) )
exit /b 0

2
scripts/toolchain/fbtenv.sh
View File

@ -4,7 +4,7 @@
# public variables # public variables
DEFAULT_SCRIPT_PATH="$(pwd -P)"; 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 if [ -z ${FBT_TOOLCHAIN_PATH+x} ] ; then
FBT_TOOLCHAIN_PATH_WAS_SET=0; FBT_TOOLCHAIN_PATH_WAS_SET=0;

1
targets/f18/api_symbols.csv
View File

@ -40,7 +40,6 @@ Header,+,applications/services/storage/storage.h,,
Header,+,lib/bit_lib/bit_lib.h,, Header,+,lib/bit_lib/bit_lib.h,,
Header,+,lib/ble_profile/extra_profiles/hid_profile.h,, Header,+,lib/ble_profile/extra_profiles/hid_profile.h,,
Header,+,lib/ble_profile/extra_services/hid_service.h,, Header,+,lib/ble_profile/extra_services/hid_service.h,,
Header,+,lib/callback-connector/callback-connector.h,,
Header,+,lib/datetime/datetime.h,, Header,+,lib/datetime/datetime.h,,
Header,+,lib/digital_signal/digital_sequence.h,, Header,+,lib/digital_signal/digital_sequence.h,,
Header,+,lib/digital_signal/digital_signal.h,, Header,+,lib/digital_signal/digital_signal.h,,

1 entry status name type params
40 Header + lib/bit_lib/bit_lib.h
41 Header + lib/ble_profile/extra_profiles/hid_profile.h
42 Header + lib/ble_profile/extra_services/hid_service.h
Header + lib/callback-connector/callback-connector.h
43 Header + lib/datetime/datetime.h
44 Header + lib/digital_signal/digital_sequence.h
45 Header + lib/digital_signal/digital_signal.h

1
targets/f7/api_symbols.csv
View File

@ -41,7 +41,6 @@ Header,+,applications/services/storage/storage.h,,
Header,+,lib/bit_lib/bit_lib.h,, Header,+,lib/bit_lib/bit_lib.h,,
Header,+,lib/ble_profile/extra_profiles/hid_profile.h,, Header,+,lib/ble_profile/extra_profiles/hid_profile.h,,
Header,+,lib/ble_profile/extra_services/hid_service.h,, Header,+,lib/ble_profile/extra_services/hid_service.h,,
Header,+,lib/callback-connector/callback-connector.h,,
Header,+,lib/datetime/datetime.h,, Header,+,lib/datetime/datetime.h,,
Header,+,lib/digital_signal/digital_sequence.h,, Header,+,lib/digital_signal/digital_sequence.h,,
Header,+,lib/digital_signal/digital_signal.h,, Header,+,lib/digital_signal/digital_signal.h,,

1 entry status name type params
41 Header + lib/bit_lib/bit_lib.h
42 Header + lib/ble_profile/extra_profiles/hid_profile.h
43 Header + lib/ble_profile/extra_services/hid_service.h
Header + lib/callback-connector/callback-connector.h
44 Header + lib/datetime/datetime.h
45 Header + lib/digital_signal/digital_sequence.h
46 Header + lib/digital_signal/digital_signal.h