Use capibaraZero's fork of Adafruit-PN532

Avoid PN532 hangs after polling stop without losing FeliCa and ATQA/SAK feature
CapibaraZero · Dec 28, 2024 · 89d5c36 · 89d5c36
1 parent 5790c84
commit 89d5c36
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,8 +22,6 @@ jobs:
           python-version: '3.12'
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
-      - name: Prepare PN532 libraries
-        run: bash init_nfc_libs.sh
       - name: Prepare release folder
         run: mkdir release
       - name: Build ESP32-S3-DevKitC

diff --git a/.gitignore b/.gitignore
@@ -7,10 +7,6 @@
 # VSCode Cmake stuff
 build
 
-# Seeed-Studio libs
-lib/PN532
-lib/PN532_I2C
-
 # MacOS useless file
 .DS_Store
 

diff --git a/include/boards/arduino_nano_esp32/pins.h b/include/boards/arduino_nano_esp32/pins.h
@@ -51,6 +51,8 @@
 // PN532(NFC)
 #define PN532_SCL A6
 #define PN532_SDA A7
+#define PN532_RST -1
+#define PN532_IRQ -1
 
 #define BATTERY_MONITOR A0
 

diff --git a/include/boards/esp32_s3_devkitc/pins.h b/include/boards/esp32_s3_devkitc/pins.h
@@ -49,6 +49,8 @@
 
 #define PN532_SDA 8
 #define PN532_SCL 9
+#define PN532_RST -1
+#define PN532_IRQ -1
 
 #define BATTERY_MONITOR 2
 

diff --git a/include/boards/lilygo_t_embed_cc1101/pins.h b/include/boards/lilygo_t_embed_cc1101/pins.h
@@ -56,8 +56,8 @@
 // PN532(NFC)
 #define NFC_BUS_SCL 18
 #define NFC_BUS_SDA 8
-#define NFC_RST 45
-#define NFC_IRQ 17
+#define PN532_RST 45
+#define PN532_IRQ 17
 
 #define BOARD_PWR_EN 15
 #define BQ27220_BATTERY

diff --git a/init_nfc_libs.sh b/init_nfc_libs.sh
diff --git a/lib/Peripherals/boards/lilygo_t_embed_cc1101/Peripherals_Lilygo_t_embed_cc1101.hpp b/lib/Peripherals/boards/lilygo_t_embed_cc1101/Peripherals_Lilygo_t_embed_cc1101.hpp
@@ -69,9 +69,9 @@ class Peripherals_Lilygo_t_embed_cc1101 : public Peripherals {
     digitalWrite(BOARD_PWR_EN, HIGH);  // Power on CC1101 an
 
     // NFC
-    pinMode(NFC_RST, OUTPUT);
-    digitalWrite(NFC_RST, HIGH);
-    pinMode(NFC_IRQ, OPEN_DRAIN);
+    pinMode(PN532_RST, OUTPUT);
+    digitalWrite(PN532_RST, HIGH);
+    pinMode(PN532_IRQ, OPEN_DRAIN);
   };
   void init_sd() {
     common_init_sd(SD_CARD_SCK, SD_CARD_MISO, SD_CARD_MOSI, SD_CARD_CS);

diff --git a/lib/nfc_attacks/nfc_attacks.hpp b/lib/nfc_attacks/nfc_attacks.hpp
@@ -18,7 +18,7 @@
 #ifndef NFC_ATTACKS_H
 #define NFC_ATTACKS_H
 #include <stdint.h>
-
+#include "../../include/pins.h"
 typedef struct SectorResult {
   uint8_t uid[7];
   uint8_t uid_len = 0;
@@ -34,7 +34,7 @@ typedef struct SectorResult {
 
 class NFCAttacks {
  private:
-  NFCFramework nfc_framework = NFCFramework();
+  NFCFramework nfc_framework = NFCFramework(PN532_IRQ, PN532_RST);
   bool is_there_null_blocks(NFCTag *tag);
   NFCTag *current_tag = (NFCTag *)malloc(sizeof(NFCTag));
   uint8_t tried_keys = 0;
@@ -49,6 +49,7 @@ class NFCAttacks {
  public:
   NFCAttacks(/* args */);
   ~NFCAttacks() {};
+  bool begin();
   void power_down() {nfc_framework.power_down();};
   bool bruteforce();
   void read_uid(uint8_t *uid, uint8_t *uid_length);