mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2024-12-24 22:07:14 +03:00
Merge remote-tracking branch 'OFW/hedger/toochain_29' into new_c_version
This commit is contained in:
commit
dbb81055f2
@ -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));
|
||||
|
@ -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) {
|
||||
|
@ -48,6 +48,4 @@ libs = env.BuildModules(
|
||||
],
|
||||
)
|
||||
|
||||
env.Append(SDK_HEADERS=[File("#/lib/callback-connector/callback-connector.h")])
|
||||
|
||||
Return("libs")
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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,,
|
||||
|
|
@ -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,,
|
||||
|
|
Loading…
Reference in New Issue
Block a user