m5/M5Unit-NFC
0
0
Fork 0
mirror of https://github.com/m5stack/M5Unit-NFC.git synced 2026-05-20 11:48:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Separate NFC-A PICC identification

Browse Source
This commit is contained in:
GOB
2025-12-14 18:28:51 +09:00
parent b20af23c37
commit 6e34c91ee5
13 changed files with 302 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/UnitUnified/NFCA/Detect/main/Detect.cpp
+2
View File
@@ -114,6 +114,8 @@ void loop()
M5.Log.printf("%zu PICC\n", piccs.size());
uint32_t idx{};
for (auto&& u : piccs) {
// detect only performs a provisionalclassification based on sak, so further identification is required
nfc_a.identify(u);
M5.Log.printf("PICC:%s %s %u/%u\n", u.uidAsString().c_str(), u.typeAsString().c_str(), u.userAreaSize(),
u.totalSize());
lcd.printf("[%2u]:PICC:<%s> %s\n", idx, u.uidAsString().c_str(), u.typeAsString().c_str());
examples/UnitUnified/NFCA/Dump/main/Dump.cpp
+4 -6
View File
@@ -116,18 +116,16 @@ void loop()
if (M5.BtnA.wasClicked()) {
lcd.fillRect(0, lcd.fontHeight(), lcd.width(), lcd.height() - lcd.fontHeight());
std::vector<PICC> piccs;
if (nfc_a.detect(piccs)) {
// If multiple occurrences are detected, only the first one detected
auto& picc = piccs.front();
if (nfc_a.reactivate(picc)) {
PICC picc{};
if (nfc_a.detect(picc)) {
if (nfc_a.identify(picc) && nfc_a.reactivate(picc)) {
M5.Speaker.tone(3000, 20);
M5.Log.printf("==== Dump %s %s %u/%u ====\n", picc.uidAsString().c_str(), picc.typeAsString().c_str(),
picc.userAreaSize(), picc.totalSize());
nfc_a.dump(keyA); // Need key if MIFARE classic, Ignore key if not MIFARE classic
nfc_a.deactivate();
} else {
M5_LOGE("Failed to activate %s", picc.uidAsString().c_str());
M5_LOGE("Failed to identify/activate %s", picc.uidAsString().c_str());
}
} else {
M5.Log.printf("PICC NOT exists\n");
examples/UnitUnified/NFCA/NDEF/main/NDEF.cpp
+5 -22
View File
@@ -248,14 +248,14 @@ void loop()
if (clicked || held) {
PICC picc{};
if (nfc_a.detect(picc)) {
if (nfc_a.reactivate(picc)) {
if (nfc_a.identify(picc) && nfc_a.reactivate(picc)) {
M5.Log.printf("PICC:%s %s %u/%u\n", picc.uidAsString().c_str(), picc.typeAsString().c_str(),
picc.userAreaSize(), picc.totalSize());
if (picc.supportsNFC()) {
if (clicked) {
M5.Speaker.tone(2000, 30);
lcd.fillScreen(TFT_BLUE);
//nfc_a.dump();
nfc_a.dump();
read_ndef();
} else if (held) {
M5.Speaker.tone(4000, 30);
@@ -265,8 +265,11 @@ void loop()
M5.Log.printf("Please remove the PICC from the reader\n");
} else {
M5.Speaker.tone(1000, 50);
M5.Log.printf("Not support the NDEF\n");
}
} else {
M5_LOGE("Failed to identify/activate %s", picc.uidAsString().c_str());
}
nfc_a.deactivate();
lcd.setCursor(0, 0);
@@ -277,23 +280,3 @@ void loop()
}
}
}
/*
6:19:30.599 > Page :00 01 02 03
16:19:30.605 > --------------------
16:19:30.605 > [000/00]:04 49 37 F2
16:19:30.605 > [001/01]:D2 A6 1C 90
16:19:30.610 > [002/02]:F8 48 00 00
16:19:30.610 > [003/03]:E1 10 12 00
16:19:30.610 > [004/04]:03 0F D1 01
16:19:30.616 > [005/05]:0B 54 02 65
16:19:30.616 > [006/06]:6E 33 37 42
16:19:30.616 > [007/07]:37 34 43 37
16:19:30.622 > [008/08]:41 FE 00 00
16:19:30.622 > [009/09]:00 00 00 00
16:19:30.622 > [010/0A]:00 00 00 00
16:19:30.627 > [011/0B]:00 00 00 00
16:19:30.627 > [012/0C]:00 00 00 00
16:19:30.627 > [013/0D]:00 00 00 00
16:19:30.632 > [014/0E]:00 00 00 00
16:19:30.632 > [015/0F]:00 00 00 00
*/
examples/UnitUnified/NFCA/ReadWrite/main/ReadWrite.cpp
+4 -1
View File
@@ -267,7 +267,7 @@ void loop()
PICC picc;
if (nfc_a.detect(picc)) {
lcd.fillScreen(TFT_DARKGREEN);
if (nfc_a.reactivate(picc)) {
if (nfc_a.identify(picc) && nfc_a.reactivate(picc)) {
M5.Log.printf("PICC:%s %s %u/%u\n", picc.uidAsString().c_str(), picc.typeAsString().c_str(),
picc.userAreaSize(), picc.totalSize());
@@ -288,7 +288,10 @@ void loop()
}
}
nfc_a.deactivate();
} else {
M5_LOGE("Failed to identify/activate %s", picc.uidAsString().c_str());
}
} else {
M5.Log.printf("PICC NOT exists\n");
}
examples/UnitUnified/NFCA/ValueBlock/main/ValueBlock.cpp
+3 -1
View File
@@ -366,7 +366,7 @@ void loop()
if (clicked || held) {
PICC picc{};
if (nfc_a.detect(picc)) {
if (nfc_a.reactivate(picc)) {
if (nfc_a.identify(picc) && nfc_a.reactivate(picc)) {
M5.Log.printf("PICC:%s %s %u/%u\n", picc.uidAsString().c_str(), picc.typeAsString().c_str(),
picc.userAreaSize(), picc.totalSize());
if (picc.isMifareClassic()) {
@@ -386,6 +386,8 @@ void loop()
M5.Log.printf("Not support the value block\n");
}
nfc_a.deactivate();
} else {
M5_LOGE("Failed to identify/activate %s", picc.uidAsString().c_str());
}
} else {
M5.Log.printf("PICC NOT exists\n");