Merge branch 'fz-dev' into dev

lib/flipper_format/SConscript

@@ -7,6 +7,7 @@ env.Append(
     SDK_HEADERS=[
         File("flipper_format.h"),
         File("flipper_format_i.h"),
+        File("flipper_format_stream.h"),
     ],
 )
 

lib/freertos.scons

@@ -7,9 +7,6 @@ env.Append(
         "#/lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F",
         "#/lib/FreeRTOS-glue",
     ],
-    CPPDEFINES=[
-        "HAVE_FREERTOS",
-    ],
 )
 
 

lib/libusb_stm32.scons

@@ -4,9 +4,6 @@ env.Append(
     CPPPATH=[
         "#/lib/libusb_stm32/inc",
     ],
-    CPPDEFINES=[
-        ("USB_PMASIZE", "0x400"),
-    ],
     SDK_HEADERS=env.GlobRecursive(
         "*.h",
         Dir("libusb_stm32/inc"),
@@ -16,6 +13,11 @@ env.Append(
 
 libenv = env.Clone(FW_LIB_NAME="usb_stm32")
 libenv.ApplyLibFlags()
+libenv.Append(
+    CPPDEFINES=[
+        ("USB_PMASIZE", "0x400"),
+    ],
+)
 
 
 sources = [

lib/littlefs.scons

@@ -4,14 +4,16 @@ env.Append(
     CPPPATH=[
         "#/lib/littlefs",
     ],
-    CPPDEFINES=[
-        ("LFS_CONFIG", "lfs_config.h"),
-    ],
 )
 
 
 libenv = env.Clone(FW_LIB_NAME="littlefs")
 libenv.ApplyLibFlags()
+libenv.Append(
+    CPPDEFINES=[
+        ("LFS_CONFIG", "lfs_config.h"),
+    ],
+)
 
 sources = Glob("littlefs/*.c", source=True)
 

lib/misc.scons

@@ -1,7 +1,7 @@
-Import("env")
-
 from fbt.util import GLOB_FILE_EXCLUSION
 
+Import("env")
+
 env.Append(
     CPPPATH=[
         "#/lib/digital_signal",

lib/toolbox/SConscript

@@ -1,8 +1,8 @@
-Import("env")
-
 from fbt.version import get_fast_git_version_id
 
 
+Import("env")
+
 env.Append(
     CPPPATH=[
         "#/lib/toolbox",