Merge pull request BruceDevices#1586 from lshaf/feature/nfc/u250826

❤️‍🔥 add I2C PN532 on top of M5STICK

Author: pr3y

boards/m5stack-cplus1_1/pins_arduino.h

@@ -4,6 +4,7 @@
 #include <stdint.h>
 
 #define HAS_3_BUTTONS
+#define M5STICK
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;

boards/m5stack-cplus2/pins_arduino.h

@@ -4,6 +4,7 @@
 #include <stdint.h>
 
 #define HAS_3_BUTTONS
+#define M5STICK
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;

src/core/config.cpp

@@ -713,7 +713,7 @@ void BruceConfig::setRfidModule(RFIDModules value) {
 
 void BruceConfig::validateRfidModuleValue() {
     if (rfidModule != M5_RFID2_MODULE && rfidModule != PN532_I2C_MODULE && rfidModule != PN532_SPI_MODULE &&
-        rfidModule != RC522_SPI_MODULE) {
+        rfidModule != RC522_SPI_MODULE && rfidModule != PN532_I2C_SPI_MODULE) {
         rfidModule = M5_RFID2_MODULE;
     }
 }

src/core/config.h

@@ -14,6 +14,7 @@ enum RFIDModules {
     PN532_SPI_MODULE = 2,
     RC522_SPI_MODULE = 3,
     ST25R3916_SPI_MODULE = 4,
+    PN532_I2C_SPI_MODULE = 5
 };
 
 enum RFModules {

src/core/menu_items/RFIDMenu.cpp

@@ -29,7 +29,12 @@ void RFIDMenu::optionsMenu() {
 
     String txt = "RFID";
     if (bruceConfig.rfidModule == M5_RFID2_MODULE) txt += " (RFID2)";
+#ifdef M5STICK
+    else if (bruceConfig.rfidModule == PN532_I2C_MODULE) txt += " (PN532-G33)";
+    else if (bruceConfig.rfidModule == PN532_I2C_SPI_MODULE) txt += " (PN532-G36)";
+#else
     else if (bruceConfig.rfidModule == PN532_I2C_MODULE) txt += " (PN532-I2C)";
+#endif
     else if (bruceConfig.rfidModule == PN532_SPI_MODULE) txt += " (PN532-SPI)";
     else if (bruceConfig.rfidModule == RC522_SPI_MODULE) txt += " (RC522-SPI)";
     loopOptions(options, MENU_TYPE_SUBMENU, txt.c_str());

src/core/settings.cpp

@@ -592,16 +592,25 @@ void setRFIDModuleMenu() {
     options = {
         {"M5 RFID2",
          [=]() { bruceConfig.setRfidModule(M5_RFID2_MODULE); },
-         bruceConfig.rfidModule == M5_RFID2_MODULE },
+         bruceConfig.rfidModule == M5_RFID2_MODULE     },
+#ifdef M5STICK
+        {"PN532 I2C G33",
+         [=]() { bruceConfig.setRfidModule(PN532_I2C_MODULE); },
+         bruceConfig.rfidModule == PN532_I2C_MODULE    },
+        {"PN532 I2C G36",
+         [=]() { bruceConfig.setRfidModule(PN532_I2C_SPI_MODULE); },
+         bruceConfig.rfidModule == PN532_I2C_SPI_MODULE},
+#else
         {"PN532 on I2C",
          [=]() { bruceConfig.setRfidModule(PN532_I2C_MODULE); },
          bruceConfig.rfidModule == PN532_I2C_MODULE},
+#endif
         {"PN532 on SPI",
          [=]() { bruceConfig.setRfidModule(PN532_SPI_MODULE); },
-         bruceConfig.rfidModule == PN532_SPI_MODULE},
+         bruceConfig.rfidModule == PN532_SPI_MODULE    },
         {"RC522 on SPI",
          [=]() { bruceConfig.setRfidModule(RC522_SPI_MODULE); },
-         bruceConfig.rfidModule == RC522_SPI_MODULE},
+         bruceConfig.rfidModule == RC522_SPI_MODULE    },
     };
     loopOptions(options, bruceConfig.rfidModule);
 }

src/modules/rfid/PN532.cpp

@@ -12,14 +12,37 @@
 #include "core/sd_functions.h"
 #include "core/type_convertion.h"
 
-PN532::PN532(bool use_i2c) {
-    _use_i2c = use_i2c;
-    if (use_i2c) nfc.setInterface(GROVE_SDA, GROVE_SCL);
+#ifndef GPIO_NUM_25
+#define GPIO_NUM_25 25
+#endif
+
+PN532::PN532(CONNECTION_TYPE connection_type) {
+    _connection_type = connection_type;
+    _use_i2c = (connection_type == I2C || connection_type == I2C_SPI);
+    if (connection_type == CONNECTION_TYPE::I2C) nfc.setInterface(GROVE_SDA, GROVE_SCL);
+#ifdef M5STICK
+    else if (connection_type == CONNECTION_TYPE::I2C_SPI) nfc.setInterface(GPIO_NUM_26, GPIO_NUM_25);
+#endif
     else nfc.setInterface(SPI_SCK_PIN, SPI_MISO_PIN, SPI_MOSI_PIN, SPI_SS_PIN);
 }
 
 bool PN532::begin() {
-    bool i2c_check = check_i2c_address(PN532_I2C_ADDRESS);
+#ifdef M5STICK
+    if (_connection_type == CONNECTION_TYPE::I2C_SPI) {
+        Wire.begin(GPIO_NUM_26, GPIO_NUM_25);
+    } else if (_connection_type == CONNECTION_TYPE::I2C) {
+        Wire.begin(GROVE_SDA, GROVE_SCL);
+    }
+#else
+    Wire.begin(GROVE_SDA, GROVE_SCL);
+#endif
+
+    bool i2c_check = true;
+    if (_use_i2c) {
+        Wire.beginTransmission(PN532_I2C_ADDRESS);
+        int error = Wire.endTransmission();
+        i2c_check = (error == 0);
+    }
 
     nfc.begin();
 

src/modules/rfid/PN532.h

@@ -11,6 +11,7 @@
 
 class PN532 : public RFIDInterface {
 public:
+    enum CONNECTION_TYPE { I2C = 1, I2C_SPI = 2, SPI = 3 };
     enum PICC_Type {
         PICC_TYPE_MIFARE_MINI = 0x09, // MIFARE Classic protocol, 320 bytes
         PICC_TYPE_MIFARE_1K = 0x08,   // MIFARE Classic protocol, 1KB
@@ -30,7 +31,7 @@ class PN532 : public RFIDInterface {
     /////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     /////////////////////////////////////////////////////////////////////////////////////
-    PN532(bool use_i2c = true);
+    PN532(CONNECTION_TYPE connection_type = I2C);
 
     /////////////////////////////////////////////////////////////////////////////////////
     // Life Cycle
@@ -50,6 +51,7 @@ class PN532 : public RFIDInterface {
 
 private:
     bool _use_i2c;
+    CONNECTION_TYPE _connection_type;
 
     /////////////////////////////////////////////////////////////////////////////////////
     // Converters

src/modules/rfid/tag_o_matic.cpp

@@ -40,8 +40,11 @@ TagOMatic::~TagOMatic() {
 
 void TagOMatic::set_rfid_module() {
     switch (bruceConfig.rfidModule) {
-        case PN532_I2C_MODULE: _rfid = new PN532(); break;
-        case PN532_SPI_MODULE: _rfid = new PN532(false); break;
+        case PN532_I2C_MODULE: _rfid = new PN532(PN532::CONNECTION_TYPE::I2C); break;
+#ifdef M5STICK
+        case PN532_I2C_SPI_MODULE: _rfid = new PN532(PN532::CONNECTION_TYPE::I2C_SPI); break;
+#endif
+        case PN532_SPI_MODULE: _rfid = new PN532(PN532::CONNECTION_TYPE::SPI); break;
         case RC522_SPI_MODULE: _rfid = new RFID2(false); break;
         case M5_RFID2_MODULE:
         default: _rfid = new RFID2(); break;