Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-12 19:43:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2023-03-09 00:22:52 +00:00
parent faa95641fa b0af6f4b53
commit 9968b2ff0f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/plugins/nfc_magic/nfc_magic_worker.c
+3
View File
@@ -49,6 +49,9 @@ void nfc_magic_worker_start(
furi_assert(nfc_magic_worker);
furi_assert(dev_data);
furi_hal_nfc_deinit();
furi_hal_nfc_init();
nfc_magic_worker->callback = callback;
nfc_magic_worker->context = context;
nfc_magic_worker->dev_data = dev_data;
firmware/targets/f7/api_symbols.csv
+2 -2
View File
@@ -1244,13 +1244,13 @@ 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_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,
Function,+,furi_hal_nfc_field_off,void,
Function,+,furi_hal_nfc_field_on,void,
Function,-,furi_hal_nfc_init,void,
Function,+,furi_hal_nfc_init,void,
Function,+,furi_hal_nfc_is_busy,_Bool,
Function,+,furi_hal_nfc_is_init,_Bool,
Function,+,furi_hal_nfc_listen,_Bool,"uint8_t*, uint8_t, uint8_t*, uint8_t, _Bool, uint32_t"
1 entry status name type params
1244 Function + furi_hal_mpu_protect_no_access void FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize
1245 Function + furi_hal_mpu_protect_read_only void FuriHalMpuRegion, uint32_t, FuriHalMPURegionSize
1246 Function + furi_hal_nfc_activate_nfca _Bool uint32_t, uint32_t*
1247 Function - + furi_hal_nfc_deinit void
1248 Function + furi_hal_nfc_detect _Bool FuriHalNfcDevData*, uint32_t
1249 Function + furi_hal_nfc_emulate_nfca _Bool uint8_t*, uint8_t, uint8_t*, uint8_t, FuriHalNfcEmulateCallback, void*, uint32_t
1250 Function + furi_hal_nfc_exit_sleep void
1251 Function + furi_hal_nfc_field_off void
1252 Function + furi_hal_nfc_field_on void
1253 Function - + furi_hal_nfc_init void
1254 Function + furi_hal_nfc_is_busy _Bool
1255 Function + furi_hal_nfc_is_init _Bool
1256 Function + furi_hal_nfc_listen _Bool uint8_t*, uint8_t, uint8_t*, uint8_t, _Bool, uint32_t
firmware/targets/f7/furi_hal/furi_hal_subghz.c
+1 -1
View File
@@ -91,7 +91,7 @@ bool furi_hal_subghz_enable_ext_power(void) {
}
void furi_hal_subghz_disable_ext_power(void) {
if(furi_hal_subghz.radio_type != SubGhzRadioInternal) {
if(furi_hal_power_is_otg_enabled()) {
furi_hal_power_disable_otg();
}
}