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

NFC: Detect NTAG4xx in Type 4 Tag poller

Browse Source
This commit is contained in:
Willy-JL
2025-03-22 09:38:43 +00:00
parent 49127b199b
commit 1f8cfcc669
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
View File

@@ -4,6 +4,8 @@
#include <bit_lib/bit_lib.h> #include <bit_lib/bit_lib.h>
#include <nfc/nfc_device.h> #include <nfc/nfc_device.h>
#include <nfc/protocols/ntag4xx/ntag4xx_poller.h>
#include <nfc/protocols/ntag4xx/ntag4xx_poller_defs.h>
#include <nfc/protocols/mf_desfire/mf_desfire_poller.h> #include <nfc/protocols/mf_desfire/mf_desfire_poller.h>
#include <nfc/protocols/mf_desfire/mf_desfire_poller_defs.h> #include <nfc/protocols/mf_desfire/mf_desfire_poller_defs.h>
@@ -226,17 +228,25 @@ Type4TagError type_4_tag_poller_detect_platform(Type4TagPoller* instance) {
NfcDevice* device = nfc_device_alloc(); NfcDevice* device = nfc_device_alloc();
do { do {
FURI_LOG_D(TAG, "Detect DESFire"); FURI_LOG_D(TAG, "Detect NTAG4xx");
MfDesfirePoller* mf_des = mf_desfire_poller.alloc(instance->iso14443_4a_poller); Ntag4xxPoller* ntag4xx = ntag4xx_poller.alloc(instance->iso14443_4a_poller);
mf_desfire_poller_set_command_mode(mf_des, MfDesfirePollerCommandModeIsoWrapped); if(ntag4xx_poller.detect(event, ntag4xx)) {
if(mf_desfire_poller.detect(event, mf_des)) { platform = Type4TagPlatformNtag4xx;
platform = Type4TagPlatformMfDesfire; nfc_device_set_data(device, NfcProtocolNtag4xx, ntag4xx_poller.get_data(ntag4xx));
nfc_device_set_data(device, NfcProtocolMfDesfire, mf_desfire_poller.get_data(mf_des));
} }
mf_desfire_poller.free(mf_des); ntag4xx_poller.free(ntag4xx);
if(platform != Type4TagPlatformUnknown) break; if(platform != Type4TagPlatformUnknown) break;
// FIXME: detect NTAG4xx FURI_LOG_D(TAG, "Detect DESFire");
MfDesfirePoller* mf_desfire = mf_desfire_poller.alloc(instance->iso14443_4a_poller);
mf_desfire_poller_set_command_mode(mf_desfire, MfDesfirePollerCommandModeIsoWrapped);
if(mf_desfire_poller.detect(event, mf_desfire)) {
platform = Type4TagPlatformMfDesfire;
nfc_device_set_data(
device, NfcProtocolMfDesfire, mf_desfire_poller.get_data(mf_desfire));
}
mf_desfire_poller.free(mf_desfire);
if(platform != Type4TagPlatformUnknown) break;
} while(false); } while(false);
Type4TagError error; Type4TagError error;