Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 22:08:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2023-05-15 17:51:30 +01:00
parent 73847a78ae 9dedcd07b6
commit 8005b46023
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/targets/f18/api_symbols.csv
View File

@@ -1,5 +1,5 @@
entry,status,name,type,params entry,status,name,type,params
Version,+,26.2,, Version,+,26.3,,
Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,, Header,+,applications/services/cli/cli_vcp.h,,
1 entry status name type params
2 Version + 26.2 26.3
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h

14
firmware/targets/f7/api_symbols.csv
View File

@@ -1,5 +1,6 @@
entry,status,name,type,params entry,status,name,type,params
Version,+,26.2,, Version,+,26.3,,
Header,+,applications/main/fap_loader/fap_loader_app.h,,
Header,+,applications/main/fap_loader/fap_loader_app.h,, Header,+,applications/main/fap_loader/fap_loader_app.h,,
Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli.h,,
@@ -148,6 +149,7 @@ Header,+,lib/mlib/m-rbtree.h,,
Header,+,lib/mlib/m-tuple.h,, Header,+,lib/mlib/m-tuple.h,,
Header,+,lib/mlib/m-variant.h,, Header,+,lib/mlib/m-variant.h,,
Header,+,lib/nfc/nfc_device.h,, Header,+,lib/nfc/nfc_device.h,,
Header,+,lib/nfc/protocols/nfc_util.h,,
Header,+,lib/one_wire/maxim_crc.h,, Header,+,lib/one_wire/maxim_crc.h,,
Header,+,lib/one_wire/one_wire_host.h,, Header,+,lib/one_wire/one_wire_host.h,,
Header,+,lib/one_wire/one_wire_slave.h,, Header,+,lib/one_wire/one_wire_slave.h,,
@@ -2176,11 +2178,11 @@ Function,+,nfc_device_save_shadow,_Bool,"NfcDevice*, const char*"
Function,+,nfc_device_set_loading_callback,void,"NfcDevice*, NfcLoadingCallback, void*" Function,+,nfc_device_set_loading_callback,void,"NfcDevice*, NfcLoadingCallback, void*"
Function,+,nfc_device_set_name,void,"NfcDevice*, const char*" Function,+,nfc_device_set_name,void,"NfcDevice*, const char*"
Function,+,nfc_file_select,_Bool,NfcDevice* Function,+,nfc_file_select,_Bool,NfcDevice*
Function,-,nfc_util_bytes2num,uint64_t,"const uint8_t*, uint8_t" Function,+,nfc_util_bytes2num,uint64_t,"const uint8_t*, uint8_t"
Function,-,nfc_util_even_parity32,uint8_t,uint32_t Function,+,nfc_util_even_parity32,uint8_t,uint32_t
Function,-,nfc_util_num2bytes,void,"uint64_t, uint8_t, uint8_t*" Function,+,nfc_util_num2bytes,void,"uint64_t, uint8_t, uint8_t*"
Function,-,nfc_util_odd_parity,void,"const uint8_t*, uint8_t*, uint8_t" Function,+,nfc_util_odd_parity,void,"const uint8_t*, uint8_t*, uint8_t"
Function,-,nfc_util_odd_parity8,uint8_t,uint8_t Function,+,nfc_util_odd_parity8,uint8_t,uint8_t
Function,-,nfca_append_crc16,void,"uint8_t*, uint16_t" Function,-,nfca_append_crc16,void,"uint8_t*, uint16_t"
Function,-,nfca_emulation_handler,_Bool,"uint8_t*, uint16_t, uint8_t*, uint16_t*" Function,-,nfca_emulation_handler,_Bool,"uint8_t*, uint16_t, uint8_t*, uint16_t*"
Function,-,nfca_get_crc16,uint16_t,"uint8_t*, uint16_t" Function,-,nfca_get_crc16,uint16_t,"uint8_t*, uint16_t"
1 entry status name type params
2 Version + 26.2 26.3
3 Header + applications/main/fap_loader/fap_loader_app.h
4 Header + applications/main/fap_loader/fap_loader_app.h
5 Header + applications/services/bt/bt_service/bt.h
6 Header + applications/services/cli/cli.h
149 Header + lib/mlib/m-tuple.h
150 Header + lib/mlib/m-variant.h
151 Header + lib/nfc/nfc_device.h
152 Header + lib/nfc/protocols/nfc_util.h
153 Header + lib/one_wire/maxim_crc.h
154 Header + lib/one_wire/one_wire_host.h
155 Header + lib/one_wire/one_wire_slave.h
2178 Function + nfc_device_set_loading_callback void NfcDevice*, NfcLoadingCallback, void*
2179 Function + nfc_device_set_name void NfcDevice*, const char*
2180 Function + nfc_file_select _Bool NfcDevice*
2181 Function - + nfc_util_bytes2num uint64_t const uint8_t*, uint8_t
2182 Function - + nfc_util_even_parity32 uint8_t uint32_t
2183 Function - + nfc_util_num2bytes void uint64_t, uint8_t, uint8_t*
2184 Function - + nfc_util_odd_parity void const uint8_t*, uint8_t*, uint8_t
2185 Function - + nfc_util_odd_parity8 uint8_t uint8_t
2186 Function - nfca_append_crc16 void uint8_t*, uint16_t
2187 Function - nfca_emulation_handler _Bool uint8_t*, uint16_t, uint8_t*, uint16_t*
2188 Function - nfca_get_crc16 uint16_t uint8_t*, uint16_t

1
lib/nfc/SConscript
View File

@@ -6,6 +6,7 @@ env.Append(
], ],
SDK_HEADERS=[ SDK_HEADERS=[
File("nfc_device.h"), File("nfc_device.h"),
File("protocols/nfc_util.h"),
], ],
) )

8
lib/nfc/protocols/nfc_util.h
View File

@@ -2,6 +2,10 @@
#include <stdint.h> #include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
void nfc_util_num2bytes(uint64_t src, uint8_t len, uint8_t* dest); void nfc_util_num2bytes(uint64_t src, uint8_t len, uint8_t* dest);
uint64_t nfc_util_bytes2num(const uint8_t* src, uint8_t len); uint64_t nfc_util_bytes2num(const uint8_t* src, uint8_t len);
@@ -11,3 +15,7 @@ uint8_t nfc_util_even_parity32(uint32_t data);
uint8_t nfc_util_odd_parity8(uint8_t data); uint8_t nfc_util_odd_parity8(uint8_t data);
void nfc_util_odd_parity(const uint8_t* src, uint8_t* dst, uint8_t len); void nfc_util_odd_parity(const uint8_t* src, uint8_t* dst, uint8_t len);
#ifdef __cplusplus
}
#endif