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

update rfid code and CR95 lib

Browse Source
This commit is contained in:
willem
2021-10-28 16:58:03 +02:00
parent e0ddf27e9b
commit 76f2ad2dc6
6 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,17 @@
#include "rfid.h"
// uint8_t cardsToCheck[] = {TRACK_NFCTYPE1,
// TRACK_NFCTYPE2,
// TRACK_NFCTYPE3,
// TRACK_NFCTYPE4A,
// TRACK_NFCTYPE4B,
// TRACK_NFCTYPE5};
uint8_t cardsToCheck[] = {TRACK_NFCTYPE1,
TRACK_NFCTYPE2,
TRACK_NFCTYPE3,
TRACK_NFCTYPE4A,
TRACK_NFCTYPE4B,
TRACK_NFCTYPE5};
// uint8_t currentCardIdx = 0;
// uint8_t maxCardIdx = sizeof(cardsToCheck);
uint8_t currentCardIdx = 0;
uint8_t maxCardIdx = sizeof(cardsToCheck);
uint32_t last_rfid_update = 0;
CR95HF reader(NFC_SS, NFC_SCK, NFC_MOSI, NFC_MISO, NFC_IRQ);
//CR95HF reader(NFC_SS, NFC_SCK, NFC_MOSI, NFC_MISO, NFC_IRQ);
//*****************************************************************************************//
void initRfid()
@@ -19,8 +19,8 @@ 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);
//ConfigManager_HWInit(NFC_SCK, NFC_MISO, NFC_MOSI, NFC_SS, NFC_IRQ);
reader.begin();
ConfigManager_HWInit(NFC_SCK, NFC_MISO, NFC_MOSI, NFC_SS, NFC_IRQ);
//reader.begin();
Serial.println(F("rfid init done")); //shows in serial that it is ready to read
}
@@ -31,12 +31,13 @@ void handleRfid()
if (timeNow - last_rfid_update > RFIDINTERVAL)
{
String id = reader.getID();
if (id != "")
Serial.printf("rfid: reading card type index %d\n",currentCardIdx);
uint8_t TagType = ConfigManager_TagHunting(cardsToCheck[currentCardIdx++]);
if(currentCardIdx > maxCardIdx)
{
Serial.println(id);
currentCardIdx = 0;
}
Serial.printf("rfid: read card returned %d\n",TagType);
last_rfid_update = timeNow;
}
}