azalea/OpenHardware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from Menci/fix-wait

Browse Source 
[F] Fix waiting too long in loop caused by unlimited retries
This commit is contained in:
Azalea
2024-07-27 16:24:15 +08:00
committed by GitHub
parent 92336f675f 90b8a31eba
commit d0dadb6967
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CardReader/src/main.cpp
+3 -3
View File
@@ -53,7 +53,7 @@ void setup()
// Set the max number of retry attempts to read from a card // Set the max number of retry attempts to read from a card
// This prevents us from waiting forever for a card, which is the default behaviour of the PN532. // This prevents us from waiting forever for a card, which is the default behaviour of the PN532.
nfc.setPassiveActivationRetries(0xFF); nfc.setPassiveActivationRetries(1);
nfc.SAMConfig(); nfc.SAMConfig();
// Clear the IDm buffer // Clear the IDm buffer
@@ -111,13 +111,13 @@ void loop()
// When one is found, some basic information such as IDm, PMm, and System Code are retrieved. // When one is found, some basic information such as IDm, PMm, and System Code are retrieved.
leds[0] = CRGB::BlueViolet; leds[0] = CRGB::BlueViolet;
FastLED.show(); FastLED.show();
if (nfc.felica_Polling(0xFFFF, 0x00, idm, pmm, &systemCode, 5) == 1) if (nfc.felica_Polling(0xFFFF, 0x00, idm, pmm, &systemCode) == 1)
foundCard(idm, UID_LENGTH, "FeliCa"); foundCard(idm, UID_LENGTH, "FeliCa");
// Wait for an ISO14443A type cards (MIFARE, etc.). When one is found // Wait for an ISO14443A type cards (MIFARE, etc.). When one is found
u8 uidLength; u8 uidLength;
leds[0] = CRGB::OrangeRed; leds[0] = CRGB::OrangeRed;
FastLED.show(); FastLED.show();
if (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, idm, &uidLength, 5) == 1) if (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, idm, &uidLength) == 1)
foundCard(idm, uidLength, "ISO14443A"); foundCard(idm, uidLength, "ISO14443A");
} }