now spi compiles; fix #define use of isr cbs in IComm

Author: gigapod

src/sfTk/sfDevFPC2534IComm.cpp

@@ -21,6 +21,7 @@ static volatile bool data_available = false;
 
 static bool isISRInitialized = false;
 
+#if !defined(ESP32) && !defined(ARDUINO_ARCH_RP2040)
 //--------------------------------------------------------------------------------------------
 // standard ISR handler - no param version
 static void the_isr_cb()
@@ -31,7 +32,7 @@ static void the_isr_cb()
 
     data_available = true;
 }
-
+#else
 //--------------------------------------------------------------------------------------------
 // ISR handler with param version ()
 static void the_isr_cb_arg(void *arg)
@@ -40,7 +41,7 @@ static void the_isr_cb_arg(void *arg)
     if (arg != nullptr)
         static_cast<sfDevFPC2534IComm *>(arg)->setISRDataAvailable();
 }
-
+#endif
 //--------------------------------------------------------------------------------------------
 // method used to set the IRS Handler by a sub-class
 void sfDevFPC2534IComm::initISRHandler(uint32_t interruptPin)

src/sfTk/sfDevFPC2534SPI.cpp

@@ -12,7 +12,7 @@
 
 // --------------------------------------------------------------------------------------------
 // CTOR
-sfDevFPC2534SPI::sfDevFPC2534SPI() : _spiPort{nullptr}, _spiSettings{nullptr}, _csPin{0}
+sfDevFPC2534SPI::sfDevFPC2534SPI() : _spiPort{nullptr}, _csPin{0}
 {
 }
 
@@ -37,7 +37,9 @@ bool sfDevFPC2534SPI::initialize(SPIClass &spiPort, SPISettings &busSPISettings,
 //--------------------------------------------------------------------------------------------
 bool sfDevFPC2534SPI::initialize(uint8_t csPin, uint32_t interruptPin, bool bInit)
 {
-    return initialize(SPI, SPISettings(3000000, MSBFIRST, SPI_MODE3), csPin, interruptPin, bInit);
+    // If the transaction settings are not provided by the user they are built here.
+    SPISettings spiSettings = SPISettings(3000000, MSBFIRST, SPI_MODE3);
+    return initialize(SPI, spiSettings, csPin, interruptPin, bInit);
 }
 //--------------------------------------------------------------------------------------------
 // Is data available to read - either the device is indicating it via an interrupt, or we have
@@ -49,7 +51,7 @@ bool sfDevFPC2534SPI::dataAvailable()
         return false;
 
     // the data available flag is set, or we have data in the buffer
-    return isISRDataAvailable() || _dataCount > 0;
+    return isISRDataAvailable();
 }
 
 //--------------------------------------------------------------------------------------------

src/sfTk/sfDevFPC2534SPI.h

@@ -12,6 +12,7 @@
 
 // from the FPC SDK
 #include "fpc_api.h"
+#include "sfDevFPC2534IComm.h"
 
 #include <Arduino.h>
 #include <SPI.h>