From 4b57d0ddcb1ecf48848ac92272309b33a2843c46 Mon Sep 17 00:00:00 2001
From: ladyada <limor@ladyada.net>
Date: Tue, 9 Aug 2016 15:52:08 -0400
Subject: [PATCH] remove progmem support (only FONA really needed it and its
 OK)

---
 Adafruit_MQTT.cpp | 50 -----------------------------------------------
 Adafruit_MQTT.h   | 12 ++----------
 2 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/Adafruit_MQTT.cpp b/Adafruit_MQTT.cpp
index 8565d13..2c05df3 100644
--- a/Adafruit_MQTT.cpp
+++ b/Adafruit_MQTT.cpp
@@ -106,31 +106,6 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
 
 }
 
-Adafruit_MQTT::Adafruit_MQTT(const __FlashStringHelper *server,
-                             uint16_t port,
-                             const __FlashStringHelper *cid,
-                             const __FlashStringHelper *user,
-                             const __FlashStringHelper *pass) {
-
-  servername = (const char *)server;
-  portnum = port;
-  clientid = (const char *)cid;
-  username = (const char *)user;
-  password = (const char *)pass;
-
-  // reset subscriptions
-  for (uint8_t i=0; i<MAXSUBSCRIPTIONS; i++) {
-    subscriptions[i] = 0;
-  }
-
-  will_topic = 0;
-  will_payload = 0;
-  will_qos = 0;
-  will_retain = 0;
-
-  packet_id_counter = 0;
-
-}
 
 Adafruit_MQTT::Adafruit_MQTT(const char *server,
                              uint16_t port,
@@ -156,31 +131,6 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
 
 }
 
-Adafruit_MQTT::Adafruit_MQTT(const __FlashStringHelper *server,
-                             uint16_t port,
-                             const __FlashStringHelper *user,
-                             const __FlashStringHelper *pass) {
-
-  servername = (const char *)server;
-  portnum = port;
-  clientid = "";
-  username = (const char *)user;
-  password = (const char *)pass;
-
-  // reset subscriptions
-  for (uint8_t i=0; i<MAXSUBSCRIPTIONS; i++) {
-    subscriptions[i] = 0;
-  }
-
-  will_topic = 0;
-  will_payload = 0;
-  will_qos = 0;
-  will_retain = 0;
-
-  packet_id_counter = 0;
-
-}
-
 int8_t Adafruit_MQTT::connect() {
   // Connect to the server.
   if (!connectServer())
diff --git a/Adafruit_MQTT.h b/Adafruit_MQTT.h
index f86bd4f..efcc330 100644
--- a/Adafruit_MQTT.h
+++ b/Adafruit_MQTT.h
@@ -34,7 +34,7 @@
 #define ADAFRUIT_MQTT_VERSION_PATCH 0
 
 // Uncomment/comment to turn on/off debug output messages.
-//#define MQTT_DEBUG
+#define MQTT_DEBUG
 // Uncomment/comment to turn on/off error output messages.
 #define MQTT_ERROR
 
@@ -134,19 +134,11 @@ class Adafruit_MQTT {
                 const char *cid,
                 const char *user,
                 const char *pass);
-  Adafruit_MQTT(const __FlashStringHelper *server,
-                uint16_t port,
-                const __FlashStringHelper *cid,
-                const __FlashStringHelper *user,
-                const __FlashStringHelper *pass);
+
   Adafruit_MQTT(const char *server,
                 uint16_t port,
                 const char *user = "",
                 const char *pass = "");
-  Adafruit_MQTT(const __FlashStringHelper *server,
-                uint16_t port,
-                const __FlashStringHelper *user,
-                const __FlashStringHelper *pass);
   virtual ~Adafruit_MQTT() {}
 
   // Connect to the MQTT server.  Returns 0 on success, otherwise an error code