Cons-n-Stuff/aic_pico
1
0
Fork 0
mirror of https://github.com/whowechina/aic_pico.git synced 2025-01-19 11:18:39 +01:00
Code Releases Activity

More stable PN5180 mifare ops

Browse Source
This commit is contained in:
whowechina 2024-05-26 17:24:41 +08:00
parent 0f6844f47c
commit 2036e47aa2
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Production/Firmware/aic_pico.uf2
View File

Binary file not shown.

47
firmware/src/lib/pn5180.c
View File

@ -235,11 +235,23 @@ static void rf_crc_on()
pn5180_or_reg(PN5180_REG_CRC_RX_CONFIG, 0x01); pn5180_or_reg(PN5180_REG_CRC_RX_CONFIG, 0x01);
} }
static void anti_collision(uint8_t code, uint8_t uid[5], uint8_t *sak) static struct {
uint8_t atqa[2];
uint8_t buf[5];
uint8_t sak;
uint8_t uid[7];
uint8_t len;
bool ready;
} mi_poll;
static bool anti_collision(uint8_t code, uint8_t uid[5], uint8_t *sak)
{ {
rf_crc_off(); rf_crc_off();
uint8_t cmd[7] = { code, 0x20 }; uint8_t cmd[7] = { code, 0x20 };
pn5180_send_data(cmd, 2, 0); pn5180_send_data(cmd, 2, 0);
if ((pn5180_get_rx() & 0x1ff) != 5) {
return false;
}
pn5180_read_data(cmd + 2, 5); // uid pn5180_read_data(cmd + 2, 5); // uid
memmove(uid, cmd + 2, 5); memmove(uid, cmd + 2, 5);
@ -247,17 +259,13 @@ static void anti_collision(uint8_t code, uint8_t uid[5], uint8_t *sak)
cmd[0] = code; cmd[0] = code;
cmd[1] = 0x70; cmd[1] = 0x70;
pn5180_send_data(cmd, 7, 0); pn5180_send_data(cmd, 7, 0);
if ((pn5180_get_rx() & 0x1ff) != 1) {
return false;
}
pn5180_read_data(sak, 1); // sak pn5180_read_data(sak, 1); // sak
return true;
} }
static struct {
uint8_t atqa[2];
uint8_t buf[5];
uint8_t sak;
uint8_t uid[7];
uint8_t len;
} mi_poll;
static void poll_mifare_1() static void poll_mifare_1()
{ {
pn5180_reset(); pn5180_reset();
@ -268,23 +276,26 @@ static void poll_mifare_1()
pn5180_and_reg(PN5180_REG_IRQ_CLEAR, 0x000fffff); pn5180_and_reg(PN5180_REG_IRQ_CLEAR, 0x000fffff);
pn5180_and_reg(PN5180_REG_SYSTEM_CONFIG, 0xfffffff8); pn5180_and_reg(PN5180_REG_SYSTEM_CONFIG, 0xfffffff8);
pn5180_or_reg(PN5180_REG_SYSTEM_CONFIG, 0x03); pn5180_or_reg(PN5180_REG_SYSTEM_CONFIG, 0x03);
mi_poll.len = 0;
mi_poll.ready = true;
uint8_t cmd[1] = {0x26}; uint8_t cmd[1] = {0x26};
pn5180_send_data(cmd, 1, 7); pn5180_send_data(cmd, 1, 7);
if ((pn5180_get_rx() & 0x1ff) != 2) {
mi_poll.ready = false;
return;
}
pn5180_read_data(mi_poll.atqa, 2); pn5180_read_data(mi_poll.atqa, 2);
} }
static void poll_mifare_2() static void poll_mifare_2()
{ {
if ((memcmp(mi_poll.atqa, "\x44\x00", 2) != 0) && if (!mi_poll.ready) {
(memcmp(mi_poll.atqa, "\x04\x00", 2) != 0)) {
mi_poll.len = 0;
return; return;
} }
anti_collision(0x93, mi_poll.buf, &mi_poll.sak); if (!anti_collision(0x93, mi_poll.buf, &mi_poll.sak)) {
if (mi_poll.sak == 0x00) {
mi_poll.len = 0;
return; return;
} }
@ -294,7 +305,9 @@ static void poll_mifare_2()
mi_poll.len = 4; mi_poll.len = 4;
} else if (mi_poll.buf[0] == 0x88) { } else if (mi_poll.buf[0] == 0x88) {
memmove(mi_poll.uid, mi_poll.buf + 1, 3); memmove(mi_poll.uid, mi_poll.buf + 1, 3);
anti_collision(0x95, mi_poll.buf, &mi_poll.sak); if (!anti_collision(0x95, mi_poll.buf, &mi_poll.sak)) {
return;
}
if (mi_poll.sak != 0xff) { if (mi_poll.sak != 0xff) {
memmove(mi_poll.uid + 3, mi_poll.buf, 4); memmove(mi_poll.uid + 3, mi_poll.buf, 4);
mi_poll.len = 7; mi_poll.len = 7;