From d8ec6bf06aa96c4f91dd0844a7630f0ac8c43b50 Mon Sep 17 00:00:00 2001 From: Willem Oldemans Date: Sat, 2 Oct 2021 11:57:33 +0200 Subject: [PATCH] fix: update spi constructor --- PN532_SPI.cpp | 8 ++++++-- PN532_SPI.h | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/PN532_SPI.cpp b/PN532_SPI.cpp index 1b3468c..073ecd4 100644 --- a/PN532_SPI.cpp +++ b/PN532_SPI.cpp @@ -7,18 +7,22 @@ #define DATA_WRITE 1 #define DATA_READ 3 -PN532_SPI::PN532_SPI(SPIClass &spi, uint8_t ss) +PN532_SPI::PN532_SPI(SPIClass &spi, uint8_t ss, uint8_t sck, uint8_t miso, uint8_t mosi) { command = 0; _spi = &spi; _ss = ss; + _sck = sck; + _mosi = mosi; + _miso = miso; + } void PN532_SPI::begin() { pinMode(_ss, OUTPUT); - _spi->begin(); + _spi->begin(_sck, _miso, _mosi); _spi->setDataMode(SPI_MODE0); // PN532 only supports mode0 _spi->setBitOrder(LSBFIRST); #ifndef __SAM3X8E__ diff --git a/PN532_SPI.h b/PN532_SPI.h index 53ff697..3619f58 100644 --- a/PN532_SPI.h +++ b/PN532_SPI.h @@ -7,7 +7,7 @@ class PN532_SPI : public PN532Interface { public: - PN532_SPI(SPIClass &spi, uint8_t ss); + PN532_SPI(SPIClass &spi, uint8_t ss, uint8_t sck, uint8_t miso, uint8_t mosi); void begin(); void wakeup(); @@ -17,10 +17,10 @@ public: private: SPIClass* _spi; - uint8_t _ss; + uint8_t _ss, _mosi, _miso, _sck; uint8_t command; - boolean isReady(); + bool isReady(); void writeFrame(const uint8_t *header, uint8_t hlen, const uint8_t *body = 0, uint8_t blen = 0); int8_t readAckFrame();