Daten von RFID-Karten (versuchen zu) lesen.
This commit is contained in:
parent
6ddf1efd62
commit
3272921db2
@ -17,7 +17,8 @@ class Controller {
|
||||
uint8_t button_pressed = 0;
|
||||
unsigned long button_pressed_since = 0;
|
||||
bool button_already_processed = false;
|
||||
|
||||
String read_rfid_data();
|
||||
|
||||
public:
|
||||
void handle();
|
||||
void next_track();
|
||||
|
@ -56,6 +56,9 @@ void Controller::handle_rfid() {
|
||||
s_uid.concat("0");
|
||||
}
|
||||
s_uid.concat(temp);
|
||||
|
||||
String data = read_rfid_data();
|
||||
|
||||
play(s_uid);
|
||||
}
|
||||
rfid->PICC_HaltA();
|
||||
@ -64,6 +67,66 @@ void Controller::handle_rfid() {
|
||||
}
|
||||
}
|
||||
|
||||
String Controller::read_rfid_data() {
|
||||
log_v("read_rfid_data() running...");
|
||||
static MFRC522::MIFARE_Key keys[8] = {
|
||||
{{0xd3, 0xf7, 0xd3, 0xf7, 0xd3, 0xf7}}, // D3 F7 D3 F7 D3 F7
|
||||
{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}, // FF FF FF FF FF FF = factory default
|
||||
{{0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5}}, // A0 A1 A2 A3 A4 A5
|
||||
{{0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5}}, // B0 B1 B2 B3 B4 B5
|
||||
{{0x4d, 0x3a, 0x99, 0xc3, 0x51, 0xdd}}, // 4D 3A 99 C3 51 DD
|
||||
{{0x1a, 0x98, 0x2c, 0x7e, 0x45, 0x9a}}, // 1A 98 2C 7E 45 9A
|
||||
{{0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}}, // AA BB CC DD EE FF
|
||||
{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00}} // 00 00 00 00 00 00
|
||||
};
|
||||
log_d("Trying to read RFID data...");
|
||||
|
||||
String data = "";
|
||||
MFRC522::PICC_Type type = rfid->PICC_GetType(rfid->uid.sak);
|
||||
|
||||
uint8_t sectors = 0;
|
||||
switch(type) {
|
||||
case MFRC522Constants::PICC_TYPE_MIFARE_MINI: sectors = 5; break;
|
||||
case MFRC522Constants::PICC_TYPE_MIFARE_1K: sectors = 16; break;
|
||||
case MFRC522Constants::PICC_TYPE_MIFARE_4K: sectors = 40; break;
|
||||
default: log_i("Unknown PICC type %s\n", String(MFRC522Debug::PICC_GetTypeName(type)).c_str());
|
||||
}
|
||||
sectors = 2; // Pretend we have only two sectors, so we read only sector #1.
|
||||
for (uint8_t sector=1; sector<sectors; sector++) {
|
||||
uint8_t blocks = (sector < 32) ? 4 : 16;
|
||||
uint8_t block_offset = (sector < 32) ? sector * 4 : 128 + (sector - 32) * 16;
|
||||
|
||||
MFRC522::StatusCode status;
|
||||
|
||||
for (int i=0; i<8; i++) {
|
||||
MFRC522::MIFARE_Key *k = &keys[i];
|
||||
log_v("Trying MIFARE key %02X %02X %02X %02X %02X %02X...\n", k->keyByte[0], k->keyByte[1], k->keyByte[2], k->keyByte[3], k->keyByte[4], k->keyByte[5]);
|
||||
status = rfid->PCD_Authenticate(MFRC522Constants::PICC_CMD_MF_AUTH_KEY_A, block_offset, k, &rfid->uid);
|
||||
if (status == MFRC522Constants::STATUS_OK) {
|
||||
log_v("Authentication succeeded with key #%d\n", i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (uint8_t block=0; block<blocks-1; block++) {
|
||||
byte buffer[18];
|
||||
uint8_t byte_count = 18;
|
||||
status = rfid->MIFARE_Read(block_offset + block, buffer, &byte_count);
|
||||
if (status != MFRC522Constants::STATUS_OK) {
|
||||
log_d("MIFARE_Read() failed: %s\n", String(MFRC522Debug::GetStatusCodeName(status)).c_str());
|
||||
continue;
|
||||
}
|
||||
for (int i=0; i<16; i++) {
|
||||
if (buffer[i]>=0x20 && buffer[i]<0x7F) data.concat((char)buffer[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//_rfid->PICC_HaltA();
|
||||
rfid->PCD_StopCrypto1();
|
||||
log_d("Data from RFID: %s\n", data.c_str());
|
||||
return data;
|
||||
}
|
||||
|
||||
void Controller::play(String rfid_id) {
|
||||
if (!rfid_id.equals(current_playlist.get_rfid_id())) {
|
||||
if (pm->has_playlist(rfid_id)) {
|
||||
|
Loading…
Reference in New Issue
Block a user