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

update game and rfid

Browse Source
This commit is contained in:
willem
2021-10-18 17:29:11 +02:00
parent 684688da7b
commit 501e73b119
14 changed files with 2143 additions and 1621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FW/leo_muziekdoos_esp32/src/game.cpp
View File

@@ -47,11 +47,11 @@ void handleGame(void)
hall_idle_count--;
}
}
// debugD("HallSensor: val=%d, delta=%d, count=%d, idle=%s\n",
// hall_sample,
// hall_delta,
// hall_idle_count,
// (hall_is_Idle? "yes":"no"));
debugD("HallSensor: val=%d, delta=%d, count=%d, idle=%s\n",
hall_sample,
hall_delta,
hall_idle_count,
(hall_is_Idle? "yes":"no"));
last_hall_sample = hall_sample;
last_hall_read = timeNow;
}

6
FW/leo_muziekdoos_esp32/src/game.h
View File

@@ -4,9 +4,9 @@
#include "board.h"
#include "SerialDebug.h"
#define HALLINTERVAL 200
#define HALLIDLETHRESHOLD 6
#define HALLIDLESAMPLES 2
#define HALLINTERVAL 100
#define HALLIDLETHRESHOLD 3
#define HALLIDLESAMPLES 3
void initGame(void);
void handleGame(void);

2
FW/leo_muziekdoos_esp32/src/main.cpp
View File

@@ -19,7 +19,7 @@ void setup()
initStorage();
initConfig();
initAudio();
initRfid();
//initRfid();
initGame();

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

@@ -1,31 +1,44 @@
#include "rfid.h"
// uint8_t cardsToCheck[] = {TRACK_NFCTYPE1,
// TRACK_NFCTYPE2,
// TRACK_NFCTYPE3,
// TRACK_NFCTYPE4A,
// TRACK_NFCTYPE4B,
// TRACK_NFCTYPE5};
// 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);
//*****************************************************************************************//
void initRfid()
{
printlnI(F("rfid init")); //shows in serial that it is ready to read
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);
printlnI(F("rfid init done")); //shows in serial that it is ready to read
//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
}
//*****************************************************************************************//
void handleRfid()
{
uint32_t timeNow = millis();
int8_t TagType = TRACK_NOTHING;
//int8_t TagType = TRACK_NOTHING;
if(timeNow - last_rfid_update > RFIDINTERVAL)
if (timeNow - last_rfid_update > RFIDINTERVAL)
{
Serial.printf("rfid: tagreader start\n");
TagType = ConfigManager_TagHunting(TRACK_ALL);
Serial.printf("rfid: tagreader done: %d\n",TagType);
String id = reader.getID();
if (id != "")
{
Serial.println(id);
}
last_rfid_update = timeNow;
}
}
//*****************************************************************************************//

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

@@ -4,13 +4,16 @@
#include "Arduino.h"
#include "SerialDebug.h"
#include <SPI.h>
#include "lib_95HFConfigManager.h"
#include "drv_spi.h"
#include "lib_wrapper.h"
#include "miscellaneous.h"
// #include <SPI.h>
// #include "lib_95HFConfigManager.h"
// #include "drv_spi.h"
// #include "lib_wrapper.h"
// #include "miscellaneous.h"
#include "CR95HF.h"
#define RFIDINTERVAL 200
void initRfid(void);
void handleRfid(void);