Merge master to resolve conflicts

Adafruit_MQTT.cpp

@@ -22,7 +22,7 @@
 #include "Adafruit_MQTT.h"
 
 #if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) ||             \
-    defined(ARDUINO_ARCH_SAMD)
+    defined(ARDUINO_SAMD_MKR1010) || defined(ARDUINO_ARCH_SAMD)
 static char *dtostrf(double val, signed char width, unsigned char prec,
                      char *sout) {
   char fmt[20];

Adafruit_MQTT_Client.h

@@ -41,11 +41,14 @@ public:
                        const char *user = "", const char *pass = "")
       : Adafruit_MQTT(server, port, user, pass), client(client) {}
 
-  bool connectServer();
+  bool connected() override;
-  bool disconnectServer();
+
-  bool connected();
+protected:
-  uint16_t readPacket(uint8_t *buffer, uint16_t maxlen, int16_t timeout);
+  bool connectServer() override;
-  bool sendPacket(uint8_t *buffer, uint16_t len);
+  bool disconnectServer() override;
+  uint16_t readPacket(uint8_t *buffer, uint16_t maxlen,
+                      int16_t timeout) override;
+  bool sendPacket(uint8_t *buffer, uint16_t len) override;
 
 private:
   Client *client;

Adafruit_MQTT_FONA.h

@@ -42,7 +42,13 @@ public:
                      const char *user = "", const char *pass = "")
       : Adafruit_MQTT(server, port, user, pass), fona(f) {}
 
-  bool connectServer() {
+  bool connected() {
+    // Return true if connected, false if not connected.
+    return fona->TCPconnected();
+  }
+
+protected:
+  bool connectServer() override {
     char server[40];
     strncpy(server, servername, 40);
 #ifdef ADAFRUIT_SLEEPYDOG_H
@@ -54,14 +60,10 @@ public:
     return fona->TCPconnect(server, portnum);
   }
 
-  bool disconnectServer() { return fona->TCPclose(); }
+  bool disconnectServer() override { return fona->TCPclose(); }
 
-  bool connected() {
+  uint16_t readPacket(uint8_t *buffer, uint16_t maxlen,
-    // Return true if connected, false if not connected.
+                      int16_t timeout) override {
-    return fona->TCPconnected();
-  }
-
-  uint16_t readPacket(uint8_t *buffer, uint16_t maxlen, int16_t timeout) {
     uint8_t *buffp = buffer;
     DEBUG_PRINTLN(F("Reading data.."));
 
@@ -114,7 +116,7 @@ public:
     return len;
   }
 
-  bool sendPacket(uint8_t *buffer, uint16_t len) {
+  bool sendPacket(uint8_t *buffer, uint16_t len) override {
     DEBUG_PRINTLN(F("Writing packet"));
     if (fona->TCPconnected()) {
       boolean ret = fona->TCPsend((char *)buffer, len);

examples/mqtt_esp8266/mqtt_esp8266.ino

@@ -35,7 +35,7 @@
 
 // Create an ESP8266 WiFiClient class to connect to the MQTT server.
 WiFiClient client;
-// or... use WiFiFlientSecure for SSL
+// or... use WiFiClientSecure for SSL
 //WiFiClientSecure client;
 
 // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.