Fixes to require dependency on M5Unit-NFC

Author: GOB52

README.md

@@ -18,73 +18,13 @@ RFID2 is a radio frequency identification unit. Built-in WS1850S chip, working f
 - [M5UnitUnified](https://github.com/m5stack/M5UnitUnified)
 - [M5Utility](https://github.com/m5stack/M5Utility)
 - [M5HAL](https://github.com/m5stack/M5HAL)
+- [M5Unit-NFC](https://github.com/m5stack/M5Unit-NFC)
 
 ## License
 
 - [M5Unit-RFID -MIT](LICENSE)
 
 
-## Feature
-- Detection with collision resolution when multiple devices are in the detection range
-- Identify MIFARE and NTAG devices in detail
-- Support NFC-A Type-2 NDEF Read/Write
-
-
-## Usage
-
-```cpp
-#include <M5Unified.h>
-#include <M5UnitUnified.h>
-#include <M5UnitUnifiedRFID.h>
-namespace {
-m5::unit::UnitUnified Units;
-m5::unit::UnitRFID2 unit;
-}  // namespace
-
-using namespace m5::rfid;
-
-void setup()
-{
-    M5.begin();
-
-    auto pin_num_sda = M5.getPin(m5::pin_name_t::port_a_sda);
-    auto pin_num_scl = M5.getPin(m5::pin_name_t::port_a_scl);
-    M5_LOGI("getPin: SDA:%u SCL:%u", pin_num_sda, pin_num_scl);
-    Wire.begin(pin_num_sda, pin_num_scl, 400 * 1000U);
-
-    if (!Units.add(unit, Wire) || !Units.begin()) {
-        M5_LOGE("Failed to begin");
-        while (true) {
-            m5::utility::delay(10000);
-        }
-    }
-    M5_LOGI("M5UnitUnified has been begun");
-    M5_LOGI("%s", Units.debugInfo().c_str());
-    M5_LOGI("Please put the devices...");
-}
-
-void loop()
-{
-    M5.update();
-    Units.update();
-    auto touch = M5.Touch.getDetail();
-    if (M5.BtnA.wasClicked() || touch.wasClicked()) {
-        if (unit.detectDevice()) {
-            UID uid{};
-            if (unit.activateDevice(uid)) {
-                M5_LOGI("UID:%s %s", uid.uidAsString().c_str(), uid.typeAsString().c_str());
-
-                //
-                // Use any API...
-                //
-                
-                unit.deactivateDevice(); // Once activated, clean up with deactivate.
-            }
-        }
-    }
-}
-```
-
 ## Examples
 See also [examples/UnitUnified](examples/UnitUnified)
 

examples/UnitUnified/DetectDevices/main/DetectDevices.cpp

@@ -5,22 +5,24 @@
  */
 /*
   Example using M5UnitUnified for UnitRFID2
-  Detect RFID devices
+  Detect NFC-A devices
 */
 #include <M5Unified.h>
 #include <M5UnitUnified.h>
 #include <M5UnitUnifiedRFID.h>
+#include <M5UnitUnifiedNFC.h>
 #include <M5Utility.h>
 #include <vector>
 
 namespace {
 auto& lcd = M5.Display;
 m5::unit::UnitUnified Units;
 m5::unit::UnitRFID2 unit;
+m5::unit::nfc::NFCLayerA nfc_a{unit};
 
 }  // namespace
 
-using namespace m5::rfid;
+using namespace m5::nfc::a;
 
 void setup()
 {
@@ -51,43 +53,29 @@ void setup()
     } else {
         lcd.setFont(&fonts::Font2);
     }
-    lcd.clear(0);
-    lcd.setCursor(8, 0);
-    lcd.printf("Please put the devices...");
-    M5.Log.printf("Please put the devices...\n");
+    lcd.fillScreen(0);
+    lcd.setCursor(0, 0);
 }
 
 void loop()
 {
     M5.update();
+    auto touch = M5.Touch.getDetail();
     Units.update();
 
     std::vector<UID> devices;
-    // Detect new devices?
-    while (unit.detectIdleDevice()) {
-        // Store UID
-        UID uid{};
-        if (unit.activateDevice(uid)) {
-            devices.push_back(uid);
-            unit.deactivateDevice();
-        } else {
-            M5_LOGE("Failed to activate");
-        }
-    }
-    // display / logging
-    if (!devices.empty()) {
-        M5.Log.printf(">>--------------\n");
-        M5.Speaker.tone(1000, 20);
-        lcd.fillRect(0, lcd.fontHeight(), lcd.width(), lcd.height() - lcd.fontHeight(), 0);
-
-        uint32_t idx{1};
-        for (auto&& uid : devices) {
-            M5.Log.printf("UID:%s %s\n", uid.uidAsString().c_str(), uid.typeAsString().c_str());
-            lcd.setCursor(8, lcd.fontHeight() * idx);
-            lcd.printf("%s:%s", uid.uidAsString().c_str(), uid.typeAsString().c_str());
+    if (nfc_a.detect(devices)) {
+        M5.Speaker.tone(3000, 10);
+        lcd.fillRect(0, 0, lcd.width(), lcd.height());
+        lcd.setCursor(0, 0);
+        M5.Log.printf("Devices: %zu\n", devices.size());
+        lcd.printf("Devices: %zu\n", devices.size());
+        uint32_t idx{};
+        for (auto&& u : devices) {
+            M5.Log.printf("[%2u]:UID:<%s> %s\n", idx, u.uidAsString().c_str(), u.typeAsString().c_str());
+            lcd.printf("[%2u]:UID:<%s> %s\n", idx, u.uidAsString().c_str(), u.typeAsString().c_str());
             ++idx;
         }
-        M5.Log.printf("<<--------------\n");
+        nfc_a.deactivate();
     }
-    m5::utility::delay(1);
 }

examples/UnitUnified/Dump/main/Dump.cpp

@@ -10,14 +10,19 @@
 #include <M5Unified.h>
 #include <M5UnitUnified.h>
 #include <M5UnitUnifiedRFID.h>
+#include <M5UnitUnifiedNFC.h>
+#include <M5Utility.h>
+#include <vector>
 
 namespace {
 auto& lcd = M5.Display;
 m5::unit::UnitUnified Units;
 m5::unit::UnitRFID2 unit;
+m5::unit::nfc::NFCLayerA nfc_a{unit};
+
 }  // namespace
 
-using namespace m5::rfid;
+using namespace m5::nfc::a;
 
 void setup()
 {
@@ -26,6 +31,7 @@ void setup()
     auto pin_num_sda = M5.getPin(m5::pin_name_t::port_a_sda);
     auto pin_num_scl = M5.getPin(m5::pin_name_t::port_a_scl);
     M5_LOGI("getPin: SDA:%u SCL:%u", pin_num_sda, pin_num_scl);
+    Wire.end();
     Wire.begin(pin_num_sda, pin_num_scl, 100 * 1000U);
 
     if (!Units.add(unit, Wire) || !Units.begin()) {
@@ -47,27 +53,31 @@ void setup()
     } else {
         lcd.setFont(&fonts::Font2);
     }
-    lcd.clear(0);
-    lcd.setCursor(8, 0);
-    lcd.printf("Please put the devices...");
-    M5_LOGI("Please put the devices...");
+    lcd.fillScreen(0);
+    lcd.setCursor(0, 0);
+    lcd.printf("Please put the device and click A");
+    M5.Log.printf("Please put the device and click A\n");
 }
 
 void loop()
 {
     M5.update();
-    Units.update();
     auto touch = M5.Touch.getDetail();
+    Units.update();
 
     if (M5.BtnA.wasClicked() || touch.wasClicked()) {
-        if (unit.detectDevice()) {
-            UID uid{};
-            if (unit.activateDevice(uid)) {
-                M5.Speaker.tone(1000, 20);
-                M5.Log.printf("UID:%s %s\n", uid.uidAsString().c_str(), uid.typeAsString().c_str());
-                unit.dumpDevice(uid);  // Using defaukt keyA if Classic
-                unit.deactivateDevice();
-            }
+        lcd.fillRect(0, lcd.fontHeight(), lcd.width(), lcd.height() - lcd.fontHeight());
+        std::vector<UID> devices;
+        if (nfc_a.detect(devices)) {
+            lcd.setCursor(0, lcd.fontHeight());
+            // If multiple occurrences are detected, only the first one detected
+            auto& uid = devices.front();
+            nfc_a.activate(uid);
+            M5.Log.printf("==== Dump %s %s ====\n", uid.uidAsString().c_str(), uid.typeAsString().c_str());
+            nfc_a.dump();
+            nfc_a.deactivate();
+        } else {
+            M5.Log.printf("No devices\n");
         }
     }
 }