From 8518f17ab0283c548a588fc8d590ae270d96ac3e Mon Sep 17 00:00:00 2001
From: willem <willem@oldemans.nl>
Date: Mon, 11 Oct 2021 16:39:26 +0200
Subject: [PATCH] update rfid

---
 FW/leo_muziekdoos_esp32/src/rfid.cpp | 13 ++++---------
 FW/leo_muziekdoos_esp32/src/rfid.h   |  9 +++++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/FW/leo_muziekdoos_esp32/src/rfid.cpp b/FW/leo_muziekdoos_esp32/src/rfid.cpp
index 74a0e64..7a40073 100644
--- a/FW/leo_muziekdoos_esp32/src/rfid.cpp
+++ b/FW/leo_muziekdoos_esp32/src/rfid.cpp
@@ -1,26 +1,21 @@
 #include "rfid.h"
 
 
-PN532_SPI pn532spi(SPI, NFC_SS, NFC_SCK, NFC_MISO, NFC_MOSI);
-NfcAdapter nfc = NfcAdapter(pn532spi);
+//PN532_SPI pn532spi(SPI, NFC_SS, NFC_SCK, NFC_MISO, NFC_MOSI);
+
 
 //*****************************************************************************************//
 void initRfid()
 {
   //int8_t sck=-1, int8_t miso=-1, int8_t mosi=-1, int8_t ss=-1);
-  nfc.begin(true);
+  ConfigManager_HWInit(NFC_SCK, NFC_MISO, NFC_MOSI, NFC_SS);
   Serial.println(F("rfid init done")); //shows in serial that it is ready to read
 }
 
 //*****************************************************************************************//
 void handleRfid()
 {
-  if (nfc.tagPresent())
-  {
-    NfcTag tag = nfc.read();
-    String uid = tag.getUidString();
-    Serial.println(uid);
-  }
+
 }
 //*****************************************************************************************//
 
diff --git a/FW/leo_muziekdoos_esp32/src/rfid.h b/FW/leo_muziekdoos_esp32/src/rfid.h
index 3467247..0475ee4 100644
--- a/FW/leo_muziekdoos_esp32/src/rfid.h
+++ b/FW/leo_muziekdoos_esp32/src/rfid.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include "board.h"
+#include "Arduino.h"
 
 #include <SPI.h>
-#include "PN532_SPI.h"
-#include "PN532.h"
-#include "NfcAdapter.h"
+#include "lib_95HFConfigManager.h"
+#include "drv_spi.h"
+#include "lib_wrapper.h"
+#include "miscellaneous.h"
 
-#define NDEF_SUPPORT_MIFARE_CLASSIC
 
 void initRfid(void);
 void handleRfid(void);
\ No newline at end of file