Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-25 01:38:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
MX
2022-11-02 22:53:12 +03:00
parent 9c4612e571 0652830c51
commit 79b37556d4
54 changed files with 804 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/SConscript
+6 -6
View File
@@ -17,12 +17,12 @@ env.Append(
"lib/print",
],
SDK_HEADERS=[
File("#/lib/one_wire/one_wire_host_timing.h"),
File("#/lib/one_wire/one_wire_host.h"),
File("#/lib/one_wire/one_wire_slave.h"),
File("#/lib/one_wire/one_wire_device.h"),
File("#/lib/one_wire/ibutton/ibutton_worker.h"),
File("#/lib/one_wire/maxim_crc.h"),
File("one_wire/one_wire_host_timing.h"),
File("one_wire/one_wire_host.h"),
File("one_wire/one_wire_slave.h"),
File("one_wire/one_wire_device.h"),
File("one_wire/ibutton/ibutton_worker.h"),
File("one_wire/maxim_crc.h"),
File("#/lib/u8g2/u8g2.h"),
],
)
lib/flipper_application/SConscript
+1 -1
View File
@@ -5,7 +5,7 @@ env.Append(
"#/lib/flipper_application",
],
SDK_HEADERS=[
File("#/lib/flipper_application/flipper_application.h"),
File("flipper_application.h"),
],
)
lib/flipper_format/SConscript
+2 -2
View File
@@ -5,8 +5,8 @@ env.Append(
"#/lib/flipper_format",
],
SDK_HEADERS=[
File("#/lib/flipper_format/flipper_format.h"),
File("#/lib/flipper_format/flipper_format_i.h"),
File("flipper_format.h"),
File("flipper_format_i.h"),
],
)
lib/infrared/SConscript
+3 -3
View File
@@ -6,9 +6,9 @@ env.Append(
"#/lib/infrared/worker",
],
SDK_HEADERS=[
File("#/lib/infrared/worker/infrared_transmit.h"),
File("#/lib/infrared/worker/infrared_worker.h"),
File("#/lib/infrared/encoder_decoder/infrared.h"),
File("encoder_decoder/infrared.h"),
File("worker/infrared_worker.h"),
File("worker/infrared_transmit.h"),
],
)
lib/lfrfid/SConscript
+6 -6
View File
@@ -8,12 +8,12 @@ env.Append(
"#/lib/lfrfid",
],
SDK_HEADERS=[
File("#/lib/lfrfid/lfrfid_worker.h"),
File("#/lib/lfrfid/lfrfid_raw_worker.h"),
File("#/lib/lfrfid/lfrfid_raw_file.h"),
File("#/lib/lfrfid/lfrfid_dict_file.h"),
File("#/lib/lfrfid/tools/bit_lib.h"),
File("#/lib/lfrfid/protocols/lfrfid_protocols.h"),
File("lfrfid_worker.h"),
File("lfrfid_raw_worker.h"),
File("lfrfid_raw_file.h"),
File("lfrfid_dict_file.h"),
File("tools/bit_lib.h"),
File("protocols/lfrfid_protocols.h"),
],
)
lib/libusb_stm32.scons
+4
View File
@@ -7,6 +7,10 @@ env.Append(
CPPDEFINES=[
("USB_PMASIZE", "0x400"),
],
SDK_HEADERS=env.GlobRecursive(
"*.h",
Dir("libusb_stm32/inc"),
),
)
lib/mbedtls.scons
+4
View File
@@ -5,6 +5,10 @@ env.Append(
"#/lib/mbedtls",
"#/lib/mbedtls/include",
],
SDK_HEADERS=[
File("mbedtls/include/mbedtls/des.h"),
File("mbedtls/include/mbedtls/sha1.h"),
],
)
lib/misc.scons
+1 -1
View File
@@ -13,7 +13,7 @@ env.Append(
"PB_ENABLE_MALLOC",
],
SDK_HEADERS=[
File("#/lib/micro-ecc/uECC.h"),
File("micro-ecc/uECC.h"),
],
)
lib/print/SConscript
+1 -1
View File
@@ -98,7 +98,7 @@ for wrapped_fn in wrapped_fn_list:
env.Append(
SDK_HEADERS=[
File("#/lib/print/wrappers.h"),
File("wrappers.h"),
],
)
lib/toolbox/SConscript
+17 -17
View File
@@ -8,23 +8,23 @@ env.Append(
"#/lib/toolbox",
],
SDK_HEADERS=[
File("#/lib/toolbox/manchester_decoder.h"),
File("#/lib/toolbox/manchester_encoder.h"),
File("#/lib/toolbox/path.h"),
File("#/lib/toolbox/random_name.h"),
File("#/lib/toolbox/hmac_sha256.h"),
File("#/lib/toolbox/crc32_calc.h"),
File("#/lib/toolbox/dir_walk.h"),
File("#/lib/toolbox/md5.h"),
File("#/lib/toolbox/args.h"),
File("#/lib/toolbox/saved_struct.h"),
File("#/lib/toolbox/version.h"),
File("#/lib/toolbox/tar/tar_archive.h"),
File("#/lib/toolbox/stream/stream.h"),
File("#/lib/toolbox/stream/file_stream.h"),
File("#/lib/toolbox/stream/string_stream.h"),
File("#/lib/toolbox/stream/buffered_file_stream.h"),
File("#/lib/toolbox/protocols/protocol_dict.h"),
File("manchester_decoder.h"),
File("manchester_encoder.h"),
File("path.h"),
File("random_name.h"),
File("hmac_sha256.h"),
File("crc32_calc.h"),
File("dir_walk.h"),
File("md5.h"),
File("args.h"),
File("saved_struct.h"),
File("version.h"),
File("tar/tar_archive.h"),
File("stream/stream.h"),
File("stream/file_stream.h"),
File("stream/string_stream.h"),
File("stream/buffered_file_stream.h"),
File("protocols/protocol_dict.h"),
],
)