Merge branch 'develop'

Author: GOB52

.github/workflows/arduino-esp-v2-build-check.yml

@@ -59,6 +59,7 @@ jobs:
 
         nfctype:
           - NFCA
+          - NFCB
 
         sketch:
           - Detect
@@ -85,7 +86,7 @@ jobs:
           - esp32
 
         include:
-          # Specific sketches
+          # Specific sketches (NFCA, USING_UNIT_RFID2, Core only)
           - sketch: Dump
             nfctype: NFCA
             platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
@@ -118,6 +119,15 @@ jobs:
             platform-version: 2.0.17
             board: m5stack-core-esp32
             build-properties: "-DUSING_UNIT_RFID2"
+          # JapanIDCard (NFCB, USING_UNIT_RFID2, Core only)
+          - sketch: JapanIDCard
+            nfctype: NFCB
+            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+            platform: esp32
+            archi: esp32
+            platform-version: 2.0.17
+            board: m5stack-core-esp32
+            build-properties: "-DUSING_UNIT_RFID2"
 
     steps:
       - name: Checkout

.github/workflows/arduino-esp-v3-build-check.yml

@@ -59,6 +59,7 @@ jobs:
 
         nfctype:
           - NFCA
+          - NFCB
 
         sketch:
           - Detect
@@ -96,7 +97,7 @@ jobs:
           - esp32
 
         include:
-          # Specific sketches
+          # Specific sketches (NFCA, USING_UNIT_RFID2, Core only)
           - sketch: Dump
             nfctype: NFCA
             platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
@@ -129,6 +130,24 @@ jobs:
             platform-version: 3.3.6
             board: m5stack_core
             build-properties: "-DUSING_UNIT_RFID2"
+          # Detect on M5Dial with builtin WS1850S (NFCA, USING_M5DIAL_BUILTIN_WS1850S)
+          - sketch: Detect
+            nfctype: NFCA
+            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+            platform: esp32
+            archi: esp32
+            platform-version: 3.3.6
+            board: m5stack_dial
+            build-properties: "-DUSING_M5DIAL_BUILTIN_WS1850S"
+          # JapanIDCard (NFCB, USING_UNIT_RFID2, Core only)
+          - sketch: JapanIDCard
+            nfctype: NFCB
+            platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+            platform: esp32
+            archi: esp32
+            platform-version: 3.3.6
+            board: m5stack_core
+            build-properties: "-DUSING_UNIT_RFID2"
 
     steps:
       - name: Checkout

.github/workflows/arduino-m5-build-check.yml

@@ -59,6 +59,7 @@ jobs:
 
         nfctype:
           - NFCA
+          - NFCB
 
         sketch:
           - Detect
@@ -100,7 +101,7 @@ jobs:
           - esp32
 
         include:
-          # Specific sketches
+          # Specific sketches (NFCA, USING_UNIT_RFID2, Core only)
           - sketch: Dump
             nfctype: NFCA
             platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
@@ -133,6 +134,24 @@ jobs:
             platform-version: 3.2.5
             board: m5stack_core
             build-properties: "-DUSING_UNIT_RFID2"
+          # Detect on M5Dial with builtin WS1850S (NFCA, USING_M5DIAL_BUILTIN_WS1850S)
+          - sketch: Detect
+            nfctype: NFCA
+            platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
+            platform: m5stack
+            archi: esp32
+            platform-version: 3.2.5
+            board: m5stack_dial
+            build-properties: "-DUSING_M5DIAL_BUILTIN_WS1850S"
+          # JapanIDCard (NFCB, USING_UNIT_RFID2, Core only)
+          - sketch: JapanIDCard
+            nfctype: NFCB
+            platform-url: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
+            platform: m5stack
+            archi: esp32
+            platform-version: 3.2.5
+            board: m5stack_core
+            build-properties: "-DUSING_UNIT_RFID2"
 
     steps:
       - name: Checkout

.github/workflows/platformio-build-check.yml

@@ -55,6 +55,7 @@ jobs:
       matrix:
         example:
           - NFCA_Detect
+          - NFCB_Detect
 
         board:
           - Core
@@ -83,7 +84,7 @@ jobs:
           - latest
 
         include:
-          # Specific sketches
+          # NFCA Specific sketches (Core only)
           - example: NFCA_Dump
             board: Core
             framework: Arduino
@@ -100,6 +101,16 @@ jobs:
             board: Core
             framework: Arduino
             espressif32: latest
+          # NFCA Detect on M5Dial with builtin WS1850S
+          - example: NFCA_Detect
+            board: Dial_Builtin
+            framework: Arduino
+            espressif32: latest
+          # NFCB JapanIDCard (Core only)
+          - example: NFCB_JapanIDCard
+            board: Core
+            framework: Arduino
+            espressif32: latest
 
     steps:
       - name: Checkout

README.md

@@ -49,10 +49,20 @@ Support may be expanded in future updates to cover PICCs not listed here.
 
 - \*1 MIFARE Plus SL3 operation has issues.
 
+### NFC-B
+
+**Available on UnitRFID2 (WS1850S) only.** UnitRFID (MFRC522) does NOT support NFC-B.
+
+| PICC Type | NFC Forum Tag (NDEF) | Detect | Identify | Raw R/W | Notes |
+|---|---|---|---|---|---|
+| Unclassified | None | Yes | Partial | Yes | ISO-DEP transport only |
+
+> **Note:** NFC-B is **not supported on the M5Dial builtin WS1850S**. The builtin small loop antenna cannot generate sufficient RF field for Type B PICC activation (Type B uses 10% ASK + BPSK subcarrier which is more sensitive to field strength and SNR than Type A). NFC-B requires the external **UnitRFID2** (with larger antenna).
+
 
 ## Emulation
 
-Emulation is **NOT** supported on Unit-RFID.
+Emulation is **NOT** supported on UnitRFID and UnitRFID2.
 
 ## Known Issues
 
@@ -84,14 +94,17 @@ Use **QWIIC port (port_a)** with a QWIIC-GROVE conversion cable instead.
 ## Examples
 See also [examples/UnitUnified](examples/UnitUnified)
 
+> **Note:** The examples in this library are imported from [M5Unit-NFC](https://github.com/m5stack/M5Unit-NFC) and shared between both libraries.
+> The same source file supports multiple units via `#define` switches.
+
 ### For ArduinoIDE
 Each example contains the following block to select the unit:
 
 ```cpp
 // For UnitNFC
 // #define USING_UNIT_NFC
 // For CapNFC
-// #define USING_HACKER_CAP
+// #define USING_CAP_CC1101
 // For UnitRFID2
 // #define USING_UNIT_RFID2
 ```
@@ -101,7 +114,7 @@ For this library, uncomment `USING_UNIT_RFID2`:
 
 ```cpp
 // #define USING_UNIT_NFC
-// #define USING_HACKER_CAP
+// #define USING_CAP_CC1101
 #define USING_UNIT_RFID2
 ```
 

examples/UnitUnified/NFCA/Detect/Detect.ino

@@ -9,14 +9,17 @@
   This example is shared with M5Unit-RFID
 */
 // *************************************************************
-// Choose one define symbol to match the unit you are using
+// Choose ONE define symbol to match the unit/board you are using
 // *************************************************************
-#if !defined(USING_UNIT_NFC) && !defined(USING_HACKER_CAP) && !defined(USING_UNIT_RFID2)
-// For UnitNFC
+#if !defined(USING_UNIT_NFC) && !defined(USING_CAP_CC1101) && !defined(USING_UNIT_RFID2) && \
+    !defined(USING_M5DIAL_BUILTIN_WS1850S)
+// For UnitNFC (ST25R3916, I2C)
 // #define USING_UNIT_NFC
-// For CapNFC
-// #define USING_HACKER_CAP
-// For UnitRFID2
+// For CapCC1101NFC (ST25R3916, SPI)
+// #define USING_CAP_CC1101
+// For UnitRFID2 (WS1850S external, I2C GROVE)
 // #define USING_UNIT_RFID2
+// For M5Dial Builtin WS1850S (internal I2C)
+// #define USING_M5DIAL_BUILTIN_WS1850S
 #endif
 #include "main/Detect.cpp"

examples/UnitUnified/NFCA/Detect/main/Detect.cpp

@@ -13,22 +13,24 @@
 #include <M5UnitUnifiedNFC.h>
 #include <M5Utility.h>
 #include <Wire.h>
-#include <M5HAL.hpp>  // For NessoN1
 #include <vector>
 
 // *************************************************************
-// Choose one define symbol to match the unit you are using
+// Choose ONE define symbol to match the unit/board you are using
 // *************************************************************
-#if !defined(USING_UNIT_NFC) && !defined(USING_HACKER_CAP) && !defined(USING_UNIT_RFID2)
-// For UnitNFC
+#if !defined(USING_UNIT_NFC) && !defined(USING_CAP_CC1101) && !defined(USING_UNIT_RFID2) && \
+    !defined(USING_M5DIAL_BUILTIN_WS1850S)
+// For UnitNFC (ST25R3916, I2C)
 // #define USING_UNIT_NFC
-// For CapNFC
-// #define USING_HACKER_CAP
-// For UnitRFID2
+// For CapCC1101NFC (ST25R3916, SPI)
+// #define USING_CAP_CC1101
+// For UnitRFID2 (WS1850S external, I2C GROVE)
 // #define USING_UNIT_RFID2
+// For M5Dial Builtin WS1850S (internal I2C)
+// #define USING_M5DIAL_BUILTIN_WS1850S
 #endif
 
-#if defined(USING_UNIT_RFID2)
+#if defined(USING_UNIT_RFID2) || defined(USING_M5DIAL_BUILTIN_WS1850S)
 #include <M5UnitUnifiedRFID.h>
 #endif
 
@@ -41,14 +43,17 @@ m5::unit::UnitUnified Units;
 #if defined(USING_UNIT_NFC)
 #pragma message "Choose UnitNFC"
 m5::unit::UnitNFC unit{};  // I2C
-#elif defined(USING_HACKER_CAP)
-#pragma message "Choose HackerCapNFC"
-m5::unit::HackerCapNFC unit{};  // HackerCap (SPI)
+#elif defined(USING_CAP_CC1101)
+#pragma message "Choose CapCC1101NFC"
+m5::unit::CapCC1101NFC unit{};  // CapCC1101 (SPI)
 #elif defined(USING_UNIT_RFID2)
 #pragma message "Choose UnitRFID2"
-m5::unit::UnitRFID2 unit{};  // UnitRFID2 (M5Unit-RFID)
+m5::unit::UnitRFID2 unit{};  // UnitRFID2 external (M5Unit-RFID, GROVE)
+#elif defined(USING_M5DIAL_BUILTIN_WS1850S)
+#pragma message "Choose UnitRFID2 (M5Dial Builtin)"
+m5::unit::UnitRFID2 unit{};  // M5Dial builtin WS1850S (internal I2C)
 #else
-#error Choose unit please!
+#error Choose ONE: USING_UNIT_NFC / USING_CAP_CC1101 / USING_UNIT_RFID2 / USING_M5DIAL_BUILTIN_WS1850S
 #endif
 m5::nfc::NFCLayerA nfc_a{unit};
 }  // namespace
@@ -63,25 +68,26 @@ void setup()
         lcd.setRotation(1);
     }
 
-#if defined(USING_UNIT_NFC) || defined(USING_UNIT_RFID2)
-    // NessoN1: Arduino Wire (I2C_NUM_0) cannot be used for GROVE port.
-    //   Wire is used by M5Unified In_I2C for internal devices.
-    //   Reconfiguring Wire to GROVE pins breaks In_I2C.
-    //   Solution: Use SoftwareI2C via M5HAL (bit-banging) for the GROVE port.
-    // NanoC6: Wire.begin() on GROVE pins conflicts with Ex_I2C on the same I2C_NUM_0.
-    //   Solution: Use M5.Ex_I2C directly instead of Arduino Wire.
-    auto board = M5.getBoard();
     bool unit_ready{};
+
 #if defined(USING_M5DIAL_BUILTIN_WS1850S)
+    // M5Dial builtin WS1850S: small loop antenna; reduce RxGain to 33dB to mitigate
+    // reflection interference (default 48dB causes unstable WUPA on Builtin).
+    {
+        auto cfg          = unit.config();
+        cfg.receiver_gain = m5::unit::mfrc522::ReceiverGain::dB33;
+        unit.config(cfg);
+    }
     // M5Dial builtin WS1850S on In_I2C (G12/G11, shared with RTC8563)
     M5_LOGI("Using M5.In_I2C for builtin WS1850S");
     unit_ready = Units.add(unit, M5.In_I2C) && Units.begin();
-#else
-    // NessoN1: port_b (GROVE) uses SoftwareI2C (M5HAL Bus) which causes I2C register
-    //          polling latency too high for MFRC522/WS1850S RF timing requirements.
-    //          Use QWIIC (port_a) with Wire instead. (Requires QWIIC-GROVE conversion cable)
-    if (board == m5::board_t::board_M5NanoC6) {
-        // NanoC6: Use M5.Ex_I2C (m5::I2C_Class, not Arduino Wire)
+
+#elif defined(USING_UNIT_NFC) || defined(USING_UNIT_RFID2)
+    // External I2C unit (GROVE port).
+    // NessoN1: Arduino Wire (I2C_NUM_0) cannot be used for GROVE port (used by In_I2C internals).
+    //   Use QWIIC (port_a) with Wire. (Requires QWIIC-GROVE conversion cable)
+    // NanoC6: Wire.begin() on GROVE pins conflicts with Ex_I2C on I2C_NUM_0; use M5.Ex_I2C directly.
+    if (M5.getBoard() == m5::board_t::board_M5NanoC6) {
         M5_LOGI("Using M5.Ex_I2C");
         unit_ready = Units.add(unit, M5.Ex_I2C) && Units.begin();
     } else {
@@ -92,32 +98,26 @@ void setup()
         Wire.begin(pin_num_sda, pin_num_scl, 400 * 1000U);
         unit_ready = Units.add(unit, Wire) && Units.begin();
     }
-#endif  // USING_M5DIAL_BUILTIN_WS1850S
-    if (!unit_ready) {
-        M5_LOGE("Failed to begin");
-        lcd.fillScreen(TFT_RED);
-        while (true) {
-            m5::utility::delay(10000);
-        }
-    }
-#elif defined(USING_HACKER_CAP)
+
+#elif defined(USING_CAP_CC1101)
     if (!SPI.bus()) {
         auto spi_sclk = M5.getPin(m5::pin_name_t::sd_spi_sclk);
         auto spi_mosi = M5.getPin(m5::pin_name_t::sd_spi_mosi);
         auto spi_miso = M5.getPin(m5::pin_name_t::sd_spi_miso);
         M5_LOGI("getPin: %d,%d,%d", spi_sclk, spi_mosi, spi_miso);
         SPI.begin(spi_sclk, spi_miso, spi_mosi /* SS is shared SD, CC1101, ST25R3916 */);
     }
-
     SPISettings settings = {10000000, MSBFIRST, SPI_MODE1};
-    if (!Units.add(unit, SPI, settings) || !Units.begin()) {
+    unit_ready           = Units.add(unit, SPI, settings) && Units.begin();
+#endif
+
+    if (!unit_ready) {
         M5_LOGE("Failed to begin");
         lcd.fillScreen(TFT_RED);
         while (true) {
             m5::utility::delay(10000);
         }
     }
-#endif
     M5_LOGI("M5UnitUnified initialized");
     M5_LOGI("%s", Units.debugInfo().c_str());
 
@@ -142,7 +142,8 @@ void loop()
             if (nfc_a.identify(u)) {
                 M5.Log.printf("PICC:%s %s %04X/%02X %u/%u\n", u.uidAsString().c_str(), u.typeAsString().c_str(), u.atqa,
                               u.sak, u.userAreaSize(), u.totalSize());
-                lcd.printf("[%2u]:PICC:<%s> %s\n", idx, u.uidAsString().c_str(), u.typeAsString().c_str());
+                lcd.printf("[%2u]:PICC:<%s> %s\n", static_cast<unsigned>(idx), u.uidAsString().c_str(),
+                           u.typeAsString().c_str());
                 ++idx;
             } else {
                 M5_LOGW("Failed to identify %s %s %04X/%02X %u/%u", u.uidAsString().c_str(), u.typeAsString().c_str(),

examples/UnitUnified/NFCA/Dump/Dump.ino

@@ -9,14 +9,17 @@
   This example is shared with M5Unit-RFID
 */
 // *************************************************************
-// Choose one define symbol to match the unit you are using
+// Choose ONE define symbol to match the unit/board you are using
 // *************************************************************
-#if !defined(USING_UNIT_NFC) && !defined(USING_HACKER_CAP) && !defined(USING_UNIT_RFID2)
-// For UnitNFC
+#if !defined(USING_UNIT_NFC) && !defined(USING_CAP_CC1101) && !defined(USING_UNIT_RFID2) && \
+    !defined(USING_M5DIAL_BUILTIN_WS1850S)
+// For UnitNFC (ST25R3916, I2C)
 // #define USING_UNIT_NFC
-// For CapNFC
-// #define USING_HACKER_CAP
-// For UnitRFID2
+// For CapCC1101NFC (ST25R3916, SPI)
+// #define USING_CAP_CC1101
+// For UnitRFID2 (WS1850S external, I2C GROVE)
 // #define USING_UNIT_RFID2
+// For M5Dial Builtin WS1850S (internal I2C)
+// #define USING_M5DIAL_BUILTIN_WS1850S
 #endif
 #include "main/Dump.cpp"