projects_leo/muziekdoos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert to PN532

Browse Source
This commit is contained in:
willem
2021-11-21 18:20:46 +01:00
parent 884edd8713
commit 28b1514f0b
2 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
FW/leo_muziekdoos_esp32/src/rfid.cpp
View File

@@ -1,44 +1,26 @@
#include "rfid.h" #include "rfid.h"
uint8_t cardsToCheck[] = {TRACK_NFCTYPE1,
TRACK_NFCTYPE2,
TRACK_NFCTYPE3,
TRACK_NFCTYPE4A,
TRACK_NFCTYPE4B,
TRACK_NFCTYPE5};
uint8_t currentCardIdx = 0; PN532_SPI pn532spi(SPI, NFC_SS, NFC_SCK, NFC_MISO, NFC_MOSI);
uint8_t maxCardIdx = sizeof(cardsToCheck); NfcAdapter nfc = NfcAdapter(pn532spi);
uint32_t last_rfid_update = 0;
//CR95HF reader(NFC_SS, NFC_SCK, NFC_MOSI, NFC_MISO, NFC_IRQ);
//*****************************************************************************************// //*****************************************************************************************//
void initRfid() void initRfid()
{ {
Serial.println(F("rfid init")); //shows in serial that it is ready to read
//int8_t sck=-1, int8_t miso=-1, int8_t mosi=-1, int8_t ss=-1); //int8_t sck=-1, int8_t miso=-1, int8_t mosi=-1, int8_t ss=-1);
ConfigManager_HWInit(NFC_SCK, NFC_MISO, NFC_MOSI, NFC_SS, NFC_IRQ); nfc.begin(true);
//reader.begin();
Serial.println(F("rfid init done")); //shows in serial that it is ready to read Serial.println(F("rfid init done")); //shows in serial that it is ready to read
} }
//*****************************************************************************************// //*****************************************************************************************//
void handleRfid() void handleRfid()
{ {
uint32_t timeNow = millis(); if (nfc.tagPresent())
if (timeNow - last_rfid_update > RFIDINTERVAL)
{ {
Serial.printf("rfid: reading card type index %d\n",currentCardIdx); NfcTag tag = nfc.read();
uint8_t TagType = ConfigManager_TagHunting(cardsToCheck[currentCardIdx++]); String uid = tag.getUidString();
if(currentCardIdx > maxCardIdx) Serial.println(uid);
{
currentCardIdx = 0;
}
Serial.printf("rfid: read card returned %d\n",TagType);
last_rfid_update = timeNow;
} }
} }
//*****************************************************************************************// //*****************************************************************************************//

21
FW/leo_muziekdoos_esp32/src/rfid.h
View File

@@ -1,24 +1,13 @@
#pragma once #pragma once
#include "board.h" #include "board.h"
#include "Arduino.h"
#include "SerialDebug.h"
#include "lib_NDEF_URI.h"
#include "lib_NDEF_SMS.h"
#include "lib_NDEF_Text.h"
#include "lib_NDEF_Email.h"
#include "lib_NDEF_Geo.h"
#include "lib_95HFConfigManager.h"
#include "miscellaneous.h"
#include "lib_95HFConfigManager.h"
#include "lib_wrapper.h"
#include "lib_NDEF_URI.h"
#include "drv_spi.h"
//#include "CR95HF.h" #include <SPI.h>
#include "PN532_SPI.h"
#define RFIDINTERVAL 200 #include "PN532.h"
#include "NfcAdapter.h"
#define NDEF_SUPPORT_MIFARE_CLASSIC
void initRfid(void); void initRfid(void);
void handleRfid(void); void handleRfid(void);