add back set pin function to AdafruitIO.cpp./.h, winc.cpp->winc.h

Author: brentru

src/AdafruitIO.cpp

@@ -27,6 +27,11 @@ 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,6 +67,7 @@ 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_AIRLIFT.h

@@ -28,7 +28,6 @@
 
 // Configure some pins used for the ESP32 connection
 #if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
-  #define BOARDEF 1
   #define SPIWIFI SPI
   #define ESP32_GPIO0 -1 // Not connected
 #endif
@@ -146,6 +145,7 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
     void setAirLiftPins(uint16_t ss, uint16_t ack, uint16_t rst)
     {
       WiFi.setPins(ss, ack, rst, ESP32_GPIO0, &SPIWIFI);
+      AIO_DEBUG_PRINTLN("Pins Set!")
     }
 
 

src/AdafruitIO_Definitions.h

@@ -42,9 +42,9 @@ 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
+#define AIO_ERROR
 
 // Where debug messages will be printed
 // note: if you're using something like Zero or Due, change the below to SerialUSB

src/AdafruitIO_WiFi.h

@@ -17,12 +17,12 @@
   #include "wifi/AdafruitIO_MKR1000.h"
   typedef AdafruitIO_MKR1000 AdafruitIO_WiFi;
 
-#elif defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL)
+#elif defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) || defined(USE_AIRLIFT)
 
   #include "AdafruitIO_AIRLIFT.h"
   typedef AdafruitIO_AIRLIFT AdafruitIO_WiFi;
 
-#elif !defined(ARDUINO_SAMD_MKR1000) && defined(ARDUINO_ARCH_SAMD)
+#elif defined(USE_WINC1500) 
 
   #include "wifi/AdafruitIO_WINC1500.h"
   typedef AdafruitIO_WINC1500 AdafruitIO_WiFi;
@@ -42,6 +42,10 @@
   #include "wifi/AdafruitIO_WICED.h"
   typedef AdafruitIO_WICED AdafruitIO_WiFi;
 
+#else
+
+  #error "Must define USE_AIRLIFT or USE_WINC1500 before including this file."
+
 #endif
 
 #endif // ADAFRUITIO_WIFI_H

src/wifi/AdafruitIO_WINC1500.cpp

@@ -30,20 +30,67 @@
 class AdafruitIO_WINC1500 : public AdafruitIO {
 
   public:
-    AdafruitIO_WINC1500(const char *user, const char *key, const char *ssid, const char *pass);
-    ~AdafruitIO_WINC1500();
+    AdafruitIO_WINC1500(const char *user, const char *key, const char *ssid, const char *pass) : AdafruitIO(user, key)
+    {
+      _ssid = ssid;
+      _pass = pass;
+      _mqtt_client = new WiFiSSLClient;
+      _mqtt = new Adafruit_MQTT_Client(_mqtt_client, _host, _mqtt_port);
+      _http_client = new WiFiSSLClient;
+      _http = new HttpClient(*_http_client, _host, _http_port);
+    }
 
-    aio_status_t networkStatus();
-    const char* connectionType();
+    ~AdafruitIO_WINC1500()
+    {
+      if (_mqtt_client)
+        delete _http_client;
+      if (_http_client)
+        delete _mqtt_client;
+      if (_mqtt)
+        delete _mqtt;
+      if (_http)
+        delete _http;
+    }
+
+    aio_status_t networkStatus()
+    {
+
+      switch (WiFi.status())
+      {
+      case WL_CONNECTED:
+        return AIO_NET_CONNECTED;
+      case WL_CONNECT_FAILED:
+        return AIO_NET_CONNECT_FAILED;
+      case WL_IDLE_STATUS:
+        return AIO_IDLE;
+      default:
+        return AIO_NET_DISCONNECTED;
+      }
+    }
+    const char *connectionType()
+    {
+      return "winc1500";
+    }
 
   protected:
-    void _connect();
     const char *_ssid;
     const char *_pass;
 
     WiFiSSLClient *_http_client;
     WiFiSSLClient *_mqtt_client;
 
+    void _connect()
+    {
+
+      WiFi.setPins(WINC_CS, WINC_IRQ, WINC_RST, WINC_EN);
+
+      // no shield? bail
+      if (WiFi.status() == WL_NO_SHIELD)
+        return;
+
+      WiFi.begin(_ssid, _pass);
+      _status = AIO_NET_DISCONNECTED;
+    }
 };
 
 #endif // ARDUINO_ARCH_SAMD