libs/rfid.PN532_SPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: updated constructor

Browse Source
This commit is contained in:
Willem Oldemans
2021-10-02 11:44:52 +02:00
parent 292035ab25
commit d6aee1c592
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PN532_SPI.cpp
View File

@@ -21,14 +21,11 @@ void PN532_SPI::begin()
_spi->begin(); _spi->begin();
_spi->setDataMode(SPI_MODE0); // PN532 only supports mode0 _spi->setDataMode(SPI_MODE0); // PN532 only supports mode0
_spi->setBitOrder(LSBFIRST); _spi->setBitOrder(LSBFIRST);
#if defined __SAM3X8E__ #ifndef __SAM3X8E__
_spi->setClockDivider(SPI_CLOCK_DIV8); // set clock 2MHz(max: 5MHz)
#else
/** DUE spi library does not support SPI_CLOCK_DIV8 macro */ /** DUE spi library does not support SPI_CLOCK_DIV8 macro */
_spi->setClockDivider(42); // set clock 2MHz(max: 5MHz) _spi->setClockDivider(42); // set clock 2MHz(max: 5MHz)
#elif defined __SAMD21G18A__
/** M0 spi library does not support SPI_CLOCK_DIV8 macro */
_spi->setClockDivider(24); // set clock 2MHz(max: 5MHz)
#else
_spi->setClockDivider(SPI_CLOCK_DIV8); // set clock 2MHz(max: 5MHz)
#endif #endif
} }
@@ -69,7 +66,7 @@ int16_t PN532_SPI::readResponse(uint8_t buf[], uint8_t len, uint16_t timeout)
while (!isReady()) { while (!isReady()) {
delay(1); delay(1);
time++; time++;
if (time > timeout) { if (timeout > 0 && time > timeout) {
return PN532_TIMEOUT; return PN532_TIMEOUT;
} }
} }
@@ -142,7 +139,7 @@ int16_t PN532_SPI::readResponse(uint8_t buf[], uint8_t len, uint16_t timeout)
return result; return result;
} }
bool PN532_SPI::isReady() boolean PN532_SPI::isReady()
{ {
digitalWrite(_ss, LOW); digitalWrite(_ss, LOW);

2
PN532_SPI.h
View File

@@ -20,7 +20,7 @@ private:
uint8_t _ss; uint8_t _ss;
uint8_t command; uint8_t command;
bool isReady(); boolean isReady();
void writeFrame(const uint8_t *header, uint8_t hlen, const uint8_t *body = 0, uint8_t blen = 0); void writeFrame(const uint8_t *header, uint8_t hlen, const uint8_t *body = 0, uint8_t blen = 0);
int8_t readAckFrame(); int8_t readAckFrame();