stefank/rpi_pico_mfrc522
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialization seems to work now: reading/writing requires a-/prepending a byte.

Browse Source
This commit is contained in:
Stefan Kratochwil
2024-05-20 23:13:09 +02:00
parent 8ac8726904
commit 2b98beab3a
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
third_party/mfrc522_integration/mfrc522_rp2040_integration.c vendored
View File

@@ -227,10 +227,22 @@ uint8_t mfrc522_interface_spi_deinit(void)
*/ */
uint8_t mfrc522_interface_spi_read(uint8_t reg, uint8_t *buf, uint16_t len) uint8_t mfrc522_interface_spi_read(uint8_t reg, uint8_t *buf, uint16_t len)
{ {
if (len == UINT16_MAX)
return 1;
// We need to read len + 1 bytes...
const size_t local_buf_len = len + 1;
uint8_t local_buf[local_buf_len];
memset(local_buf, 0, local_buf_len);
cs_select(); cs_select();
uint16_t n_bytes_read = spi_read_blocking(MFRC522_CFG_SPI_INSTANCE, reg, buf, len); uint16_t n_bytes_read = spi_read_blocking(MFRC522_CFG_SPI_INSTANCE, reg, local_buf, local_buf_len);
cs_deselect(); cs_deselect();
return (uint8_t) (n_bytes_read == len) ? 0 : 1;
// ...and ignore the first byte we received.
memcpy(buf, local_buf + 1, len);
return (uint8_t) (n_bytes_read == local_buf_len) ? 0 : 1;
} }
/** /**
@@ -245,10 +257,20 @@ uint8_t mfrc522_interface_spi_read(uint8_t reg, uint8_t *buf, uint16_t len)
*/ */
uint8_t mfrc522_interface_spi_write(uint8_t reg, uint8_t *buf, uint16_t len) uint8_t mfrc522_interface_spi_write(uint8_t reg, uint8_t *buf, uint16_t len)
{ {
if (len == UINT16_MAX)
return 1;
// We need to send the address byte (reg) as part of the payload.
const size_t local_buf_len = len + 1;
uint8_t local_buf[local_buf_len];
local_buf[0] = reg;
memcpy(&local_buf[1], buf, len);
cs_select(); cs_select();
uint16_t n_bytes_written = spi_write_blocking(MFRC522_CFG_SPI_INSTANCE, buf, len); uint16_t n_bytes_written = spi_write_blocking(MFRC522_CFG_SPI_INSTANCE, local_buf, local_buf_len);
cs_deselect(); cs_deselect();
return (uint8_t) (n_bytes_written == len) ? 0 : 1;
return (uint8_t) (n_bytes_written == local_buf_len) ? 0 : 1;
} }
/** /**