Skip to content

Commit

Permalink
oops, missed sth when solving the merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
doegox committed Oct 17, 2023
1 parent eac246f commit 6e19d07
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions firmware/application/src/rfid/reader/hf/rc522.c
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ uint8_t pcd_14a_reader_scan_once(picc_14a_tag_t *tag) {
if (status != STATUS_HF_TAG_OK) {
NRF_LOG_INFO("Tag SAK claimed to support ATS but tag NAKd RATS");
tag->ats_len = 0;
// return HF_ERR_ATS;
// return STATUS_HF_ERR_ATS;
} else {
ats_size -= 2; // size returned by pcd_14a_reader_ats_request includes CRC
if (ats_size > 254) {
Expand All @@ -660,7 +660,7 @@ uint8_t pcd_14a_reader_scan_once(picc_14a_tag_t *tag) {
// We do not validate ATS here as we want to report ATS as it is without breaking 14a scan
if (tag->ats[0] != ats_size - 1) {
NRF_LOG_INFO("Invalid ATS! First byte doesn't match received length");
// return HF_ERR_ATS;
// return STATUS_HF_ERR_ATS;
}
}
/*
Expand Down Expand Up @@ -713,7 +713,7 @@ uint8_t pcd_14a_reader_ats_request(uint8_t *pAts, uint16_t *szAts, uint16_t szAt
return status;
} else if (*szAts == 7 && pAts[0] == 0x4) { // tag replied with NAK
*szAts = 0;
return HF_ERR_ATS;
return STATUS_HF_ERR_ATS;
}

NRF_LOG_INFO("Received ATS length: %d\n", *szAts);
Expand Down

0 comments on commit 6e19d07

Please sign in to comment.