jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 19:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Edit formats

Browse Source
This commit is contained in:
md5sum-as 2022-10-28 01:24:22 +03:00
parent 0d22a16240
commit d152199aee
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino
View File

@ -396,9 +396,9 @@ uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data) {
Pn532.packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE; Pn532.packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
Pn532.packetbuffer[1] = 1; /* Card number */ Pn532.packetbuffer[1] = 1; /* Card number */
Pn532.packetbuffer[2] = MIFARE_CMD_READ; /* Mifare Read command = 0x30 */ Pn532.packetbuffer[2] = MIFARE_CMD_READ; /* Mifare Read command = 0x30 */
Pn532.packetbuffer[3] = blockNumber; /* Block Number (0..63 for 1K, 0..255 for 4K) */ Pn532.packetbuffer[3] = blockNumber; /* Block Number (0..63 for 1K, 0..255 for 4K) */
/* Send the command */ /* Send the command */
if (PN532_writeCommand(Pn532.packetbuffer, 4)) { if (PN532_writeCommand(Pn532.packetbuffer, 4)) {
return 0; return 0;
} }
@ -414,27 +414,25 @@ uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data) {
/* Copy the 16 data bytes to the output buffer */ /* Copy the 16 data bytes to the output buffer */
/* Block content starts at byte 9 of a valid response */ /* Block content starts at byte 9 of a valid response */
memcpy (data, &Pn532.packetbuffer[1], 16); memcpy (data, &Pn532.packetbuffer[1], 16);
return 1; return 1;
} }
bool mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data) { uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data) {
/* Prepare the first command */ /* Prepare the first command */
Pn532.packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE; Pn532.packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
Pn532.packetbuffer[1] = 1; /* Card number */ Pn532.packetbuffer[1] = 1; /* Card number */
Pn532.packetbuffer[2] = MIFARE_CMD_WRITE; /* Mifare Write command = 0xA0 */ Pn532.packetbuffer[2] = MIFARE_CMD_WRITE; /* Mifare Write command = 0xA0 */
Pn532.packetbuffer[3] = blockNumber; /* Block Number (0..63 for 1K, 0..255 for 4K) */ Pn532.packetbuffer[3] = blockNumber; /* Block Number (0..63 for 1K, 0..255 for 4K) */
memcpy(&Pn532.packetbuffer[4], data, 16); /* Data Payload */ memcpy(&Pn532.packetbuffer[4], data, 16); /* Data Payload */
/* Send the command */ /* Send the command */
if (PN532_writeCommand(Pn532.packetbuffer, 20)) { if (PN532_writeCommand(Pn532.packetbuffer, 20)) {
return false; return 0;
}
/* Read the response packet */
if (PN532_readResponse(Pn532.packetbuffer, sizeof(Pn532.packetbuffer)) < 1) {
return false;
} }
return true; /* Read the response packet */
return (0 < PN532_readResponse(Pn532.packetbuffer, sizeof(Pn532.packetbuffer)));
} }
uint8_t ntag21x_probe (void) { uint8_t ntag21x_probe (void) {