Merge pull request #4796 from andrethomas/development

PN532 - Housekeeping
This commit is contained in:
Theo Arends 2019-01-03 11:15:21 +01:00 committed by GitHub
commit 635edc2cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -376,7 +376,9 @@ void GetFeatures(void)
#ifdef USE_MAX31855
feature_sns2 |= 0x00080000; // xsns_39_max31855.ino
#endif
// feature_sns2 |= 0x00100000;
#ifdef USE_PN532_I2C
feature_sns2 |= 0x00100000; // xsns_40_pn532_i2c.ino
#endif
// feature_sns2 |= 0x00200000;
// feature_sns2 |= 0x00400000;
// feature_sns2 |= 0x00800000;

View File

@ -144,7 +144,7 @@ int16_t PN532_readResponse(uint8_t buf[], uint8_t len)
}
int8_t PN532_readAckFrame()
int8_t PN532_readAckFrame(void)
{
const uint8_t PN532_ACK[] = {0, 0, 0xFF, 0, 0xFF, 0};
uint8_t ackBuf[sizeof(PN532_ACK)];