fabian/esmp3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RFID reading now includes RFID data, enabling you to save additional data (still to come...) to the rfid card.

Browse Source
This commit is contained in:
Fabian Schlenz 2019-11-14 06:48:21 +01:00
parent b32f7d1228
commit 15f6d78128
2 changed files with 78 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/controller.h
View File

@ -17,6 +17,8 @@ private:
void _check_buttons(); void _check_buttons();
bool _debounce_button(uint8_t index); bool _debounce_button(uint8_t index);
uint32_t _get_rfid_card_uid(); uint32_t _get_rfid_card_uid();
String _read_rfid_data();
bool _rfid_present = false;
uint32_t _last_rfid_card_uid = 0; uint32_t _last_rfid_card_uid = 0;
uint8_t _no_rfid_card_count = 0; uint8_t _no_rfid_card_count = 0;
Player* _player; Player* _player;

69
src/controller.cpp
View File

@ -59,11 +59,28 @@ uint32_t Controller::_get_rfid_card_uid() {
} }
void Controller::_check_rfid() { void Controller::_check_rfid() {
MFRC522::StatusCode status;
if (_rfid_present) {
byte buffer[2];
byte buffer_size = 2;
_spi->select_rc522();
status = _rfid->PICC_WakeupA(buffer, &buffer_size);
if (status == MFRC522::STATUS_OK) {
// Card is still present.
_rfid->PICC_HaltA();
_spi->select_rc522(false);
return;
}
_spi->select_rc522(false);
// Card is now gone
_rfid_present = false;
INFO("No more RFID card.\n");
_player->stop();
} else {
uint32_t uid = _get_rfid_card_uid(); uint32_t uid = _get_rfid_card_uid();
if (uid != _last_rfid_card_uid) {
if (uid > 0) { if (uid > 0) {
_mqtt_client->publish_rfid_uid(uid); _mqtt_client->publish_rfid_uid(uid);
_no_rfid_card_count = 0; //_no_rfid_card_count = 0;
String temp = String(uid, HEX); String temp = String(uid, HEX);
String s_uid = ""; String s_uid = "";
for (int i=0; i<(8-temp.length()); i++) { for (int i=0; i<(8-temp.length()); i++) {
@ -71,16 +88,29 @@ void Controller::_check_rfid() {
} }
s_uid.concat(temp); s_uid.concat(temp);
INFO("New RFID card uid: %s\n", s_uid.c_str()); INFO("New RFID card uid: %s\n", s_uid.c_str());
_rfid_present = true;
String data = _read_rfid_data();
_player->play_id(s_uid); _player->play_id(s_uid);
}
}
}
String Controller::_read_rfid_data() {
DEBUG("Trying to read RFID data...");
_spi->select_rc522(); _spi->select_rc522();
DEBUG("Trying to read RFID data...\n");
String data = ""; String data = "";
MFRC522::MIFARE_Key key; MFRC522::MIFARE_Key key;
for (int i=0; i<6; i++) key.keyByte[i]=0xFF; key.keyByte[0] = 0xD3;
key.keyByte[1] = 0xF7;
key.keyByte[2] = 0xD3;
key.keyByte[3] = 0xF7;
key.keyByte[4] = 0xD3;
key.keyByte[5] = 0xF7;
MFRC522::PICC_Type type = _rfid->PICC_GetType(_rfid->uid.sak); MFRC522::PICC_Type type = _rfid->PICC_GetType(_rfid->uid.sak);
MFRC522::StatusCode status;
uint8_t sectors = 0; uint8_t sectors = 0;
switch(type) { switch(type) {
case MFRC522::PICC_TYPE_MIFARE_MINI: sectors = 5; break; case MFRC522::PICC_TYPE_MIFARE_MINI: sectors = 5; break;
@ -89,47 +119,36 @@ void Controller::_check_rfid() {
default: INFO("Unknown PICC type %s\n", String(MFRC522::PICC_GetTypeName(type)).c_str()); default: INFO("Unknown PICC type %s\n", String(MFRC522::PICC_GetTypeName(type)).c_str());
} }
for (uint8_t sector=0; sector<sectors; sector++) { for (uint8_t sector=1; sector<sectors; sector++) {
uint8_t blocks = (sector < 32) ? 4 : 16; uint8_t blocks = (sector < 32) ? 4 : 16;
uint8_t block_offset = (sector < 32) ? sector * 4 : 128 + (sector - 32) * 16; uint8_t block_offset = (sector < 32) ? sector * 4 : 128 + (sector - 32) * 16;
MFRC522::StatusCode status;
status = _rfid->PCD_Authenticate(MFRC522::PICC_CMD_MF_AUTH_KEY_A, block_offset, &key, &_rfid->uid); status = _rfid->PCD_Authenticate(MFRC522::PICC_CMD_MF_AUTH_KEY_A, block_offset, &key, &_rfid->uid);
if (status != MFRC522::STATUS_OK) { if (status != MFRC522::STATUS_OK) {
DEBUG("PCD_Authenticate() failed: %s\n", String(_rfid->GetStatusCodeName(status)).c_str()); DEBUG("PCD_Authenticate() for sector %d failed: %s\n", sector, String(_rfid->GetStatusCodeName(status)).c_str());
continue; continue;
} }
for (uint8_t block=0; block<blocks-1; block++) { for (uint8_t block=0; block<blocks-1; block++) {
byte buffer[16]; byte buffer[18];
uint8_t byte_count = 16; uint8_t byte_count = 18;
status = _rfid->MIFARE_Read(block_offset + block, buffer, &byte_count); status = _rfid->MIFARE_Read(block_offset + block, buffer, &byte_count);
if (status != MFRC522::STATUS_OK) { if (status != MFRC522::STATUS_OK) {
DEBUG("MIFARE_Read() failed: %s\n", String(_rfid->GetStatusCodeName(status)).c_str()); DEBUG("MIFARE_Read() failed: %s\n", String(_rfid->GetStatusCodeName(status)).c_str());
continue; continue;
} }
for (int i=0; i<16; i++) { for (int i=0; i<16; i++) {
if (buffer[i]!=0x00) data.concat(buffer[i]); if (buffer[i]>=0x20 && buffer[i]<0x7F) data.concat((char)buffer[i]);
} }
} }
} }
_rfid->PICC_HaltA(); _rfid->PICC_HaltA();
_rfid->PCD_StopCrypto1(); _rfid->PCD_StopCrypto1();
_spi->select_rc522(false);
DEBUG("Data from RFID: %s", data.c_str()); DEBUG("Data from RFID: %s", data.c_str());
_spi->select_rc522(false);
} else { return data;
if (_no_rfid_card_count >= 1) {
INFO("No more RFID card.\n");
_player->stop();
} else {
_no_rfid_card_count++;
return;
}
}
_last_rfid_card_uid = uid;
}
} }
void Controller::_check_serial() { void Controller::_check_serial() {