update airlift to header only, publish config for sketch

Author: brentru

examples/adafruitio_00_publish/config.h

@@ -18,9 +18,13 @@
 #define WIFI_PASS       "your_pass"
 
 // comment out the following two lines if you are using fona or ethernet
-#include "AdafruitIO_WiFi.h"
-AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS);
+//#include "AdafruitIO_WiFi.h"
+//AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS);
 
+/******************************* AirLift **************************************/
+
+#include "AdafruitIO_AIRLIFT.h"
+AdafruitIO_AIRLIFT io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS);
 
 /******************************* FONA **************************************/
 

src/AdafruitIO_AIRLIFT.cpp

@@ -12,8 +12,6 @@
 #ifndef ADAFRUITIO_AIRLIFT_H
 #define ADAFRUITIO_AIRLIFT_H
 
-#if !defined(ARDUINO_SAMD_MKR1000) && defined(ARDUINO_ARCH_SAMD)
-
 #include "Arduino.h"
 #include "AdafruitIO.h"
 #include "WiFiNINA.h"
@@ -31,25 +29,71 @@
   #define ESP32_GPIO0 -1 // Not connected
 #endif
 
+// br: try to emulate everything in the header to avoid wifinina-wifi101 conflicts
 class AdafruitIO_AIRLIFT : public AdafruitIO {
 
   public:
-    AdafruitIO_AIRLIFT(const char *user, const char *key, const char *ssid, const char *pass);
-    ~AdafruitIO_AIRLIFT();
+    AdafruitIO_AIRLIFT(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);
+    }
+
+    //~AdafruitIO_AIRLIFT();
+
+    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;
+      }
+    }
 
-    aio_status_t networkStatus();
-    const char* connectionType();
+    const char *connectionType()
+    {
+      return "AIRLIFT";
+    }
+
+    //aio_status_t networkStatus();
+    //const char* connectionType();
 
   protected:
-    void _connect();
+    //void _connect();
     const char *_ssid;
     const char *_pass;
 
     WiFiSSLClient *_http_client;
     WiFiSSLClient *_mqtt_client;
 
+    void _connect()
+    {
+      // for breakouts, check if the pins would be externally defined
+      #ifdef BOARDEF
+          WiFi.setPins(SPIWIFI_SS, SPIWIFI_ACK, ESP32_RESETN, ESP32_GPIO0, &SPIWIFI);
+      #endif
+
+      // check esp32 module status
+      if (WiFi.status() == WL_NO_MODULE)
+      {
+        Serial.println("No Module!!");
+        Serial.print(WiFi.status());
+      }
+
+      WiFi.begin(_ssid, _pass);
+      _status = AIO_NET_DISCONNECTED;
+  }
 };
 
-#endif // ARDUINO_ARCH_SAMD
 
 #endif // ADAFRUITIO_AIRLIFT_H