jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4802 from andrethomas/development

Browse Source 
PN532 Store timeout in PROGMEM
This commit is contained in:
Theo Arends 2019-01-03 15:17:37 +01:00 committed by GitHub
commit 524675583b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sonoff/xsns_40_pn532_i2c.ino
View File

@ -54,12 +54,13 @@
uint8_t pn532_i2c_detected = 0; uint8_t pn532_i2c_detected = 0;
uint8_t pn532_i2c_packetbuffer[64]; uint8_t pn532_i2c_packetbuffer[64];
uint8_t pn532_i2c_scan_defer_report = 0; // If a valid card was found we will not scan for one again in the same two seconds so we set this to 19 if a card was found uint8_t pn532_i2c_scan_defer_report = 0; // If a valid card was found we will not scan for one again in the same two seconds so we set this to 19 if a card was found
uint8_t pn532_i2c_command = 0;
uint8_t pn532_i2c_command; const uint8_t PROGMEM pn532_global_timeout = 10;
int16_t PN532_getResponseLength(uint8_t buf[], uint8_t len, uint16_t timeout) { int16_t PN532_getResponseLength(uint8_t buf[], uint8_t len) {
const uint8_t PN532_NACK[] = {0, 0, 0xFF, 0xFF, 0, 0}; const uint8_t PN532_NACK[] = {0, 0, 0xFF, 0xFF, 0, 0};
uint16_t time = 0; uint8_t time = 0;
do { do {
if (Wire.requestFrom(PN532_I2C_ADDRESS, 6)) { if (Wire.requestFrom(PN532_I2C_ADDRESS, 6)) {
if (Wire.read() & 1) { // check first byte --- status if (Wire.read() & 1) { // check first byte --- status
@ -68,7 +69,7 @@ int16_t PN532_getResponseLength(uint8_t buf[], uint8_t len, uint16_t timeout) {
} }
delay(1); delay(1);
time++; time++;
if ((0 != timeout) && (time > timeout)) { if (time > pn532_global_timeout) {
return -1; return -1;
} }
} while (1); } while (1);
@ -91,11 +92,10 @@ int16_t PN532_getResponseLength(uint8_t buf[], uint8_t len, uint16_t timeout) {
int16_t PN532_readResponse(uint8_t buf[], uint8_t len) int16_t PN532_readResponse(uint8_t buf[], uint8_t len)
{ {
uint16_t time = 0; uint8_t time = 0;
uint8_t length; uint8_t length;
uint8_t timeout = 10;
length = PN532_getResponseLength(buf, len, timeout); length = PN532_getResponseLength(buf, len);
// [RDY] 00 00 FF LEN LCS (TFI PD0 ... PDn) DCS 00 // [RDY] 00 00 FF LEN LCS (TFI PD0 ... PDn) DCS 00
@ -107,7 +107,7 @@ int16_t PN532_readResponse(uint8_t buf[], uint8_t len)
} }
delay(1); delay(1);
time++; time++;
if ((0 != timeout) && (time > timeout)) { if (time > pn532_global_timeout) {
return -1; return -1;
} }
} while (1); } while (1);
@ -149,7 +149,7 @@ int8_t PN532_readAckFrame(void)
const uint8_t PN532_ACK[] = {0, 0, 0xFF, 0, 0xFF, 0}; const uint8_t PN532_ACK[] = {0, 0, 0xFF, 0, 0xFF, 0};
uint8_t ackBuf[sizeof(PN532_ACK)]; uint8_t ackBuf[sizeof(PN532_ACK)];
uint16_t time = 0; uint8_t time = 0;
do { do {
if (Wire.requestFrom(PN532_I2C_ADDRESS, sizeof(PN532_ACK) + 1)) { if (Wire.requestFrom(PN532_I2C_ADDRESS, sizeof(PN532_ACK) + 1)) {