Changes to support MKR 1010 and Nano 33 IOT

Changes to support MKR 1010 and Nano 33 IOT

Author: darumsdad

src/wifi/AdafruitIO_MKR1010.cpp

@@ -6,16 +6,12 @@
  * products from Adafruit!
  *
  * Copyright (c) 2015-2016 Adafruit Industries
- * Authors: Tony DiCola, Todd Treece
+ * Authors: David Goldstein, Morgan Winters
  * Licensed under the MIT license.
  *
  * All text above must be included in any redistribution.
  */
 
-#ifndef ADAFRUITIO_MKR1010_H
-#define ADAFRUITIO_MKR1010_H
-
-#if defined(ARDUINO_SAMD_MKR1010)
 
 #include "AdafruitIO.h"
 #include "Adafruit_MQTT.h"
@@ -28,23 +24,58 @@
 class AdafruitIO_MKR1010 : public AdafruitIO {
 
 public:
-  AdafruitIO_MKR1010(const char *user, const char *key, const char *ssid,
-                     const char *pass);
-  ~AdafruitIO_MKR1010();
+  AdafruitIO_MKR1010(const char *user, const char *key,
+                                       const char *ssid, const char *pass)
+    : AdafruitIO(user, key) {
+  _ssid = ssid;
+  _pass = pass;
+  _client = new WiFiSSLClient;
+  _mqtt = new Adafruit_MQTT_Client(_client, _host, _mqtt_port);
+  _http = new HttpClient(*_client, _host, _http_port);
+}
+  ~AdafruitIO_MKR1010() {
+    if (_client)
+      delete _client;
+    if (_mqtt)
+      delete _mqtt;
+  }
 
-  aio_status_t networkStatus();
-  const char *connectionType();
+  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 "wifi"; }
 
 protected:
-  void _connect();
-  void _disconnect();
+  void _connect() {
+    if (strlen(_ssid) == 0) {
+      _status = AIO_SSID_INVALID;
+    } else {
+      _disconnect();
+
+      WiFi.begin(_ssid, _pass);
+      _status = networkStatus();
+    }
+  }
+  
+  void _disconnect() {
+    WiFi.disconnect();
+    delay(AIO_NET_DISCONNECT_WAIT);
+  }
 
   const char *_ssid;
   const char *_pass;
 
   WiFiSSLClient *_client;
 };
 
-#endif // ARDUINO_ARCH_SAMD
 
-#endif // ADAFRUITIO_MKR1010_H

src/wifi/AdafruitIO_MKR1010.h

@@ -15,17 +15,16 @@
 #ifndef ADAFRUITIO_WINC1500_H
 #define ADAFRUITIO_WINC1500_H
 
-#if !defined(ARDUINO_SAMD_MKR1000) && !defined(ARDUINO_SAMD_MKR1010) &&            \
-    defined(ARDUINO_ARCH_SAMD) && !defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) &&            \
-    !defined(ADAFRUIT_PYPORTAL)
+#if !defined(ARDUINO_SAMD_MKR1000) && defined(ARDUINO_ARCH_SAMD) &&            \
+    !defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) && !defined(ADAFRUIT_PYPORTAL)
 
 #include "AdafruitIO.h"
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"
 #include "Arduino.h"
 #include "SPI.h"
-//#include "WiFi101.h" // USE THIS FOR WiFi101 boards such as the MKR1000
-#include "WiFiNINA.h  // USE THIS FOR WiFiNINA boards such as the MKR1010
+#include "WiFi101.h"
+
 
 /**************************************************************************/
 /*!