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

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
MX
2023-02-21 03:00:48 +03:00
parent 80a64d8e1a 0a3ff7f85a
commit 7d4bffb575
10 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/targets/f7/api_symbols.csv
+2 -1
View File
@@ -1,5 +1,5 @@
entry,status,name,type,params
Version,+,14.0,,
Version,+,14.1,,
Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,,
@@ -1187,6 +1187,7 @@ Function,+,furi_hal_mpu_protect_disable,void,FuriHalMpuRegion
Function,+,furi_hal_mpu_protect_no_access,void,"FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize"
Function,+,furi_hal_mpu_protect_read_only,void,"FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize"
Function,+,furi_hal_nfc_activate_nfca,_Bool,"uint32_t, uint32_t*"
Function,-,furi_hal_nfc_deinit,void,
Function,+,furi_hal_nfc_detect,_Bool,"FuriHalNfcDevData*, uint32_t"
Function,+,furi_hal_nfc_emulate_nfca,_Bool,"uint8_t*, uint8_t, uint8_t*, uint8_t, FuriHalNfcEmulateCallback, void*, uint32_t"
Function,+,furi_hal_nfc_exit_sleep,void,
1 entry status name type params
2 Version + 14.0 14.1
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h
1187 Function + furi_hal_mpu_protect_no_access void FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize
1188 Function + furi_hal_mpu_protect_read_only void FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize
1189 Function + furi_hal_nfc_activate_nfca _Bool uint32_t, uint32_t*
1190 Function - furi_hal_nfc_deinit void
1191 Function + furi_hal_nfc_detect _Bool FuriHalNfcDevData*, uint32_t
1192 Function + furi_hal_nfc_emulate_nfca _Bool uint8_t*, uint8_t, uint8_t*, uint8_t, FuriHalNfcEmulateCallback, void*, uint32_t
1193 Function + furi_hal_nfc_exit_sleep void
firmware/targets/f7/furi_hal/furi_hal_nfc.c
+18 -2
View File
@@ -24,13 +24,29 @@ FuriEventFlag* event = NULL;
#define FURI_HAL_NFC_UID_INCOMPLETE (0x04)
void furi_hal_nfc_init() {
furi_assert(!event);
event = furi_event_flag_alloc();
ReturnCode ret = rfalNfcInitialize();
if(ret == ERR_NONE) {
furi_hal_nfc_start_sleep();
event = furi_event_flag_alloc();
FURI_LOG_I(TAG, "Init OK");
} else {
FURI_LOG_W(TAG, "Initialization failed, RFAL returned: %d", ret);
FURI_LOG_W(TAG, "Init Failed, RFAL returned: %d", ret);
}
}
void furi_hal_nfc_deinit() {
ReturnCode ret = rfalDeinitialize();
if(ret == ERR_NONE) {
FURI_LOG_I(TAG, "Deinit OK");
} else {
FURI_LOG_W(TAG, "Deinit Failed, RFAL returned: %d", ret);
}
if(event) {
furi_event_flag_free(event);
event = NULL;
}
}
firmware/targets/f7/furi_hal/furi_hal_nfc.h
+4
View File
@@ -101,6 +101,10 @@ typedef struct {
*/
void furi_hal_nfc_init();
/** Deinit nfc
*/
void furi_hal_nfc_deinit();
/** Check if nfc worker is busy
*
* @return true if busy