add pins to io constructor instead

Author: brentru

src/AdafruitIO.cpp

@@ -27,11 +27,6 @@ AdafruitIO::AdafruitIO(const char *user, const char *key)
   _init();
 }
 
-void AdafruitIO::_setAirLiftPins(uint16_t ss, uint16_t ack, uint16_t rst)
-{
-  setAirLiftPins(ss, ack, rst);
-}
-
 void errorCallback(char *err, uint16_t len)
 {
   AIO_ERROR_PRINTLN();

src/AdafruitIO.h

@@ -67,7 +67,6 @@ class AdafruitIO {
 
   protected:
     virtual void _connect() = 0;
-    virtual void _setAirLiftPins(uint16_t ss, uint16_t ack, uint16_t rst) = 0;
     aio_status_t _status = AIO_IDLE;
     uint32_t _last_ping = 0;
 

src/AdafruitIO_Definitions.h

@@ -42,7 +42,7 @@ class AdafruitIOGroupCallback {
 };
 
 // Uncomment/comment to turn on/off debug output messages.
-//#define AIO_DEBUG
+#define AIO_DEBUG
 // Uncomment/comment to turn on/off error output
 #define AIO_ERROR
 

src/AdafruitIO_AIRLIFT.h src/wifi/AdafruitIO_AIRLIFT.hsrc/AdafruitIO_AIRLIFT.h renamed to src/wifi/AdafruitIO_AIRLIFT.h

@@ -26,12 +26,7 @@
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"
 
-// Configure some pins used for the ESP32 connection
-#if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
-  #define SPIWIFI SPI
-  #define ESP32_GPIO0 -1 // Not connected
-#endif
-
+#define SPIWIFI SPI
 #define NINAFWVER "1.0.0"
 
 /****************************************************************************/
@@ -55,8 +50,12 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
               A reference to the WiFi network password.
     */
     /**************************************************************************/
-    AdafruitIO_AIRLIFT(const char *user, const char *key, const char *ssid, const char *pass) : AdafruitIO(user, key)
+    AdafruitIO_AIRLIFT(const char *user, const char *key, const char *ssid, const char *pass, int ssPin, int ackPin, int rstPin, int gpio0Pin) : AdafruitIO(user, key)
     {
+      _ssPin = ssPin;
+      _ackPin = ackPin;
+      _rstPin = rstPin;
+      _gpio0Pin = gpio0Pin;
       _ssid = ssid;
       _pass = pass;
       _mqtt_client = new WiFiSSLClient;
@@ -130,30 +129,11 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
       return "AIRLIFT";
     }
 
-    /**************************************************************************/
-    /*!
-    @brief  Defines pins for the ESP32's chip select, busy pin and reset pin.
-    GPIO0 is not defined as it is disconnected by default.
-    @param    ss
-              ESP32 chip select pin.
-    @param    ack
-              ESP32 BUSY/READY pin.
-    @param    rst
-              ESP32 RESET pin.
-    */
-    /**************************************************************************/
-    void _setAirLiftPins(uint16_t ss, uint16_t ack, uint16_t rst)
-    {
-      _ssPin = ss;
-      _ackPin = ack;
-      _rstPin = rst;
-    }
-
   protected:
     const char *_ssid;
     const char *_pass;
     String _fv = "0.0.0"; 
-    uint16_t _ssPin, _ackPin, _rstPin = 0;
+    int _ssPin, _ackPin, _rstPin, _gpio0Pin = 0;
 
     WiFiSSLClient *_http_client;
     WiFiSSLClient *_mqtt_client;
@@ -168,7 +148,13 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
     {
       // setup ESP32 pins
       if (_ssPin != 0) {
-          WiFi.setPins(10, 9, 6, ESP32_GPIO0, &SPIWIFI);
+          AIO_DEBUG_PRINTLN("Pins: ");
+          AIO_DEBUG_PRINT(_ssPin);
+          AIO_DEBUG_PRINT(_ackPin);
+          AIO_DEBUG_PRINT(_rstPin);
+          AIO_DEBUG_PRINT(_gpio0Pin);
+          AIO_DEBUG_PRINTLN("");
+          WiFi.setPins(_ssPin, _ackPin, _rstPin, _gpio0Pin, &SPIWIFI);
       }
 
       // check esp32 module version against NINAFWVER

src/wifi/AdafruitIO_WINC1500.h

@@ -30,8 +30,12 @@
 class AdafruitIO_WINC1500 : public AdafruitIO {
 
   public:
-    AdafruitIO_WINC1500(const char *user, const char *key, const char *ssid, const char *pass) : AdafruitIO(user, key)
+    AdafruitIO_WINC1500(const char *user, const char *key, const char *ssid, const char *pass, int winc_en, int winc_cs, int winc_irq, int winc_rst) : AdafruitIO(user, key)
     {
+      _winc_en = winc_en;
+      _winc_cs = winc_cs;
+      _winc_irq = winc_irq;
+      _winc_rst = winc_rst;
       _ssid = ssid;
       _pass = pass;
       _mqtt_client = new WiFiSSLClient;
@@ -75,14 +79,15 @@ class AdafruitIO_WINC1500 : public AdafruitIO {
   protected:
     const char *_ssid;
     const char *_pass;
+    int _winc_cs, _winc_irq, _winc_rst, _winc_en = 0;
 
     WiFiSSLClient *_http_client;
     WiFiSSLClient *_mqtt_client;
 
     void _connect()
     {
 
-      WiFi.setPins(WINC_CS, WINC_IRQ, WINC_RST, WINC_EN);
+      WiFi.setPins(_winc_cs, _winc_irq, _winc_rst, _winc_en);
 
       // no shield? bail
       if (WiFi.status() == WL_NO_SHIELD)