sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-04-16 07:40:29 +01:00
Code Issues Releases Wiki Activity

Add missing function read_ntag_tag_

Browse Source
This commit is contained in:
Spencer Owen 2024-12-09 21:49:07 -07:00
parent 5b31c0404f
commit 59004bf569
No known key found for this signature in database
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
esphome/components/pn532/pn532.cpp
View File

@ -384,9 +384,9 @@ bool PN532::ntag2xx_read_page(uint8_t page_number, std::vector<uint8_t> &data) {
std::unique_ptr<nfc::NfcTag> PN532::read_tag_(std::vector<uint8_t> &uid) {
std::vector<uint8_t> first_page(16); // 4 pages, 4 bytes each
for (uint8_t i = 0; i < 4; i++) {
uint8_t page_data[4];
std::vector<uint8_t> page_data(4);
if (this->ntag2xx_read_page(i, page_data)) {
std::copy(page_data, page_data + 4, first_page.begin() + i * 4);
first_page.insert(first_page.begin() + i * 4, page_data.begin(), page_data.end());
} else {
ESP_LOGE(TAG, "Failed to read page %d", i);
return make_unique<nfc::NfcTag>(uid);
@ -418,6 +418,63 @@ std::unique_ptr<nfc::NfcTag> PN532::read_tag_(std::vector<uint8_t> &uid) {
}
}
std::unique_ptr<nfc::NfcTag> PN532::read_ntag_tag_(std::vector<uint8_t> &uid, uint8_t tag_type) {
std::vector<uint8_t> data(4);
uint8_t max_page;
switch (tag_type) {
case nfc::TAG_TYPE_NTAG_213:
max_page = 39;
break;
case nfc::TAG_TYPE_NTAG_215:
max_page = 129;
break;
case nfc::TAG_TYPE_NTAG_216:
max_page = 225;
break;
default:
ESP_LOGE(TAG, "Unknown NTAG type");
return nullptr;
}
std::vector<uint8_t> tag_data;
for (uint8_t page = 4; page <= max_page; page++) {
if (!this->ntag2xx_read_page(page, data)) {
ESP_LOGE(TAG, "Failed to read page %d", page);
return nullptr;
}
tag_data.insert(tag_data.end(), data.begin(), data.end());
}
return make_unique<nfc::NfcTag>(uid, tag_data, tag_type);
}
bool PN532::ntag2xx_read_page(uint8_t page, std::vector<uint8_t> &data) {
std::vector<uint8_t> command = {
PN532_COMMAND_INDATAEXCHANGE,
0x01, // Card number
0x30, // MIFARE Read command
page // Page to read
};
if (!this->write_command_(command)) {
ESP_LOGE(TAG, "Error writing read command");
return false;
}
std::vector<uint8_t> response;
if (!this->read_response(PN532_COMMAND_INDATAEXCHANGE, response)) {
ESP_LOGE(TAG, "Error reading page data");
return false;
}
// Remove status byte
response.erase(response.begin());
data = response;
return true;
}
void PN532::read_mode() {
this->next_task_ = READ;
ESP_LOGD(TAG, "Waiting to read next tag");

1
esphome/components/pn532/pn532.h
View File

@ -70,6 +70,7 @@ class PN532 : public PollingComponent {
virtual bool read_response(uint8_t command, std::vector<uint8_t> &data) = 0;
std::unique_ptr<nfc::NfcTag> read_tag_(std::vector<uint8_t> &uid);
std::unique_ptr<nfc::NfcTag> PN532::read_ntag_tag_(std::vector<uint8_t> &uid, uint8_t tag_type);
bool format_tag_(std::vector<uint8_t> &uid);
bool clean_tag_(std::vector<uint8_t> &uid);