43 changed files with 773 additions and 1727 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,46 +0,0 @@
-Thank you for opening an issue on an Adafruit Arduino library repository.  To
-improve the speed of resolution please review the following guidelines and
-common troubleshooting steps below before creating the issue:
-
- **Do not use GitHub issues for troubleshooting projects and issues.**  Instead use
-  the forums at http://forums.adafruit.com to ask questions and troubleshoot why
-  something isn't working as expected.  In many cases the problem is a common issue
-  that you will more quickly receive help from the forum community.  GitHub issues
-  are meant for known defects in the code.  If you don't know if there is a defect
-  in the code then start with troubleshooting on the forum first.
-
- **If following a tutorial or guide be sure you didn't miss a step.** Carefully
-  check all of the steps and commands to run have been followed.  Consult the
-  forum if you're unsure or have questions about steps in a guide/tutorial.
-
- **For Arduino projects check these very common issues to ensure they don't apply**:
-
-  - For uploading sketches or communicating with the board make sure you're using
-    a **USB data cable** and **not** a **USB charge-only cable**.  It is sometimes
-    very hard to tell the difference between a data and charge cable!  Try using the
-    cable with other devices or swapping to another cable to confirm it is not
-    the problem.
-
-  - **Be sure you are supplying adequate power to the board.**  Check the specs of
-    your board and plug in an external power supply.  In many cases just
-    plugging a board into your computer is not enough to power it and other
-    peripherals.
-
-  - **Double check all soldering joints and connections.**  Flakey connections
-    cause many mysterious problems.  See the [guide to excellent soldering](https://learn.adafruit.com/adafruit-guide-excellent-soldering/tools) for examples of good solder joints.
-
-  - **Ensure you are using an official Arduino or Adafruit board.** We can't
-    guarantee a clone board will have the same functionality and work as expected
-    with this code and don't support them.
-
-If you're sure this issue is a defect in the code and checked the steps above
-please fill in the following fields to provide enough troubleshooting information.
-You may delete the guideline and text above to just leave the following details:
-
- Arduino board:  **INSERT ARDUINO BOARD NAME/TYPE HERE**
-
- Arduino IDE version (found in Arduino -> About Arduino menu):  **INSERT ARDUINO
-  VERSION HERE**
-
- List the steps to reproduce the problem below (if possible attach a sketch or
-  copy the sketch code in too): **LIST REPRO STEPS BELOW**
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,26 +0,0 @@
-Thank you for creating a pull request to contribute to Adafruit's GitHub code!
-Before you open the request please review the following guidelines and tips to
-help it be more easily integrated:
-
- **Describe the scope of your change--i.e. what the change does and what parts
-  of the code were modified.**  This will help us understand any risks of integrating
-  the code.
-
- **Describe any known limitations with your change.**  For example if the change
-  doesn't apply to a supported platform of the library please mention it.
-
- **Please run any tests or examples that can exercise your modified code.**  We
-  strive to not break users of the code and running tests/examples helps with this
-  process.
-
-Thank you again for contributing!  We will try to test and integrate the change
-as soon as we can, but be aware we have many GitHub repositories to manage and
-can't immediately respond to every request.  There is no need to bump or check in
-on a pull request (it will clutter the discussion of the request).
-
-Also don't be worried if the request is closed or not integrated--sometimes the
-priorities of Adafruit's GitHub code (education, ease of use) might not match the
-priorities of the pull request.  Don't fret, the open source community thrives on
-forks and GitHub makes it easy to keep your changes in a forked repo.
-
-After reviewing the guidelines above you can delete this text from the pull request.
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +0,0 @@
-
-*.bts*
--- a/.travis.yml
+++ b/.travis.yml
@ -3,7 +3,7 @@ sudo: false
 before_install:
  - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh)
 install:
-  - arduino --install-library "Adafruit SleepyDog Library,Adafruit FONA Library,Adafruit CC3000 Library,Adafruit_WINC1500"
+  - arduino --install-library "Adafruit SleepyDog Library,Adafruit FONA Library,Adafruit CC3000 Library"
 script:
  - build_main_platforms
 notifications:
--- a/Adafruit_MQTT.cpp
+++ b/Adafruit_MQTT.cpp
@ -21,7 +21,7 @@
 // SOFTWARE.
 #include "Adafruit_MQTT.h"

-#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000)
+#ifdef ARDUINO_SAMD_ZERO
 static char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {
  char fmt[20];
  sprintf(fmt, "%%%d.%df", width, prec);
@ -30,24 +30,8 @@ static char *dtostrf (double val, signed char width, unsigned char prec, char *s
 }
 #endif

-#if defined(ESP8266)
-int strncasecmp(const char * str1, const char * str2, int len) {
-    int d = 0;
-    while(len--) {
-        int c1 = tolower(*str1++);
-        int c2 = tolower(*str2++);
-        if(((d = c1 - c2) != 0) || (c2 == '\0')) {
-	  return d;
-        }
-    }
-    return 0;
-}
-#endif
-
-
-void printBuffer(uint8_t *buffer, uint16_t len) {
-  DEBUG_PRINTER.print('\t');
-  for (uint16_t i=0; i<len; i++) {
+void printBuffer(uint8_t *buffer, uint8_t len) {
+  for (uint8_t i=0; i<len; i++) {
    if (isprint(buffer[i]))
      DEBUG_PRINTER.write(buffer[i]);
    else
@ -57,9 +41,7 @@ void printBuffer(uint8_t *buffer, uint16_t len) {
      DEBUG_PRINTER.print("0");
    DEBUG_PRINTER.print(buffer[i],HEX);
    DEBUG_PRINTER.print("], ");
-    if (i % 8 == 7) {
-      DEBUG_PRINTER.print("\n\t");
-    }
+    if (i % 8 == 7) DEBUG_PRINTER.println();
  }
  DEBUG_PRINTER.println();
 }
@ -69,16 +51,16 @@ static uint8_t *stringprint(uint8_t *p, char *s) {
  uint16_t len = strlen(s);
  p[0] = len >> 8; p++;
  p[0] = len & 0xFF; p++;
-  memmove(p, s, len);
+  memcpy(p, s, len);
  return p+len;
 }
 */

-static uint8_t *stringprint(uint8_t *p, const char *s, uint16_t maxlen=0) {
+static uint8_t *stringprint_P(uint8_t *p, const char *s, uint16_t maxlen=0) {
  // If maxlen is specified (has a non-zero value) then use it as the maximum
  // length of the source string to write to the buffer.  Otherwise write
  // the entire source string.
-  uint16_t len = strlen(s);
+  uint16_t len = strlen_P(s);
  if (maxlen > 0 && len > maxlen) {
    len = maxlen;
  }
@ -89,7 +71,7 @@ static uint8_t *stringprint(uint8_t *p, const char *s, uint16_t maxlen=0) {
  */
  p[0] = len >> 8; p++;
  p[0] = len & 0xFF; p++;
-  strncpy((char *)p, s, len);
+  strncpy_P((char *)p, s, len);
  return p+len;
 }

@ -112,15 +94,30 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
    subscriptions[i] = 0;
  }

-  will_topic = 0;
-  will_payload = 0;
-  will_qos = 0;
-  will_retain = 0;
-
  packet_id_counter = 0;

 }

+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;
+  }
+
+  packet_id_counter = 0;
+
+}

 Adafruit_MQTT::Adafruit_MQTT(const char *server,
                             uint16_t port,
@ -137,10 +134,25 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
    subscriptions[i] = 0;
  }

-  will_topic = 0;
-  will_payload = 0;
-  will_qos = 0;
-  will_retain = 0;
+  packet_id_counter = 0;
+
+}
+
+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;
+  }

  packet_id_counter = 0;

@ -157,7 +169,7 @@ int8_t Adafruit_MQTT::connect() {
    return -1;

  // Read connect response packet and verify it
-  len = readFullPacket(buffer, MAXBUFFERSIZE, CONNECT_TIMEOUT_MS);
+  len = readPacket(buffer, 4, CONNECT_TIMEOUT_MS);
  if (len != 4)
    return -1;
  if ((buffer[0] != (MQTT_CTRL_CONNECTACK << 4)) || (buffer[1] != 2))
@ -170,113 +182,37 @@ int8_t Adafruit_MQTT::connect() {
    // Ignore subscriptions that aren't defined.
    if (subscriptions[i] == 0) continue;

-    boolean success = false;
-    for (uint8_t retry=0; (retry<3) && !success; retry++) { // retry until we get a suback    
-      // Construct and send subscription packet.
-      uint8_t len = subscribePacket(buffer, subscriptions[i]->topic, subscriptions[i]->qos);
-      if (!sendPacket(buffer, len))
-	return -1;
+    // Construct and send subscription packet.
+    uint8_t len = subscribePacket(buffer, subscriptions[i]->topic, subscriptions[i]->qos);
+    if (!sendPacket(buffer, len))
+      return -1;

-      if(MQTT_PROTOCOL_LEVEL < 3) // older versions didn't suback
-	break;
+    // Check for SUBACK if using MQTT 3.1.1 or higher
+    // TODO: The Server is permitted to start sending PUBLISH packets matching the
+    // Subscription before the Server sends the SUBACK Packet.
+    // if(MQTT_PROTOCOL_LEVEL > 3) {
+    //   len = readPacket(buffer, 5, CONNECT_TIMEOUT_MS);
+    //   DEBUG_PRINT(F("SUBACK:\t"));
+    //   DEBUG_PRINTBUFFER(buffer, len);
+    //   if ((len != 5) || (buffer[0] != (MQTT_CTRL_SUBACK << 4))) {
+    //     return 6;  // failure to subscribe
+    //   }
+    // }

-      // Check for SUBACK if using MQTT 3.1.1 or higher
-      // TODO: The Server is permitted to start sending PUBLISH packets matching the
-      // Subscription before the Server sends the SUBACK Packet. (will really need to use callbacks - ada)
-
-      //Serial.println("\t**looking for suback");
-      if (processPacketsUntil(buffer, MQTT_CTRL_SUBACK, SUBACK_TIMEOUT_MS)) {
-	success = true;
-	break;
-      }
-      //Serial.println("\t**failed, retrying!");
-    }
-    if (! success) return -2; // failed to sub for some reason
  }

  return 0;
 }

-int8_t Adafruit_MQTT::connect(const char *user, const char *pass)
-{
-  username = user;
-  password = pass;
-  return connect();
-}
-
-uint16_t Adafruit_MQTT::processPacketsUntil(uint8_t *buffer, uint8_t waitforpackettype, uint16_t timeout) {
-  uint16_t len;
-  while (len = readFullPacket(buffer, MAXBUFFERSIZE, timeout)) {
-
-    //DEBUG_PRINT("Packet read size: "); DEBUG_PRINTLN(len);
-    // TODO: add subscription reading & call back processing here
-
-    if ((buffer[0] >> 4) == waitforpackettype) {
-      //DEBUG_PRINTLN(F("Found right packet")); 
-      return len;
-    } else {
-      ERROR_PRINTLN(F("Dropped a packet"));
-    }
-  }
-  return 0;
-}
-
-uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t maxsize, uint16_t timeout) {
-  // will read a packet and Do The Right Thing with length
-  uint8_t *pbuff = buffer;
-
-  uint8_t rlen;
-
-  // read the packet type:
-  rlen = readPacket(pbuff, 1, timeout);
-  if (rlen != 1) return 0;
-
-  DEBUG_PRINT(F("Packet Type:\t")); DEBUG_PRINTBUFFER(pbuff, rlen);
-  pbuff++;
-
-  uint32_t value = 0;
-  uint32_t multiplier = 1;
-  uint8_t encodedByte;
-
-  do {
-    rlen = readPacket(pbuff, 1, timeout);
-    if (rlen != 1) return 0;
-    encodedByte = pbuff[0]; // save the last read val
-    pbuff++; // get ready for reading the next byte
-    uint32_t intermediate = encodedByte & 0x7F;
-    intermediate *= multiplier;
-    value += intermediate;
-    multiplier *= 128;
-    if (multiplier > (128UL*128UL*128UL)) {
-      DEBUG_PRINT(F("Malformed packet len\n"));
-      return 0;
-    }
-  } while (encodedByte & 0x80);
-
-  DEBUG_PRINT(F("Packet Length:\t")); DEBUG_PRINTLN(value);
-  
-  if (value > (maxsize - (pbuff-buffer) - 1)) {
-      DEBUG_PRINTLN(F("Packet too big for buffer"));
-      rlen = readPacket(pbuff, (maxsize - (pbuff-buffer) - 1), timeout);
-  } else {
-    rlen = readPacket(pbuff, value, timeout);
-  }
-  //DEBUG_PRINT(F("Remaining packet:\t")); DEBUG_PRINTBUFFER(pbuff, rlen);
-
-  return ((pbuff - buffer)+rlen);
-}
-
 const __FlashStringHelper* Adafruit_MQTT::connectErrorString(int8_t code) {
   switch (code) {
-      case 1: return F("The Server does not support the level of the MQTT protocol requested");
-      case 2: return F("The Client identifier is correct UTF-8 but not allowed by the Server");
-      case 3: return F("The MQTT service is unavailable");
-      case 4: return F("The data in the user name or password is malformed");
-      case 5: return F("Not authorized to connect");
-      case 6: return F("Exceeded reconnect rate limit. Please try again later.");
-      case 7: return F("You have been banned from connecting. Please contact the MQTT server administrator for more details.");
+      case 1: return F("Wrong protocol");
+      case 2: return F("ID rejected");
+      case 3: return F("Server unavail");
+      case 4: return F("Bad user/pass");
+      case 5: return F("Not authed");
+      case 6: return F("Failed to subscribe");
      case -1: return F("Connection failed");
-      case -2: return F("Failed to subscribe");
      default: return F("Unknown error");
   }
 }
@ -294,31 +230,27 @@ bool Adafruit_MQTT::disconnect() {


 bool Adafruit_MQTT::publish(const char *topic, const char *data, uint8_t qos) {
-    return publish(topic, (uint8_t*)(data), strlen(data), qos);
-}
-
-bool Adafruit_MQTT::publish(const char *topic, uint8_t *data, uint16_t bLen, uint8_t qos) {
  // Construct and send publish packet.
-  uint16_t len = publishPacket(buffer, topic, data, bLen, qos);
+  uint8_t len = publishPacket(buffer, topic, data, qos);
  if (!sendPacket(buffer, len))
    return false;

  // If QOS level is high enough verify the response packet.
  if (qos > 0) {
-    len = readFullPacket(buffer, MAXBUFFERSIZE, PUBLISH_TIMEOUT_MS);
+    len = readPacket(buffer, 4, PUBLISH_TIMEOUT_MS);
    DEBUG_PRINT(F("Publish QOS1+ reply:\t"));
    DEBUG_PRINTBUFFER(buffer, len);
-    if (len != 4)
+    if (len != 4) 
      return false;
-    if ((buffer[0] >> 4) != MQTT_CTRL_PUBACK)
+    if ((buffer[0] >> 4) != MQTT_CTRL_PUBACK) 
      return false;
    uint16_t packnum = buffer[2];
    packnum <<= 8;
    packnum |= buffer[3];

    // we increment the packet_id_counter right after publishing so inc here too to match
-    packnum++;
-    if (packnum != packet_id_counter)
+    packnum++; 
+    if (packnum != packet_id_counter) 
      return false;
  }

@ -386,17 +318,19 @@ bool Adafruit_MQTT::unsubscribe(Adafruit_MQTT_Subscribe *sub) {
      if(subscriptions[i]->qos > 0 && MQTT_PROTOCOL_LEVEL > 3) {

        // wait for UNSUBACK
-        len = readFullPacket(buffer, MAXBUFFERSIZE, CONNECT_TIMEOUT_MS);
+        len = readPacket(buffer, 5, CONNECT_TIMEOUT_MS);
        DEBUG_PRINT(F("UNSUBACK:\t"));
        DEBUG_PRINTBUFFER(buffer, len);

        if ((len != 5) || (buffer[0] != (MQTT_CTRL_UNSUBACK << 4))) {
          return false;  // failure to unsubscribe
        }
+
      }

      subscriptions[i] = 0;
      return true;
+
    }

  }
@ -406,58 +340,13 @@ bool Adafruit_MQTT::unsubscribe(Adafruit_MQTT_Subscribe *sub) {

 }

-void Adafruit_MQTT::processPackets(int16_t timeout) {
-  uint16_t len;
-
-  uint32_t elapsed = 0, endtime, starttime = millis();
-
-  while (elapsed < (uint32_t)timeout) {
-    Adafruit_MQTT_Subscribe *sub = readSubscription(timeout - elapsed);
-    if (sub) {
-      //Serial.println("**** sub packet received");
-      if (sub->callback_uint32t != NULL) {
-	// huh lets do the callback in integer mode
-	uint32_t data = 0;
-	data = atoi((char *)sub->lastread);
-	//Serial.print("*** calling int callback with : "); Serial.println(data);
-	sub->callback_uint32t(data);
-      } 
-      else if (sub->callback_double != NULL) {
-	// huh lets do the callback in doublefloat mode
-	double data = 0;
-	data = atof((char *)sub->lastread);
-	//Serial.print("*** calling double callback with : "); Serial.println(data);
-	sub->callback_double(data);
-      }
-      else if (sub->callback_buffer != NULL) {
-	// huh lets do the callback in buffer mode
-	//Serial.print("*** calling buffer callback with : "); Serial.println((char *)sub->lastread);
-	sub->callback_buffer((char *)sub->lastread, sub->datalen);
-      }
-      else if (sub->callback_io != NULL) {
-        // huh lets do the callback in io mode
-        //Serial.print("*** calling io instance callback with : "); Serial.println((char *)sub->lastread);
-        ((sub->io_mqtt)->*(sub->callback_io))((char *)sub->lastread, sub->datalen);
-      }
-    }
-
-    // keep track over elapsed time
-    endtime = millis();
-    if (endtime < starttime) {
-      starttime = endtime; // looped around!")
-    }
-    elapsed += (endtime - starttime);
-  }
-}
-
 Adafruit_MQTT_Subscribe *Adafruit_MQTT::readSubscription(int16_t timeout) {
-  uint16_t i, topiclen, datalen;
+  uint8_t i, topiclen, datalen;

  // Check if data is available to read.
-  uint16_t len = readFullPacket(buffer, MAXBUFFERSIZE, timeout); // return one full packet
+  uint16_t len = readPacket(buffer, MAXBUFFERSIZE, timeout, true); // return one full packet
  if (!len)
    return NULL;  // No data available, just quit.
-  DEBUG_PRINT("Packet len: "); DEBUG_PRINTLN(len); 
  DEBUG_PRINTBUFFER(buffer, len);

  // Parse out length of packet.
@ -469,11 +358,11 @@ Adafruit_MQTT_Subscribe *Adafruit_MQTT::readSubscription(int16_t timeout) {
    if (subscriptions[i]) {
      // Skip this subscription if its name length isn't the same as the
      // received topic name.
-      if (strlen(subscriptions[i]->topic) != topiclen)
+      if (strlen_P(subscriptions[i]->topic) != topiclen)
        continue;
      // Stop if the subscription topic matches the received topic. Be careful
      // to make comparison case insensitive.
-      if (strncasecmp((char*)buffer+4, subscriptions[i]->topic, topiclen) == 0) {
+      if (strncasecmp_P((char*)buffer+4, subscriptions[i]->topic, topiclen) == 0) {
        DEBUG_PRINT(F("Found sub #")); DEBUG_PRINTLN(i);
        break;
      }
@ -481,38 +370,19 @@ Adafruit_MQTT_Subscribe *Adafruit_MQTT::readSubscription(int16_t timeout) {
  }
  if (i==MAXSUBSCRIPTIONS) return NULL; // matching sub not found ???

-  uint8_t packet_id_len = 0;
-  uint16_t packetid;
-  // Check if it is QoS 1, TODO: we dont support QoS 2
-  if ((buffer[0] & 0x6) == 0x2) {
-    packet_id_len = 2;
-    packetid = buffer[topiclen+4];
-    packetid <<= 8;
-    packetid |= buffer[topiclen+5];
-  }
-
  // zero out the old data
  memset(subscriptions[i]->lastread, 0, SUBSCRIPTIONDATALEN);

-  datalen = len - topiclen - packet_id_len - 4;
+  datalen = len - topiclen - 4;
  if (datalen > SUBSCRIPTIONDATALEN) {
    datalen = SUBSCRIPTIONDATALEN-1; // cut it off
  }
  // extract out just the data, into the subscription object itself
-  memmove(subscriptions[i]->lastread, buffer+4+topiclen+packet_id_len, datalen);
+  memcpy(subscriptions[i]->lastread, buffer+4+topiclen, datalen);
  subscriptions[i]->datalen = datalen;
  DEBUG_PRINT(F("Data len: ")); DEBUG_PRINTLN(datalen);
  DEBUG_PRINT(F("Data: ")); DEBUG_PRINTLN((char *)subscriptions[i]->lastread);

-  if ((MQTT_PROTOCOL_LEVEL > 3) &&(buffer[0] & 0x6) == 0x2) {
-    uint8_t ackpacket[4];
-    
-    // Construct and send puback packet.
-    uint8_t len = pubackPacket(ackpacket, packetid);
-    if (!sendPacket(ackpacket, len))
-      DEBUG_PRINT(F("Failed"));
-  }
-
  // return the valid matching subscription
  return subscriptions[i];
 }
@ -524,20 +394,20 @@ void Adafruit_MQTT::flushIncoming(uint16_t timeout) {
 }

 bool Adafruit_MQTT::ping(uint8_t num) {
-  //flushIncoming(100);
+  flushIncoming(100);

  while (num--) {
    // Construct and send ping packet.
    uint8_t len = pingPacket(buffer);
    if (!sendPacket(buffer, len))
      continue;
-
+    
    // Process ping reply.
-    len = processPacketsUntil(buffer, MQTT_CTRL_PINGRESP, PING_TIMEOUT_MS);
+    len = readPacket(buffer, 2, PING_TIMEOUT_MS);
    if (buffer[0] == (MQTT_CTRL_PINGRESP << 4))
      return true;
  }
-
+    
  return false;
 }

@ -558,9 +428,9 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
  // fill in packet[1] last

 #if MQTT_PROTOCOL_LEVEL == 3
-    p = stringprint(p, "MQIsdp");
+    p = stringprint_P(p, PSTR("MQIsdp"));
 #elif MQTT_PROTOCOL_LEVEL == 4
-    p = stringprint(p, "MQTT");
+    p = stringprint_P(p, PSTR("MQTT"));
 #else
    #error "MQTT level not supported"
 #endif
@ -598,10 +468,10 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
  p++;

  if(MQTT_PROTOCOL_LEVEL == 3) {
-    p = stringprint(p, clientid, 23);  // Limit client ID to first 23 characters.
+    p = stringprint_P(p, clientid, 23);  // Limit client ID to first 23 characters.
  } else {
    if (pgm_read_byte(clientid) != 0) {
-      p = stringprint(p, clientid);
+      p = stringprint_P(p, clientid);
    } else {
      p[0] = 0x0;
      p++;
@ -612,15 +482,15 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
  }

  if (will_topic && pgm_read_byte(will_topic) != 0) {
-    p = stringprint(p, will_topic);
-    p = stringprint(p, will_payload);
+    p = stringprint_P(p, will_topic);
+    p = stringprint_P(p, will_payload);
  }

  if (pgm_read_byte(username) != 0) {
-    p = stringprint(p, username);
+    p = stringprint_P(p, username);
  }
  if (pgm_read_byte(password) != 0) {
-    p = stringprint(p, password);
+    p = stringprint_P(p, password);
  }

  len = p - packet;
@ -631,39 +501,18 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
  return len;
 }

-
 // as per http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718040
-uint16_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
-                                     uint8_t *data, uint16_t bLen, uint8_t qos) {
+uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic, 
+                                     const char *data, uint8_t qos) {
  uint8_t *p = packet;
-  uint16_t len=0;
+  uint16_t len;

-  // calc length of non-header data
-  len += 2;               // two bytes to set the topic size
-  len += strlen(topic); // topic length
-  if(qos > 0) { 
-    len += 2; // qos packet id
-  }
-  len += bLen; // payload length
-
-  // Now you can start generating the packet!
  p[0] = MQTT_CTRL_PUBLISH << 4 | qos << 1;
-  p++;
-
  // fill in packet[1] last
-  do {
-    uint8_t encodedByte = len % 128;
-    len /= 128;
-    // if there are more data to encode, set the top bit of this byte
-    if ( len > 0 ) {
-      encodedByte |= 0x80;
-    }
-    p[0] = encodedByte;
-    p++;
-  } while ( len > 0 );
+  p+=2;

  // topic comes before packet identifier
-  p = stringprint(p, topic);
+  p = stringprint_P(p, topic);

  // add packet identifier. used for checking PUBACK in QOS > 0
  if(qos > 0) {
@ -675,15 +524,16 @@ uint16_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
    packet_id_counter++;
  }

-  memmove(p, data, bLen);
-  p+= bLen;
+  memcpy(p, data, strlen(data));
+  p+=strlen(data);
  len = p - packet;
+  packet[1] = len-2; // don't include the 2 bytes of fixed header data
  DEBUG_PRINTLN(F("MQTT publish packet:"));
  DEBUG_PRINTBUFFER(buffer, len);
  return len;
 }

-uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
+uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic, 
                                       uint8_t qos) {
  uint8_t *p = packet;
  uint16_t len;
@ -700,7 +550,7 @@ uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
  // increment the packet id
  packet_id_counter++;

-  p = stringprint(p, topic);
+  p = stringprint_P(p, topic);

  p[0] = qos;
  p++;
@ -712,8 +562,6 @@ uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
  return len;
 }

-
-
 uint8_t Adafruit_MQTT::unsubscribePacket(uint8_t *packet, const char *topic) {

  uint8_t *p = packet;
@ -731,7 +579,7 @@ uint8_t Adafruit_MQTT::unsubscribePacket(uint8_t *packet, const char *topic) {
  // increment the packet id
  packet_id_counter++;

-  p = stringprint(p, topic);
+  p = stringprint_P(p, topic);

  len = p - packet;
  packet[1] = len-2; // don't include the 2 bytes of fixed header data
@ -749,16 +597,6 @@ uint8_t Adafruit_MQTT::pingPacket(uint8_t *packet) {
  return 2;
 }

-uint8_t Adafruit_MQTT::pubackPacket(uint8_t *packet, uint16_t packetid) {
-  packet[0] = MQTT_CTRL_PUBACK << 4;
-  packet[1] = 2;
-  packet[2] = packetid >> 8;
-  packet[3] = packetid;
-  DEBUG_PRINTLN(F("MQTT puback packet:"));
-  DEBUG_PRINTBUFFER(buffer, 4);
-  return 4;
-}
-
 uint8_t Adafruit_MQTT::disconnectPacket(uint8_t *packet) {
  packet[0] = MQTT_CTRL_DISCONNECT << 4;
  packet[1] = 0;
@ -769,77 +607,55 @@ uint8_t Adafruit_MQTT::disconnectPacket(uint8_t *packet) {

 // Adafruit_MQTT_Publish Definition ////////////////////////////////////////////

-Adafruit_MQTT_Publish::Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver,
+Adafruit_MQTT_Publish::Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver, 
                                             const char *feed, uint8_t q) {
  mqtt = mqttserver;
  topic = feed;
  qos = q;
 }
-bool Adafruit_MQTT_Publish::publish(int32_t i) {
-  char payload[12];
-  ltoa(i, payload, 10);
-  return mqtt->publish(topic, payload, qos);
+
+Adafruit_MQTT_Publish::Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver,
+                                             const __FlashStringHelper *feed, uint8_t q) {
+  mqtt = mqttserver;
+  topic = (const char *)feed;
+  qos = q;
 }

-bool Adafruit_MQTT_Publish::publish(uint32_t i) {
-  char payload[11];
-  ultoa(i, payload, 10);
+bool Adafruit_MQTT_Publish::publish(int32_t i) {
+  char payload[18];
+  itoa(i, payload, 10);
  return mqtt->publish(topic, payload, qos);
 }

 bool Adafruit_MQTT_Publish::publish(double f, uint8_t precision) {
-  char payload[41];  // Need to technically hold float max, 39 digits and minus sign.
+  char payload[40];  // Need to technically hold float max, 39 digits and minus sign.
  dtostrf(f, 0, precision, payload);
  return mqtt->publish(topic, payload, qos);
 }

+bool Adafruit_MQTT_Publish::publish(uint32_t i) {
+  char payload[18];
+  itoa(i, payload, 10);
+  return mqtt->publish(topic, payload, qos);
+}
+
 bool Adafruit_MQTT_Publish::publish(const char *payload) {
  return mqtt->publish(topic, payload, qos);
 }

-//publish buffer of arbitrary length
-bool Adafruit_MQTT_Publish::publish(uint8_t *payload, uint16_t bLen) {
-
-  return mqtt->publish(topic, payload, bLen, qos);
-}
-

 // Adafruit_MQTT_Subscribe Definition //////////////////////////////////////////

-Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver,
+Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver, 
                                                 const char *feed, uint8_t q) {
  mqtt = mqttserver;
  topic = feed;
  qos = q;
-  datalen = 0;
-  callback_uint32t = 0;
-  callback_buffer = 0;
-  callback_double = 0;
-  callback_io = 0;
-  io_mqtt = 0;
 }

-void Adafruit_MQTT_Subscribe::setCallback(SubscribeCallbackUInt32Type cb) {
-  callback_uint32t = cb;
-}
-
-void Adafruit_MQTT_Subscribe::setCallback(SubscribeCallbackDoubleType cb) {
-  callback_double = cb;
-}
-
-void Adafruit_MQTT_Subscribe::setCallback(SubscribeCallbackBufferType cb) {
-  callback_buffer = cb;
-}
-
-void Adafruit_MQTT_Subscribe::setCallback(AdafruitIO_MQTT *io, SubscribeCallbackIOType cb) {
-  callback_io = cb;
-  io_mqtt= io;
-}
-
-void Adafruit_MQTT_Subscribe::removeCallback(void) {
-  callback_uint32t = 0;
-  callback_buffer = 0;
-  callback_double = 0;
-  callback_io = 0;
-  io_mqtt = 0;
+Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver,
+                                                 const __FlashStringHelper *feed, uint8_t q) {
+  mqtt = mqttserver;
+  topic = (const char *)feed;
+  qos = q;
 }
--- a/Adafruit_MQTT.h
+++ b/Adafruit_MQTT.h
@ -29,14 +29,8 @@
 #define strncasecmp_P(f1, f2, len) strncasecmp((f1), (f2), (len))
 #endif

-#define ADAFRUIT_MQTT_VERSION_MAJOR 0
-#define ADAFRUIT_MQTT_VERSION_MINOR 17
-#define ADAFRUIT_MQTT_VERSION_PATCH 0
-
 // Uncomment/comment to turn on/off debug output messages.
 //#define MQTT_DEBUG
-// Uncomment/comment to turn on/off error output messages.
-#define MQTT_ERROR

 // Set where debug messages will be printed.
 #define DEBUG_PRINTER Serial
@ -53,16 +47,6 @@
  #define DEBUG_PRINTBUFFER(buffer, len) {}
 #endif

-#ifdef MQTT_ERROR
-  #define ERROR_PRINT(...) { DEBUG_PRINTER.print(__VA_ARGS__); }
-  #define ERROR_PRINTLN(...) { DEBUG_PRINTER.println(__VA_ARGS__); }
-  #define ERROR_PRINTBUFFER(buffer, len) { printBuffer(buffer, len); }
-#else
-  #define ERROR_PRINT(...) {}
-  #define ERROR_PRINTLN(...) {}
-  #define ERROR_PRINTBUFFER(buffer, len) {}
-#endif
-
 // Use 3 (MQTT 3.0) or 4 (MQTT 3.1.1)
 #define MQTT_PROTOCOL_LEVEL 4

@ -84,10 +68,9 @@
 #define MQTT_QOS_1 0x1
 #define MQTT_QOS_0 0x0

-#define CONNECT_TIMEOUT_MS 6000
+#define CONNECT_TIMEOUT_MS 3000
 #define PUBLISH_TIMEOUT_MS 500
 #define PING_TIMEOUT_MS    500
-#define SUBACK_TIMEOUT_MS  500

 // Adjust as necessary, in seconds.  Default to 5 minutes.
 #define MQTT_CONN_KEEPALIVE 300
@ -95,7 +78,7 @@
 // Largest full packet we're able to send.
 // Need to be able to store at least ~90 chars for a connect packet with full
 // 23 char client ID.
-#define MAXBUFFERSIZE (150)
+#define MAXBUFFERSIZE (125)

 #define MQTT_CONN_USERNAMEFLAG    0x80
 #define MQTT_CONN_PASSWORDFLAG    0x40
@ -110,24 +93,10 @@

 // how much data we save in a subscription object
 // eg max-subscription-payload-size
-#if defined  (__AVR_ATmega32U4__) || defined(__AVR_ATmega328P__)
-  #define SUBSCRIPTIONDATALEN 20
-#else
-  #define SUBSCRIPTIONDATALEN 100
-#endif
+#define SUBSCRIPTIONDATALEN 20

-class AdafruitIO_MQTT;   // forward decl

-//Function pointer that returns an int
-typedef void (*SubscribeCallbackUInt32Type)(uint32_t);
-// returns a double
-typedef void (*SubscribeCallbackDoubleType)(double);
-// returns a chunk of raw data
-typedef void (*SubscribeCallbackBufferType)(char *str, uint16_t len);
-// returns an io data wrapper instance
-typedef void (AdafruitIO_MQTT::*SubscribeCallbackIOType)(char *str, uint16_t len);
-
-extern void printBuffer(uint8_t *buffer, uint16_t len);
+extern void printBuffer(uint8_t *buffer, uint8_t len);

 class Adafruit_MQTT_Subscribe;  // forward decl

@ -138,11 +107,19 @@ 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 = "");
+                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
@ -157,7 +134,6 @@ class Adafruit_MQTT {
  // Use connectErrorString() to get a printable string version of the
  // error.
  int8_t connect();
-  int8_t connect(const char *user, const char *pass);

  // Return a printable string version of the error code returned by
  // connect(). This returns a __FlashStringHelper*, which points to a
@ -175,11 +151,18 @@ class Adafruit_MQTT {
  // to be called before connect() because it is sent as part of the
  // connect control packet.
  bool will(const char *topic, const char *payload, uint8_t qos = 0, uint8_t retain = 0);
+  bool will(const __FlashStringHelper *topic, const char *payload, uint8_t qos = 0, uint8_t retain = 0) {
+    return will((const char *)topic, payload, qos, retain);
+  }

  // Publish a message to a topic using the specified QoS level.  Returns true
  // if the message was published, false otherwise.
+  // The topic must be stored in PROGMEM. It can either be a
+  // char*, or a __FlashStringHelper* (the result of the F() macro).
  bool publish(const char *topic, const char *payload, uint8_t qos = 0);
-  bool publish(const char *topic, uint8_t *payload, uint16_t bLen, uint8_t qos = 0);
+  bool publish(const __FlashStringHelper *topic, const char *payload, uint8_t qos = 0) {
+    return publish((const char *)topic, payload, qos);
+  }

  // Add a subscription to receive messages for a topic.  Returns true if the
  // subscription could be added or was already present, false otherwise.
@ -196,8 +179,6 @@ class Adafruit_MQTT {
  // that subscribe should be called first for each topic that receives messages!
  Adafruit_MQTT_Subscribe *readSubscription(int16_t timeout=0);

-  void processPackets(int16_t timeout);
-
  // Ping the server to ensure the connection is still alive.
  bool ping(uint8_t n = 1);

@ -211,17 +192,14 @@ class Adafruit_MQTT {
  virtual bool disconnectServer() = 0;  // Subclasses need to fill this in!

  // Send data to the server specified by the buffer and length of data.
-  virtual bool sendPacket(uint8_t *buffer, uint16_t len) = 0;
+  virtual bool sendPacket(uint8_t *buffer, uint8_t len) = 0;

  // Read MQTT packet from the server.  Will read up to maxlen bytes and store
  // the data in the provided buffer.  Waits up to the specified timeout (in
-  // milliseconds) for data to be available. 
-  virtual uint16_t readPacket(uint8_t *buffer, uint16_t maxlen, int16_t timeout) = 0;
-
-  // Read a full packet, keeping note of the correct length
-  uint16_t readFullPacket(uint8_t *buffer, uint16_t maxsize, uint16_t timeout);
-  // Properly process packets until you get to one you want
-  uint16_t processPacketsUntil(uint8_t *buffer, uint8_t waitforpackettype, uint16_t timeout);
+  // milliseconds) for data to be available.  If checkForValidPubPacket is true
+  // then the received data is verified to make sure it's a complete packet.
+  virtual uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
+                              bool checkForValidPubPacket = false) = 0;

  // Shared state that subclasses can use:
  const char *servername;
@ -244,25 +222,23 @@ class Adafruit_MQTT {
  // Functions to generate MQTT packets.
  uint8_t connectPacket(uint8_t *packet);
  uint8_t disconnectPacket(uint8_t *packet);
-  uint16_t publishPacket(uint8_t *packet, const char *topic, uint8_t *payload, uint16_t bLen, uint8_t qos);
+  uint8_t publishPacket(uint8_t *packet, const char *topic, const char *payload, uint8_t qos);
  uint8_t subscribePacket(uint8_t *packet, const char *topic, uint8_t qos);
  uint8_t unsubscribePacket(uint8_t *packet, const char *topic);
  uint8_t pingPacket(uint8_t *packet);
-  uint8_t pubackPacket(uint8_t *packet, uint16_t packetid);
 };


 class Adafruit_MQTT_Publish {
 public:
  Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver, const char *feed, uint8_t qos = 0);
+  Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver, const __FlashStringHelper *feed, uint8_t qos = 0);

  bool publish(const char *s);
  bool publish(double f, uint8_t precision=2);  // Precision controls the minimum number of digits after decimal.
                                                // This might be ignored and a higher precision value sent.
  bool publish(int32_t i);
  bool publish(uint32_t i);
-  bool publish(uint8_t *b, uint16_t bLen);
-

 private:
  Adafruit_MQTT *mqtt;
@ -273,12 +249,9 @@ private:
 class Adafruit_MQTT_Subscribe {
 public:
  Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver, const char *feedname, uint8_t q=0);
+  Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver, const __FlashStringHelper *feedname, uint8_t q=0);

-  void setCallback(SubscribeCallbackUInt32Type callb);
-  void setCallback(SubscribeCallbackDoubleType callb);
-  void setCallback(SubscribeCallbackBufferType callb);
-  void setCallback(AdafruitIO_MQTT *io, SubscribeCallbackIOType callb);
-  void removeCallback(void);
+  bool setCallback(void (*callback)(char *));

  const char *topic;
  uint8_t qos;
@ -286,15 +259,7 @@ class Adafruit_MQTT_Subscribe {
  uint8_t lastread[SUBSCRIPTIONDATALEN];
  // Number valid bytes in lastread. Limited to SUBSCRIPTIONDATALEN-1 to
  // ensure nul terminating lastread.
-  uint16_t datalen;
-
-  SubscribeCallbackUInt32Type callback_uint32t;
-  SubscribeCallbackDoubleType callback_double;
-  SubscribeCallbackBufferType callback_buffer;
-  SubscribeCallbackIOType     callback_io;
-
-  AdafruitIO_MQTT *io_mqtt;
-
+  uint8_t datalen;
 private:
  Adafruit_MQTT *mqtt;
 };
--- a/Adafruit_MQTT_CC3000.h
+++ b/Adafruit_MQTT_CC3000.h
@ -0,0 +1,163 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 Adafruit Industries
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+#ifndef _ADAFRUIT_MQTT_CC3000_H_
+#define _ADAFRUIT_MQTT_CC3000_H_
+
+#include <Adafruit_SleepyDog.h>
+#include <Adafruit_CC3000.h>
+#include "Adafruit_MQTT.h"
+
+
+// delay in ms between calls of available()
+#define MQTT_CC3000_INTERAVAILDELAY 10
+
+
+// CC3000-specific version of the Adafruit_MQTT class.
+// Note that this is defined as a header-only class to prevent issues with using
+// the library on non-CC3000 platforms (since Arduino will include all .cpp files
+// in the compilation of the library).
+class Adafruit_MQTT_CC3000 : public Adafruit_MQTT {
+ public:
+  Adafruit_MQTT_CC3000(Adafruit_CC3000 *cc3k, const char *server, uint16_t port,
+                       const char *cid, const char *user, const char *pass):
+    Adafruit_MQTT(server, port, cid, user, pass),
+    cc3000(cc3k)
+  {}
+
+  Adafruit_MQTT_CC3000(Adafruit_CC3000 *cc3k, const char *server, uint16_t port,
+                       const char *user, const char *pass):
+    Adafruit_MQTT(server, port, user, pass),
+    cc3000(cc3k)
+  {}
+
+  bool connectServer() {
+    uint32_t ip = 0;
+
+    Watchdog.reset();
+
+    // look up IP address
+    if (serverip == 0) {
+      // Try looking up the website's IP address using CC3K's built in getHostByName
+      strcpy_P((char *)buffer, servername);
+      Serial.print((char *)buffer); Serial.print(F(" -> "));
+      uint8_t dnsretries = 5;
+
+      Watchdog.reset();
+      while (ip == 0) {
+        if (! cc3000->getHostByName((char *)buffer, &ip)) {
+          Serial.println(F("Couldn't resolve!"));
+          dnsretries--;
+          Watchdog.reset();
+        }
+        //Serial.println("OK"); Serial.println(ip, HEX);
+        if (!dnsretries) return false;
+        delay(500);
+      }
+
+      serverip = ip;
+      cc3000->printIPdotsRev(serverip);
+      Serial.println();
+    }
+
+    Watchdog.reset();
+
+    // connect to server
+    DEBUG_PRINTLN(F("Connecting to TCP"));
+    mqttclient = cc3000->connectTCP(serverip, portnum);
+
+    return mqttclient.connected();
+  }
+
+  bool disconnectServer() {
+    if (connected()) {
+      return (mqttclient.close() == 0);
+    }
+    else {
+      return true;
+    }
+  }
+
+  bool connected() {
+    return mqttclient.connected();
+  }
+
+  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
+                      bool checkForValidPubPacket = false) {
+    /* Read data until either the connection is closed, or the idle timeout is reached. */
+    uint16_t len = 0;
+    int16_t t = timeout;
+
+    while (mqttclient.connected() && (timeout >= 0)) {
+      //DEBUG_PRINT('.');
+      while (mqttclient.available()) {
+        //DEBUG_PRINT('!');
+        char c = mqttclient.read();
+        timeout = t;  // reset the timeout
+        buffer[len] = c;
+        //DEBUG_PRINTLN((uint8_t)c, HEX);
+        len++;
+        if (len == maxlen) {  // we read all we want, bail
+          DEBUG_PRINT(F("Read packet:\t"));
+          DEBUG_PRINTBUFFER(buffer, len);
+          return len;
+        }
+
+        // special case where we just one one publication packet at a time
+        if (checkForValidPubPacket) {
+          if ((buffer[0] == (MQTT_CTRL_PUBLISH << 4)) && (buffer[1] == len-2)) {
+            // oooh a valid publish packet!
+            DEBUG_PRINT(F("Read PUBLISH packet:\t"));
+            DEBUG_PRINTBUFFER(buffer, len);
+            return len;
+          }
+        }
+      }
+      Watchdog.reset();
+      timeout -= MQTT_CC3000_INTERAVAILDELAY;
+      delay(MQTT_CC3000_INTERAVAILDELAY);
+    }
+    return len;
+  }
+
+  bool sendPacket(uint8_t *buffer, uint8_t len) {
+    if (mqttclient.connected()) {
+      uint16_t ret = mqttclient.write(buffer, len);
+      DEBUG_PRINT(F("sendPacket returned: ")); DEBUG_PRINTLN(ret);
+      if (ret != len) {
+        DEBUG_PRINTLN("Failed to send complete packet.")
+        return false;
+      }
+    } else {
+      DEBUG_PRINTLN(F("Connection failed!"));
+      return false;
+    }
+    return true;
+  }
+
+ private:
+  uint32_t serverip;
+  Adafruit_CC3000 *cc3000;
+  Adafruit_CC3000_Client mqttclient;
+};
+
+
+#endif
--- a/Adafruit_MQTT_Client.cpp
+++ b/Adafruit_MQTT_Client.cpp
@ -25,7 +25,7 @@
 bool Adafruit_MQTT_Client::connectServer() {
  // Grab server name from flash and copy to buffer for name resolution.
  memset(buffer, 0, sizeof(buffer));
-  strcpy((char *)buffer, servername);
+  strcpy_P((char *)buffer, servername);
  DEBUG_PRINT(F("Connecting to: ")); DEBUG_PRINTLN((char *)buffer);
  // Connect and check for success (0 result).
  int r = client->connect((char *)buffer, portnum);
@ -47,8 +47,9 @@ bool Adafruit_MQTT_Client::connected() {
  return client->connected();
 }

-uint16_t Adafruit_MQTT_Client::readPacket(uint8_t *buffer, uint16_t maxlen,
-                                          int16_t timeout) {
+uint16_t Adafruit_MQTT_Client::readPacket(uint8_t *buffer, uint8_t maxlen,
+                                          int16_t timeout,
+                                          bool checkForValidPubPacket) {
  /* Read data until either the connection is closed, or the idle timeout is reached. */
  uint16_t len = 0;
  int16_t t = timeout;
@ -63,10 +64,20 @@ uint16_t Adafruit_MQTT_Client::readPacket(uint8_t *buffer, uint16_t maxlen,
      //DEBUG_PRINTLN((uint8_t)c, HEX);
      len++;
      if (len == maxlen) {  // we read all we want, bail
-        DEBUG_PRINT(F("Read data:\t"));
+        DEBUG_PRINT(F("Read packet:\t"));
        DEBUG_PRINTBUFFER(buffer, len);
        return len;
      }
+
+      // special case where we just one one publication packet at a time
+      if (checkForValidPubPacket) {
+        if ((buffer[0] == (MQTT_CTRL_PUBLISH << 4)) && (buffer[1] == len-2)) {
+          // oooh a valid publish packet!
+          DEBUG_PRINT(F("Read PUBLISH packet:\t"));
+          DEBUG_PRINTBUFFER(buffer, len);
+          return len;
+        }
+      }
    }
    timeout -= MQTT_CLIENT_READINTERVAL_MS;
    delay(MQTT_CLIENT_READINTERVAL_MS);
@ -74,27 +85,17 @@ uint16_t Adafruit_MQTT_Client::readPacket(uint8_t *buffer, uint16_t maxlen,
  return len;
 }

-bool Adafruit_MQTT_Client::sendPacket(uint8_t *buffer, uint16_t len) {
-  uint16_t ret = 0;
-
-  while (len > 0) {
-    if (client->connected()) {
-      // send 250 bytes at most at a time, can adjust this later based on Client
-
-      uint16_t sendlen = len > 250 ? 250 : len;
-      //Serial.print("Sending: "); Serial.println(sendlen);
-      ret = client->write(buffer, sendlen);
-      DEBUG_PRINT(F("Client sendPacket returned: ")); DEBUG_PRINTLN(ret);
-      len -= ret;
-
-      if (ret != sendlen) {
-	DEBUG_PRINTLN("Failed to send packet.");
-	return false;
-      }
-    } else {
-      DEBUG_PRINTLN(F("Connection failed!"));
+bool Adafruit_MQTT_Client::sendPacket(uint8_t *buffer, uint8_t len) {
+  if (client->connected()) {
+    uint16_t ret = client->write(buffer, len);
+    DEBUG_PRINT(F("sendPacket returned: ")); DEBUG_PRINTLN(ret);
+    if (ret != len) {
+      DEBUG_PRINTLN("Failed to send complete packet.")
      return false;
    }
+  } else {
+    DEBUG_PRINTLN(F("Connection failed!"));
+    return false;
  }
  return true;
 }
--- a/Adafruit_MQTT_Client.h
+++ b/Adafruit_MQTT_Client.h
@ -42,7 +42,7 @@ class Adafruit_MQTT_Client : public Adafruit_MQTT {
  {}

  Adafruit_MQTT_Client(Client *client, const char *server, uint16_t port,
-                       const char *user="", const char *pass=""):
+                       const char *user, const char *pass):
    Adafruit_MQTT(server, port, user, pass),
    client(client)
  {}
@ -50,8 +50,9 @@ class Adafruit_MQTT_Client : public Adafruit_MQTT {
  bool connectServer();
  bool disconnectServer();
  bool connected();
-  uint16_t readPacket(uint8_t *buffer, uint16_t maxlen, int16_t timeout);
-  bool sendPacket(uint8_t *buffer, uint16_t len);
+  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
+                      bool checkForValidPubPacket = false);
+  bool sendPacket(uint8_t *buffer, uint8_t len);

 private:
  Client* client;
--- a/Adafruit_MQTT_FONA.h
+++ b/Adafruit_MQTT_FONA.h
@ -42,14 +42,14 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
  {}

  Adafruit_MQTT_FONA(Adafruit_FONA *f, const char *server, uint16_t port,
-                     const char *user="", const char *pass=""):
+                     const char *user, const char *pass):
    Adafruit_MQTT(server, port, user, pass),
    fona(f)
  {}

  bool connectServer() {
    char server[40];
-    strncpy(server, servername, 40);
+    strncpy_P(server, servername, 40);
 #ifdef ADAFRUIT_SLEEPYDOG_H
    Watchdog.reset();
 #endif
@ -68,9 +68,10 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
    return fona->TCPconnected();
  }

-  uint16_t readPacket(uint8_t *buffer, uint16_t maxlen, int16_t timeout) {
+  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
+                      bool checkForValidPubPacket = false) {
    uint8_t *buffp = buffer;
-    DEBUG_PRINTLN(F("Reading data.."));
+    DEBUG_PRINTLN(F("Reading a packet.."));

    if (!fona->TCPconnected()) return 0;

@ -81,9 +82,9 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
    uint16_t avail;

    while (fona->TCPconnected() && (timeout >= 0)) {
-      //DEBUG_PRINT('.');
+      DEBUG_PRINT('.');
      while (avail = fona->TCPavailable()) {
-        //DEBUG_PRINT('!');
+        DEBUG_PRINT('!');

        if (len + avail > maxlen) {
 	  avail = maxlen - len;
@ -101,10 +102,21 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
        //DEBUG_PRINTLN((uint8_t)c, HEX);

        if (len == maxlen) {  // we read all we want, bail
-          DEBUG_PRINT(F("Read:\t"));
+          DEBUG_PRINT(F("Read packet:\t"));
          DEBUG_PRINTBUFFER(buffer, len);
-	  return len;
+    return len;
        }
+
+        // special case where we just one one publication packet at a time
+        if (checkForValidPubPacket) {
+          if ((buffer[0] == (MQTT_CTRL_PUBLISH << 4)) && (buffer[1] == len-2)) {
+            // oooh a valid publish packet!
+            DEBUG_PRINT(F("Read PUBLISH packet:\t"));
+            DEBUG_PRINTBUFFER(buffer, len);
+            return len;
+          }
+        }
+
      }
 #ifdef ADAFRUIT_SLEEPYDOG_H
      Watchdog.reset();
@ -113,17 +125,17 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
      timeout -= MQTT_FONA_QUERYDELAY; // this is how long it takes to query the FONA for avail()
      delay(MQTT_FONA_INTERAVAILDELAY);
    }
-    
+
    return len;
  }

-  bool sendPacket(uint8_t *buffer, uint16_t len) {
+  bool sendPacket(uint8_t *buffer, uint8_t len) {
    DEBUG_PRINTLN(F("Writing packet"));
    if (fona->TCPconnected()) {
      boolean ret = fona->TCPsend((char *)buffer, len);
      //DEBUG_PRINT(F("sendPacket returned: ")); DEBUG_PRINTLN(ret);
      if (!ret) {
-        DEBUG_PRINTLN("Failed to send packet.");
+        DEBUG_PRINTLN("Failed to send packet.")
        return false;
      }
    } else {
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 # Adafruit MQTT Library [![Build Status](https://travis-ci.org/adafruit/Adafruit_MQTT_Library.svg?branch=master)](https://travis-ci.org/adafruit/Adafruit_MQTT_Library)

 Arduino library for MQTT support, including access to Adafruit IO.  Works with
-the Adafruit FONA, Arduino Yun, ESP8266 Arduino platforms, and anything that supports
+the Adafruit CC3000, FONA, Arduino Yun, ESP8266 Arduino platforms, and anything that supports
 Arduino's Client interface (like Ethernet shield).

 See included examples for how to use the library to access an MQTT service to
@ -11,7 +11,10 @@ spec but is intended to support enough for QoS 0 and 1 publishing.
 Depends on the following other libraries depending on the target platform:

   - [Adafruit SleepyDog](https://github.com/adafruit/Adafruit_SleepyDog), watchdog
-   library used by FONA code for reliability.
+   library used by FONA and CC3000 code for reliability.
+
+   - [Adafruit CC3000](https://github.com/adafruit/Adafruit_CC3000_Library), required
+   for the CC3000 hardware.

   - [Adafruit FONA](https://github.com/adafruit/Adafruit_FONA_Library), required for
   the FONA hardware.
@ -21,35 +24,3 @@ Future todos:
   - Subscription callbacks

   - remove watchdog
-
-<!-- START COMPATIBILITY TABLE -->
-
-## Compatibility
-
-MCU                | Tested Works | Doesn't Work | Not Tested  | Notes
------------------ | :----------: | :----------: | :---------: | -----
-Atmega328 @ 16MHz  |             |             |     X       | 
-Atmega328 @ 12MHz  |             |             |     X       | 
-Atmega32u4 @ 16MHz |             |             |     X       | 
-Atmega32u4 @ 8MHz  |             |             |     X       | 
-ESP8266            |             |             |     X       | 
-Atmega2560 @ 16MHz |             |             |     X       | 
-ATSAM3X8E          |             |             |     X       | 
-ATSAM21D           |             |             |     X       | 
-ATtiny85 @ 16MHz   |             |             |     X       | 
-ATtiny85 @ 8MHz    |             |             |     X       | 
-Intel Curie @ 32MHz |             |             |     X       | 
-STM32F2            |             |             |     X       | 
-
-  * ATmega328 @ 16MHz : Arduino UNO, Adafruit Pro Trinket 5V, Adafruit Metro 328, Adafruit Metro Mini
-  * ATmega328 @ 12MHz : Adafruit Pro Trinket 3V
-  * ATmega32u4 @ 16MHz : Arduino Leonardo, Arduino Micro, Arduino Yun, Teensy 2.0
-  * ATmega32u4 @ 8MHz : Adafruit Flora, Bluefruit Micro
-  * ESP8266 : Adafruit Huzzah
-  * ATmega2560 @ 16MHz : Arduino Mega
-  * ATSAM3X8E : Arduino Due
-  * ATSAM21D : Arduino Zero, M0 Pro
-  * ATtiny85 @ 16MHz : Adafruit Trinket 5V
-  * ATtiny85 @ 8MHz : Adafruit Gemma, Arduino Gemma, Adafruit Trinket 3V
-
-<!-- END COMPATIBILITY TABLE -->
--- a/examples/adafruitio_anon_time_esp8266/adafruitio_anon_time_esp8266.ino
+++ b/examples/adafruitio_anon_time_esp8266/adafruitio_anon_time_esp8266.ino
@ -1,122 +0,0 @@
-/***************************************************
-  Adafruit MQTT Library ESP8266 Adafruit IO Anonymous Time Query
-
-  Must use the latest version of ESP8266 Arduino from:
-    https://github.com/esp8266/Arduino
-
-  Works great with Adafruit's Huzzah ESP board & Feather
-  ----> https://www.adafruit.com/product/2471
-  ----> https://www.adafruit.com/products/2821
-
-  Adafruit invests time and resources providing this open source code,
-  please support Adafruit and open-source hardware by purchasing
-  products from Adafruit!
-
-  Written by Adafruit Industries.
-  MIT license, all text above must be included in any redistribution
- ****************************************************/
-#include <ESP8266WiFi.h>
-#include "Adafruit_MQTT.h"
-#include "Adafruit_MQTT_Client.h"
-
-/************************* WiFi Access Point *********************************/
-#define WLAN_SSID       "network"
-#define WLAN_PASS       "password"
-
-/************************* Adafruit.io Setup *********************************/
-#define AIO_SERVER      "io.adafruit.com"
-#define AIO_SERVERPORT  8883
-
-WiFiClientSecure client;
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT);
-
-Adafruit_MQTT_Subscribe timefeed = Adafruit_MQTT_Subscribe(&mqtt, "time/seconds");
-
-// set timezone offset from UTC
-int timeZone = -4; // UTC - 4 eastern daylight time (nyc)
-int interval = 4; // trigger every X hours
-
-int last_min = -1;
-
-void timecallback(uint32_t current) {
-  // adjust to local time zone
-  current += (timeZone * 60 * 60);
-  int curr_hour = (current / 60 / 60) % 24;
-  int curr_min  = (current / 60 ) % 60;
-  int curr_sec  = (current) % 60;
-
-  Serial.print("Time: "); 
-  Serial.print(curr_hour); Serial.print(':'); 
-  Serial.print(curr_min); Serial.print(':'); 
-  Serial.println(curr_sec);
-  
-  // only trigger on minute change
-  if(curr_min != last_min) {
-    last_min = curr_min;
-    
-    Serial.println("This will print out every minute!");
-  }
-}
-
-void setup() {
-
-  Serial.begin(115200);
-  delay(10);
-
-  Serial.print(F("\nAdafruit IO anonymous Time Demo"));
-
-  WiFi.begin(WLAN_SSID, WLAN_PASS);
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(F("."));
-  }
-  Serial.println(F(" WiFi connected."));
-
-  timefeed.setCallback(timecallback);
-  mqtt.subscribe(&timefeed);
-
-}
-
-void loop() {
-
-  // Ensure the connection to the MQTT server is alive (this will make the first
-  // connection and automatically reconnect when disconnected).  See the MQTT_connect
-  // function definition further below.
-  MQTT_connect();
-
-  // wait 10 seconds for subscription messages
-  // since we have no other tasks in this example.
-  mqtt.processPackets(10000);
-
-  // keep the connection alive
-  mqtt.ping();
-
-}
-
-// Function to connect and reconnect as necessary to the MQTT server.
-// Should be called in the loop function and it will take care if connecting.
-void MQTT_connect() {
-  int8_t ret;
-
-  // Stop if already connected.
-  if (mqtt.connected()) {
-    return;
-  }
-
-  Serial.print("Connecting to MQTT... ");
-
-  uint8_t retries = 3;
-  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
-       Serial.println(mqtt.connectErrorString(ret));
-       Serial.println("Retrying MQTT connection in 5 seconds...");
-       mqtt.disconnect();
-       delay(5000);  // wait 5 seconds
-       retries--;
-       if (retries == 0) {
-         // basically die and wait for WDT to reset me
-         while (1);
-       }
-  }
-
-  Serial.println("MQTT Connected!");
-}
--- a/examples/adafruitio_errors_esp8266/adafruitio_errors_esp8266.ino
+++ b/examples/adafruitio_errors_esp8266/adafruitio_errors_esp8266.ino
@ -1,155 +0,0 @@
-/***************************************************
-  Adafruit MQTT Library ESP8266 Example
-
-  Must use ESP8266 Arduino from:
-    https://github.com/esp8266/Arduino
-
-  Works great with Adafruit's Huzzah ESP board & Feather
-  ----> https://www.adafruit.com/product/2471
-  ----> https://www.adafruit.com/products/2821
-
-  Adafruit invests time and resources providing this open source code,
-  please support Adafruit and open-source hardware by purchasing
-  products from Adafruit!
-
-  Written by Tony DiCola for Adafruit Industries.
-  Error examples by Todd Treece for Adafruit Industries.
-  MIT license, all text above must be included in any redistribution
- ****************************************************/
-#include <ESP8266WiFi.h>
-#include "Adafruit_MQTT.h"
-#include "Adafruit_MQTT_Client.h"
-
-/************************* WiFi Access Point *********************************/
-
-#define WLAN_SSID       "...your SSID..."
-#define WLAN_PASS       "...your password..."
-
-/************************* Adafruit.io Setup *********************************/
-
-#define AIO_SERVER      "io.adafruit.com"
-#define AIO_SERVERPORT  1883                   // 8883 for MQTTS
-#define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
-#define AIO_KEY         "...your AIO key..."
-
-/************ Global State (you don't need to change this!) ******************/
-
-// Create an ESP8266 WiFiClient class to connect to the MQTT server.
-WiFiClient client;
-// or... use WiFiFlientSecure for SSL
-//WiFiClientSecure client;
-
-// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_KEY);
-
-/****************************** Feeds ***************************************/
-
-// Setup a feed called 'photocell' for publishing.
-// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, AIO_USERNAME "/feeds/photocell");
-
-// Setup a feed called 'onoff' for subscribing to changes.
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff");
-
-/*************************** Error Reporting *********************************/
-
-Adafruit_MQTT_Subscribe errors = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/errors");
-Adafruit_MQTT_Subscribe throttle = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/throttle");
-
-/*************************** Sketch Code ************************************/
-
-// Bug workaround for Arduino 1.6.6, it seems to need a function declaration
-// for some reason (only affects ESP8266, likely an arduino-builder bug).
-void MQTT_connect();
-
-void setup() {
-  Serial.begin(115200);
-  delay(10);
-
-  Serial.println(F("Adafruit MQTT demo"));
-
-  // Connect to WiFi access point.
-  Serial.println(); Serial.println();
-  Serial.print("Connecting to ");
-  Serial.println(WLAN_SSID);
-
-  WiFi.begin(WLAN_SSID, WLAN_PASS);
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-  Serial.println();
-
-  Serial.println("WiFi connected");
-  Serial.println("IP address: "); Serial.println(WiFi.localIP());
-
-  // Setup MQTT subscription for onoff feed
-  mqtt.subscribe(&onoffbutton);
-
-  // Setup MQTT subscriptions for throttle & error messages
-  mqtt.subscribe(&throttle);
-  mqtt.subscribe(&errors);
-
-}
-
-uint32_t x=0;
-
-void loop() {
-  // Ensure the connection to the MQTT server is alive (this will make the first
-  // connection and automatically reconnect when disconnected).  See the MQTT_connect
-  // function definition further below.
-  MQTT_connect();
-
-  // this is our 'wait for incoming subscription packets' busy subloop
-  // try to spend your time here
-  Adafruit_MQTT_Subscribe *subscription;
-  while ((subscription = mqtt.readSubscription(5000))) {
-    if (subscription == &onoffbutton) {
-      Serial.print(F("Got onoff: "));
-      Serial.println((char *)onoffbutton.lastread);
-    } else if(subscription == &errors) {
-      Serial.print(F("ERROR: "));
-      Serial.println((char *)errors.lastread);
-    } else if(subscription == &throttle) {
-      Serial.println((char *)throttle.lastread);
-    }
-  }
-
-  // Now we can publish stuff!
-  Serial.print(F("\nSending photocell val "));
-  Serial.print(x);
-  Serial.print("...");
-  if (! photocell.publish(x++)) {
-    Serial.println(F("Failed"));
-  } else {
-    Serial.println(F("OK!"));
-  }
-
-}
-
-// Function to connect and reconnect as necessary to the MQTT server.
-// Should be called in the loop function and it will take care if connecting.
-void MQTT_connect() {
-  int8_t ret;
-
-  // Stop if already connected.
-  if (mqtt.connected()) {
-    return;
-  }
-
-  Serial.print("Connecting to MQTT... ");
-
-  uint8_t retries = 3;
-  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
-       Serial.println(mqtt.connectErrorString(ret));
-       Serial.println("Retrying MQTT connection in 5 seconds...");
-       mqtt.disconnect();
-       delay(5000);  // wait 5 seconds
-       retries--;
-       if (retries == 0) {
-         // basically die and wait for WDT to reset me
-         while (1);
-       }
-  }
-  Serial.println("MQTT Connected!");
-}
--- a/examples/adafruitio_secure_esp8266/adafruitio_secure_esp8266.ino
+++ b/examples/adafruitio_secure_esp8266/adafruitio_secure_esp8266.ino
@ -1,161 +0,0 @@
-/***************************************************
-  Adafruit MQTT Library ESP8266 Adafruit IO SSL/TLS example
-
-  Must use the latest version of ESP8266 Arduino from:
-    https://github.com/esp8266/Arduino
-
-  Works great with Adafruit's Huzzah ESP board & Feather
-  ----> https://www.adafruit.com/product/2471
-  ----> https://www.adafruit.com/products/2821
-
-  Adafruit invests time and resources providing this open source code,
-  please support Adafruit and open-source hardware by purchasing
-  products from Adafruit!
-
-  Written by Tony DiCola for Adafruit Industries.
-  SSL/TLS additions by Todd Treece for Adafruit Industries.
-  MIT license, all text above must be included in any redistribution
- ****************************************************/
-#include <ESP8266WiFi.h>
-#include "Adafruit_MQTT.h"
-#include "Adafruit_MQTT_Client.h"
-
-/************************* WiFi Access Point *********************************/
-
-#define WLAN_SSID       "...your SSID..."
-#define WLAN_PASS       "...your password..."
-
-/************************* Adafruit.io Setup *********************************/
-
-#define AIO_SERVER      "io.adafruit.com"
-#define AIO_SERVERPORT  8883                   // 8883 for MQTTS
-#define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
-#define AIO_KEY         "...your AIO key..."
-
-/************ Global State (you don't need to change this!) ******************/
-
-// WiFiFlientSecure for SSL/TLS support
-WiFiClientSecure client;
-
-// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_KEY);
-
-// io.adafruit.com SHA1 fingerprint. Current fingerprint can be verified via: 
-//   echo | openssl s_client -connect io.adafruit.com:443 |& openssl x509 -fingerprint -noout
-#define AIO_SSL_FINGERPRINT "77 00 54 2D DA E7 D8 03 27 31 23 99 EB 27 DB CB A5 4C 57 18"
-
-/****************************** Feeds ***************************************/
-
-// Setup a feed called 'test' for publishing.
-// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Publish test = Adafruit_MQTT_Publish(&mqtt, AIO_USERNAME "/feeds/test");
-
-/*************************** Sketch Code ************************************/
-
-// Bug workaround for Arduino 1.6.6, it seems to need a function declaration
-// for some reason (only affects ESP8266, likely an arduino-builder bug).
-void MQTT_connect();
-void verifyFingerprint();
-
-void setup() {
-  Serial.begin(115200);
-  delay(10);
-
-  Serial.println(F("Adafruit IO MQTTS (SSL/TLS) Example"));
-
-  // Connect to WiFi access point.
-  Serial.println(); Serial.println();
-  Serial.print("Connecting to ");
-  Serial.println(WLAN_SSID);
-
-  delay(1000);
-
-  WiFi.begin(WLAN_SSID, WLAN_PASS);
-  delay(2000);
-
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-  Serial.println();
-
-  Serial.println("WiFi connected");
-  Serial.println("IP address: "); Serial.println(WiFi.localIP());
-
-  // check the fingerprint of io.adafruit.com's SSL cert
-  verifyFingerprint();
-
-}
-
-uint32_t x=0;
-
-void loop() {
-  // Ensure the connection to the MQTT server is alive (this will make the first
-  // connection and automatically reconnect when disconnected).  See the MQTT_connect
-  // function definition further below.
-  MQTT_connect();
-
-  // Now we can publish stuff!
-  Serial.print(F("\nSending val "));
-  Serial.print(x);
-  Serial.print(F(" to test feed..."));
-  if (! test.publish(x++)) {
-    Serial.println(F("Failed"));
-  } else {
-    Serial.println(F("OK!"));
-  }
-
-  // wait a couple seconds to avoid rate limit
-  delay(2000);
-
-}
-
-
-void verifyFingerprint() {
-
-  const char* host = AIO_SERVER;
-
-  Serial.print("Connecting to ");
-  Serial.println(host);
-
-  if (! client.connect(host, AIO_SERVERPORT)) {
-    Serial.println("Connection failed. Halting execution.");
-    while(1);
-  }
-
-  if (client.verify(fingerprint, host)) {
-    Serial.println("Connection secure.");
-  } else {
-    Serial.println("Connection insecure! Halting execution.");
-    while(1);
-  }
-
-}
-
-// Function to connect and reconnect as necessary to the MQTT server.
-// Should be called in the loop function and it will take care if connecting.
-void MQTT_connect() {
-  int8_t ret;
-
-  // Stop if already connected.
-  if (mqtt.connected()) {
-    return;
-  }
-
-  Serial.print("Connecting to MQTT... ");
-
-  uint8_t retries = 3;
-  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
-       Serial.println(mqtt.connectErrorString(ret));
-       Serial.println("Retrying MQTT connection in 5 seconds...");
-       mqtt.disconnect();
-       delay(5000);  // wait 5 seconds
-       retries--;
-       if (retries == 0) {
-         // basically die and wait for WDT to reset me
-         while (1);
-       }
-  }
-
-  Serial.println("MQTT Connected!");
-}
--- a/examples/adafruitio_time_esp8266/adafruitio_time_esp8266.ino
+++ b/examples/adafruitio_time_esp8266/adafruitio_time_esp8266.ino
@ -1,122 +0,0 @@
-/***************************************************
-  Adafruit MQTT Library ESP8266 Adafruit IO SSL/TLS example
-
-  Must use the latest version of ESP8266 Arduino from:
-    https://github.com/esp8266/Arduino
-
-  Works great with Adafruit's Huzzah ESP board & Feather
-  ----> https://www.adafruit.com/product/2471
-  ----> https://www.adafruit.com/products/2821
-
-  Adafruit invests time and resources providing this open source code,
-  please support Adafruit and open-source hardware by purchasing
-  products from Adafruit!
-
-  Written by Tony DiCola for Adafruit Industries.
-  Time additions by Todd Treece for Adafruit Industries.
-  MIT license, all text above must be included in any redistribution
- ****************************************************/
-#include <ESP8266WiFi.h>
-#include "Adafruit_MQTT.h"
-#include "Adafruit_MQTT_Client.h"
-
-/************************* WiFi Access Point *********************************/
-#define WLAN_SSID       "network"
-#define WLAN_PASS       "password"
-
-/************************* Adafruit.io Setup *********************************/
-#define AIO_SERVER      "io.adafruit.com"
-#define AIO_SERVERPORT  8883
-#define AIO_USERNAME    "user"
-#define AIO_KEY         "key"
-
-WiFiClientSecure client;
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_USERNAME, AIO_KEY);
-
-Adafruit_MQTT_Subscribe timefeed = Adafruit_MQTT_Subscribe(&mqtt, "time/seconds");
-
-// set timezone offset from UTC
-int timeZone = -4; // UTC - 4 eastern daylight time (nyc)
-int interval = 4; // trigger every X hours
-int hour = 0; // current hour
-
-void timecallback(uint32_t current) {
-
-  // stash previous hour
-  int previous = hour;
-
-  // adjust to local time zone
-  current += (timeZone * 60 * 60);
-
-  // calculate current hour
-  hour = (current / 60 / 60) % 24;
-
-  // only trigger on interval
-  if((hour != previous) && (hour % interval) == 0) {
-    Serial.println("Run your code here");
-  }
-
-}
-
-void setup() {
-
-  Serial.begin(115200);
-  delay(10);
-
-  Serial.print(F("Adafruit IO Time Demo"));
-
-  WiFi.begin(WLAN_SSID, WLAN_PASS);
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(F("."));
-  }
-  Serial.println(F(" WiFi connected."));
-
-  timefeed.setCallback(timecallback);
-  mqtt.subscribe(&timefeed);
-
-}
-
-void loop() {
-
-  // Ensure the connection to the MQTT server is alive (this will make the first
-  // connection and automatically reconnect when disconnected).  See the MQTT_connect
-  // function definition further below.
-  MQTT_connect();
-
-  // wait 10 seconds for subscription messages
-  // since we have no other tasks in this example.
-  mqtt.processPackets(10000);
-
-  // keep the connection alive
-  mqtt.ping();
-
-}
-
-// Function to connect and reconnect as necessary to the MQTT server.
-// Should be called in the loop function and it will take care if connecting.
-void MQTT_connect() {
-  int8_t ret;
-
-  // Stop if already connected.
-  if (mqtt.connected()) {
-    return;
-  }
-
-  Serial.print("Connecting to MQTT... ");
-
-  uint8_t retries = 3;
-  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
-       Serial.println(mqtt.connectErrorString(ret));
-       Serial.println("Retrying MQTT connection in 5 seconds...");
-       mqtt.disconnect();
-       delay(5000);  // wait 5 seconds
-       retries--;
-       if (retries == 0) {
-         // basically die and wait for WDT to reset me
-         while (1);
-       }
-  }
-
-  Serial.println("MQTT Connected!");
-}
--- a/examples/mqtt_2subs_esp8266/.uno.test.skip
+++ b/examples/mqtt_2subs_esp8266/.uno.test.skip
--- a/examples/mqtt_2subs_esp8266/.zero.test.skip
+++ b/examples/mqtt_2subs_esp8266/.zero.test.skip
--- a/examples/mqtt_2subs_esp8266/mqtt_2subs_esp8266.ino
+++ b/examples/mqtt_2subs_esp8266/mqtt_2subs_esp8266.ino
@ -43,14 +43,23 @@ WiFiClient client;
 // or... use WiFiFlientSecure for SSL
 //WiFiClientSecure client;

+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
 // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_USERNAME, AIO_KEY);
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);

 /****************************** Feeds ***************************************/

 // Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff");
-Adafruit_MQTT_Subscribe slider = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/slider");
+// Setup a feed called 'onoff' for subscribing to changes.
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);
+const char SLIDER_FEED[] PROGMEM = AIO_USERNAME "/feeds/slider";
+Adafruit_MQTT_Subscribe slider = Adafruit_MQTT_Subscribe(&mqtt, SLIDER_FEED);

 /*************************** Sketch Code ************************************/

@ -154,4 +163,4 @@ void MQTT_connect() {
       }
  }
  Serial.println("MQTT Connected!");
-}
+}
--- a/examples/mqtt_arbitrary_data/.due.test.skip
+++ b/examples/mqtt_arbitrary_data/.due.test.skip
--- a/examples/mqtt_arbitrary_data/.leonardo.test.skip
+++ b/examples/mqtt_arbitrary_data/.leonardo.test.skip
--- a/examples/mqtt_arbitrary_data/.uno.test.skip
+++ b/examples/mqtt_arbitrary_data/.uno.test.skip
--- a/examples/mqtt_arbitrary_data/.zero.test.skip
+++ b/examples/mqtt_arbitrary_data/.zero.test.skip
--- a/examples/mqtt_arbitrary_data/README.md
+++ b/examples/mqtt_arbitrary_data/README.md
@ -1,108 +0,0 @@
-# Adafruit MQTT Library Arbitrary Data Publish Example
-
-This example illustrates publishing an arbitrary data packet using the Adafruit MQTT library to an MQTT feed which can then be parsed by the included python subscriber client. Possible usage cases include adding metadata (collection time, sensor info etc) to a datapoint.
-
-![alt-text](https://raw.githubusercontent.com/stuthedew/Adafruit_MQTT_Library/Arbitrary_data_publish/examples/mqtt_arbitrary_data/python_subscriber/mqtt_figure.png "Arbitrary data flow diagram")
-
-My motivation for this was wanting to be able to include metadata to a post.
-Specifically, I was playing around with a [Teviso RD3024 radiation sensor](http://www.teviso.com/en/products/radiation-sensor-rd3024.htm), and a salvaged Americium radiation source from a smoke detector, at varying distances from the sensor. I wanted a way to associate the collection time, and distance between the source and sensor with the actual radiation reading itself.
-
-
---
-
-## Installing and configuring Mosquitto broker (minimal working setup):
-
-####_Installing on Raspberry Pi/Linux:_
-
-```bash
-sudo apt-get install mosquitto
-cd /etc/mosquitto/
-#See "Configuring Mosquitto Broker below"
-```
-
-####_Installing On a Mac:_
-```bash
-brew install mosquitto
-cd /usr/local/etc/mosquitto
-#See "Configuring Mosquitto Broker below"
-```
-
---
-
-####Configuring Mosquitto broker
-```bash
-sudo nano mosquitto.conf
-```
-Now we have to enable a password file to correctly interface with the Adafruit MQTT library. Scroll about two thirds of the way down until you see:
-
-```bash
-# -----------------------------------------------------------------
-# Default authentication and topic access control
-# -----------------------------------------------------------------
-```
-
-You should see `#password_file` about a paragraph after that.
-Change
-
-```bash
-#password_file
-```
-
-To
-
-```bash
-password_file pwfile
-```
-
-Now `ctrl-x` to save and exit.
-
-You're almost done! We just have to create and populate the password file we just configured. The default user info is:
-* **Arduino Subscriber:**
-    * Username: TestUser
-    * Password: TestUser
-
-* **Python Subscriber:**
-    * Username: TestPy
-    * Password: TestPy
-
-```bash
-touch pwfile #create the password file
-mosquitto_passwd pwfile TestUser #Enter and confirm password when prompted
-mosquitto_passwd pwfile TestPy #Enter and confirm password when prompted
-```
-
-####Running Mosquitto broker
-Now run Mosquitto broker to allow Arduino publisher and Python subscriber to communicate
-
-```bash
-mosquitto
-```
-
---
-
-## Using Example Python Subscriber:
-
-####Installing Python subscriber
-Install dependencies if you haven't already
-```bash
-cd ../Adafruit_MQTT_Library/examples/mqtt_arbitrary_buffer/python_subscriber
-pip install -r requirements.txt
-```
-
-
-####Installing Python subscriber
-Run python script with default values and watch your parsed data print out.
-```bash
-python subscriber.py #Add -h flag to see modifiable options
-```
-
-Assuming that the Mosquitto broker is running in the background and the Adafruit_MQTT client (Arduino) is publishing, you should see the example data print out every 10 seconds.
-
-```bash
-MQTT:  Connection successful
-Connection successful
-Subscribed to /feeds/arb_packet
-Received char Array: "Hello!", val1: -4533, val2: 73102, val3: 3354...
-Received char Array: "Hello!", val1: -4533, val2: 83611, val3: 3354...
-Received char Array: "Hello!", val1: -4533, val2: 94115, val3: 3354...
-```
--- a/examples/mqtt_arbitrary_data/mqtt_arbitrary_data.ino
+++ b/examples/mqtt_arbitrary_data/mqtt_arbitrary_data.ino
@ -1,184 +0,0 @@
-/***************************************************
-  Adafruit MQTT Library Arbitrary Data Example
-
-  Must use ESP8266 Arduino from:
-    https://github.com/esp8266/Arduino
-
-  Works great with Adafruit's Huzzah ESP board & Feather
-  ----> https://www.adafruit.com/product/2471
-  ----> https://www.adafruit.com/products/2821
-
-  Adafruit invests time and resources providing this open source code,
-  please support Adafruit and open-source hardware by purchasing
-  products from Adafruit!
-
-  Written by Stuart Feichtinger
-  Modifed from the mqtt_esp8266 example written by Tony DiCola for Adafruit Industries.
-  MIT license, all text above must be included in any redistribution
- ****************************************************/
-#include <ESP8266WiFi.h>
-#include "Adafruit_MQTT.h"
-#include "Adafruit_MQTT_Client.h"
-
-/************************* WiFi Access Point *********************************/
-
-#define WLAN_SSID       "...your SSID..."
-#define WLAN_PASS       "...your password..."
-
-/************************* Adafruit.io Setup *********************************/
-
-#define ARB_SERVER      "...host computer ip address..."
-#define ARB_SERVERPORT  1883                   // use 8883 for SSL
-#define ARB_USERNAME    "TestUser"
-#define ARB_PW         "TestUser"
-
-
-/************ Global State (you don't need to change this!) ******************/
-
-// Create an ESP8266 WiFiClient class to connect to the MQTT server.
-WiFiClient client;
-// or... use WiFiFlientSecure for SSL
-//WiFiClientSecure client;
-
-// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-Adafruit_MQTT_Client mqtt(&client, ARB_SERVER, ARB_SERVERPORT, ARB_USERNAME, ARB_PW);
-
-/****************************** Feeds ***************************************/
-
-// Setup a feed called 'arb_packet' for publishing.
-// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-#define ARB_FEED "/feeds/arb_packet"
-Adafruit_MQTT_Publish ap = Adafruit_MQTT_Publish(&mqtt, ARB_FEED);
-
-
-// Arbitrary Payload
-// Union allows for easier interaction of members in struct form with easy publishing
-// of "raw" bytes
-typedef union{
-    //Customize struct with whatever variables/types you like.
-
-    struct __attribute__((__packed__)){  // packed to eliminate padding for easier parsing.
-        char charAry[10];
-        int16_t val1;
-        unsigned long val2;
-        uint16_t val3;
-    }s;
-
-    uint8_t raw[sizeof(s)];                    // For publishing
-
-    /*
-        // Alternate Option with anonymous struct, but manual byte count:
-
-        struct __attribute__((__packed__)){  // packed to eliminate padding for easier parsing.
-            char charAry[10];       // 10 x 1 byte  =   10 bytes
-            int16_t val1;           // 1 x  2 bytes =   2 bytes
-            unsigned long val2;     // 1 x  4 bytes =   4 bytes
-            uint16_t val3;          // 1 x  2 bytes =   2 bytes
-                                            -------------------
-                                            TOTAL =    18 bytes
-        };
-        uint8_t raw[18];                    // For publishing
-*/
-
-} packet_t;
-
-/*************************** Sketch Code ************************************/
-
-// Bug workaround for Arduino 1.6.6, it seems to need a function declaration
-// for some reason (only affects ESP8266, likely an arduino-builder bug).
-void MQTT_connect();
-
-void setup() {
-  Serial.begin(115200);
-  delay(10);
-
-  Serial.println(F("Adafruit MQTT demo"));
-
-  // Connect to WiFi access point.
-  Serial.println(); Serial.println();
-  Serial.print(F("Connecting to "));
-  Serial.println(WLAN_SSID);
-
-  WiFi.begin(WLAN_SSID, WLAN_PASS);
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(F("."));
-  }
-  Serial.println();
-
-  Serial.println(F("WiFi connected"));
-  Serial.println(F("IP address: ")); Serial.println(WiFi.localIP());
-
-}
-
-packet_t arbPac;
-
-const char strVal[] PROGMEM = "Hello!";
-
-void loop() {
-  // Ensure the connection to the MQTT server is alive (this will make the first
-  // connection and automatically reconnect when disconnected).  See the MQTT_connect
-  // function definition further below.
-  MQTT_connect();
-
-  //Update arbitrary packet values
-  strcpy_P(arbPac.s.charAry, strVal);
-  arbPac.s.val1 = -4533;
-  arbPac.s.val2 = millis();
-  arbPac.s.val3 = 3354;
-
-  /*
-   // Alternate Union with anonymous struct
-   // (see union declaration above)
-
-     strcpy_P(arbPac.charAry, strVal);
-     arbPac.val1 = -4533;
-     arbPac.val2 = millis();
-     arbPac.val3 = 3354;
-  */
-
-  if (! ap.publish(arbPac.raw, sizeof(packet_t)))
-        Serial.println(F("Publish Failed."));
-      else {
-        Serial.println(F("Publish Success!"));
-        delay(500);
-      }
-
-      delay(10000);
-
-
-  // ping the server to keep the mqtt connection alive
-  // NOT required if you are publishing once every KEEPALIVE seconds
-  /*
-  if(! mqtt.ping()) {
-    mqtt.disconnect();
-  }
-  */
-}
-
-// Function to connect and reconnect as necessary to the MQTT server.
-// Should be called in the loop function and it will take care if connecting.
-void MQTT_connect() {
-  int8_t ret;
-
-  // Stop if already connected.
-  if (mqtt.connected()) {
-    return;
-  }
-
-  Serial.print(F("Connecting to MQTT... "));
-
-  uint8_t retries = 3;
-  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
-       Serial.println(mqtt.connectErrorString(ret));
-       Serial.println(F("Retrying MQTT connection in 5 seconds..."));
-       mqtt.disconnect();
-       delay(5000);  // wait 5 seconds
-       retries--;
-       if (retries == 0) {
-         // basically die and wait for WDT to reset me
-         while (1);
-       }
-  }
-  Serial.println(F("MQTT Connected!"));
-}
--- a/examples/mqtt_arbitrary_data/python_subscriber/mqtt_figure.png
+++ b/examples/mqtt_arbitrary_data/python_subscriber/mqtt_figure.png
--- a/examples/mqtt_arbitrary_data/python_subscriber/requirements.txt
+++ b/examples/mqtt_arbitrary_data/python_subscriber/requirements.txt
@ -1 +0,0 @@
-paho-mqtt>=1.1
--- a/examples/mqtt_arbitrary_data/python_subscriber/subscriber.py
+++ b/examples/mqtt_arbitrary_data/python_subscriber/subscriber.py
@ -1,114 +0,0 @@
-'''MQTT subscriber for Adafruit MQTT library mqtt_arbitrary_buffer example'''
-import paho.mqtt.client as mqtt
-import argparse
-import struct
-import array
-import sys
-
-return_str =[
-    "Connection successful",
-    "incorrect protocol version",
-    "invalid client identifier",
-    "server unavailable",
-    "bad username or password",
-    "not authorised"
-    ]
-
-args = None
-
-# The callback for when the client receives a CONNACK response from the server.
-def on_connect(client, userdata, rc):
-    """callback function on connect. Subscribes or exits depending on outcome"""
-    print("MQTT: "),
-    print(return_str[rc])
-    if(rc > 1):
-        print("Connection refused - " + return_str[rc])
-        sys.exit(rc)
-    # Subscribing in on_connect() means that if we lose the connection and
-    # reconnect then subscriptions will be renewed.
-    else:
-        print(return_str[rc])
-        client.subscribe(args.topic)
-        print("Subscribed to {}".format(args.topic))
-
-def on_disconnect(client, userdata, rc):
-    """Callback for disconnect"""
-    if rc != 0:
-        print("Unexpected disconnection.")
-        client.reconnect()
-
-# The callback for when a PUBLISH message is received from the server.
-def on_message(client, userdata, msg):
-    try:
-        pMsg = parseMsg(msg.payload)
-        print("Received char Array: \"{}\", val1: {}, val2: {}, val3: {}...".format(pMsg[0], pMsg[1], pMsg[2], pMsg[3]))
-
-    except Exception as err:
-        print err
-
-
-
-def argBegin():
-    parser = argparse.ArgumentParser(description='MQTT subscriber for Adafruit MQTT library mqtt_arbitrary_buffer example')
-    parser.add_argument("--host", default="localhost", help='mqtt host to connect to. Defaults to localhost.')
-    parser.add_argument("-p", "--port", default=1883, help='network port to connect to. Defaults to 1883.')
-    parser.add_argument("-t", "--topic", nargs='*', default="/feeds/arb_packet", help="mqtt topic to subscribe to. May be repeated multiple times.")
-    parser.add_argument("-u", "--username", default="testPy", help="provide a username (requires MQTT 3.1 broker)")
-    parser.add_argument("-P", "--password", default="testPy", help="provide a password (requires MQTT 3.1 broker)")
-    parser.add_argument("-k", "--keepalive", default=60, help="keep alive in seconds for this client. Defaults to 60.")
-
-    return parser.parse_args()
-
-
-def parseMsg(payload):
-    """Parses C struct from MQTT publisher Adafruit MQTT client to Python list"""
-
-    arr = array.array('B', payload) #convert python list to C-like array of unsigned char (B)
-
-    parsedStruct = struct.Struct('< 10s h L H') #define struct template (see below)
-    '''
-        Format of Struct from Adafruit MQTT client, Arduino, etc:
-
-        Adafruit MQTT client == Little endian (<)
-
-             Var NAME   | C TYPE (python symbol)    | size of member x bytes
-             -------------------------------------------------------------------
-              "charAry" |  uchar (s)               |   10s x 1 = 10 bytes
-              "val1"    |  int16 / short (h)       |   1h  x 2 =  2 bytes
-              "val2"    |  unsigned long (L)       |   1L  x 4 =  4 bytes
-              "val3"    |  uint16/unsigned short(H)|   1H  x 2 =  2 bytes
-              ------------------------------------------------------------------
-                                    Total packet size =         | 18 bytes |
-
-        See Section 7.3.2 of Python struct module documentation for complete format list
-        https://docs.python.org/2/library/struct.html
-    '''
-
-    charAry, val1, val2, val3 = parsedStruct.unpack_from(arr)  #convert byte array to formatted struct
-    charAry = charAry.rstrip(' \t\r\n\0') #remove trailing white space from buffer
-    return charAry, val1, val2, val3
-
-
-
-
-
-
-
-def main():
-    """Wait for incoming message published by Adafruit MQTT client"""
-    global args
-    args = argBegin()
-    client = mqtt.Client()
-    client.on_connect = on_connect
-    client.on_message = on_message
-    client.username_pw_set(args.username, args.password)
-    client.connect(args.host, args.port, args.keepalive)
-
-    # Blocking call that processes network traffic, dispatches callbacks and
-    # handles reconnecting.
-    # Other loop*() functions are available that give a threaded interface and a
-    # manual interface.
-    client.loop_forever()
-
-if __name__ == '__main__':
-    sys.exit(main())
--- a/examples/mqtt_2subs_esp8266/.due.test.skip
+++ b/examples/mqtt_2subs_esp8266/.due.test.skip
--- a/examples/mqtt_2subs_esp8266/.leonardo.test.skip
+++ b/examples/mqtt_2subs_esp8266/.leonardo.test.skip
--- a/examples/mqtt_cc3k/cc3000helper.cpp
+++ b/examples/mqtt_cc3k/cc3000helper.cpp
@ -0,0 +1,131 @@
+#include <Adafruit_SleepyDog.h>
+#include <Adafruit_CC3000.h>
+#include <ccspi.h>
+#include <SPI.h>
+
+//#define STATICIP
+
+#define halt(s) { Serial.println(F( s )); while(1);  }
+
+uint16_t checkFirmwareVersion(void);
+bool displayConnectionDetails(void);
+
+extern Adafruit_CC3000 cc3000;
+
+boolean CC3000connect(const char* wlan_ssid, const char* wlan_pass, uint8_t wlan_security) {
+  Watchdog.reset();
+    
+  // Check for compatible firmware
+  if (checkFirmwareVersion() < 0x113)   halt("Wrong firmware version!");
+  
+  // Delete any old connection data on the module
+  Serial.println(F("\nDeleting old connection profiles"));
+  if (!cc3000.deleteProfiles())     halt("Failed!");
+
+#ifdef STATICIP
+  Serial.println(F("Setting static IP"));
+  uint32_t ipAddress = cc3000.IP2U32(10, 0, 1, 19);
+  uint32_t netMask = cc3000.IP2U32(255, 255, 255, 0);
+  uint32_t defaultGateway = cc3000.IP2U32(10, 0, 1, 1);
+  uint32_t dns = cc3000.IP2U32(8, 8, 4, 4);
+  
+  if (!cc3000.setStaticIPAddress(ipAddress, netMask, defaultGateway, dns)) {
+    Serial.println(F("Failed to set static IP!"));
+    while(1);
+  }
+#endif
+
+  // Attempt to connect to an access point
+  Serial.print(F("\nAttempting to connect to ")); 
+  Serial.print(wlan_ssid); Serial.print(F("..."));
+
+  Watchdog.disable();
+  // try 3 times
+  if (!cc3000.connectToAP(wlan_ssid, wlan_pass, wlan_security, 3)) {
+    return false;
+  }
+  
+  Watchdog.enable(8000);
+  Serial.println(F("Connected!"));
+
+uint8_t retries;
+#ifndef STATICIP  
+  /* Wait for DHCP to complete */
+  Serial.println(F("Requesting DHCP"));
+  retries = 10;
+  while (!cc3000.checkDHCP())
+  {
+    Watchdog.reset();
+    delay(1000);
+    retries--;
+    if (!retries) return false;
+  }  
+#endif
+  /* Display the IP address DNS, Gateway, etc.  */
+  retries = 10;
+  while (! displayConnectionDetails()) {
+    Watchdog.reset();
+    delay(1000);
+    retries--;
+    if (!retries) return false;
+  }
+  
+  Watchdog.reset();
+
+  return true;
+}
+
+
+/**************************************************************************/
+/*!
+    @brief  Tries to read the CC3000's internal firmware patch ID
+*/
+/**************************************************************************/
+uint16_t checkFirmwareVersion(void)
+{
+  uint8_t major, minor;
+  uint16_t version;
+  
+  if(!cc3000.getFirmwareVersion(&major, &minor))
+  {
+    Serial.println(F("Unable to retrieve the firmware version!\r\n"));
+    version = 0;
+  }
+  else
+  {
+    Serial.print(F("Firmware V. : "));
+    Serial.print(major); Serial.print(F(".")); Serial.println(minor);
+    version = major; version <<= 8; version |= minor;
+  }
+  return version;
+}
+
+
+/**************************************************************************/
+/*!
+    @brief  Tries to read the IP address and other connection details
+*/
+/**************************************************************************/
+bool displayConnectionDetails(void)
+{
+  uint32_t ipAddress, netmask, gateway, dhcpserv, dnsserv;
+  
+  if(!cc3000.getIPAddress(&ipAddress, &netmask, &gateway, &dhcpserv, &dnsserv))
+  {
+    Serial.println(F("Unable to retrieve the IP Address!\r\n"));
+    return false;
+  }
+  else
+  {
+    Serial.print(F("\nIP Addr: ")); cc3000.printIPdotsRev(ipAddress);
+    Serial.print(F("\nNetmask: ")); cc3000.printIPdotsRev(netmask);
+    Serial.print(F("\nGateway: ")); cc3000.printIPdotsRev(gateway);
+    Serial.print(F("\nDHCPsrv: ")); cc3000.printIPdotsRev(dhcpserv);
+    Serial.print(F("\nDNSserv: ")); cc3000.printIPdotsRev(dnsserv);
+    Serial.println();
+    return true;
+  }
+}
+
+
+
--- a/examples/mqtt_cc3k/mqtt_cc3k.ino
+++ b/examples/mqtt_cc3k/mqtt_cc3k.ino
@ -0,0 +1,155 @@
+/***************************************************
+  Adafruit MQTT Library CC3000 Example
+
+  Designed specifically to work with the Adafruit WiFi products:
+  ----> https://www.adafruit.com/products/1469
+
+  Adafruit invests time and resources providing this open source code,
+  please support Adafruit and open-source hardware by purchasing
+  products from Adafruit!
+
+  Written by Limor Fried/Ladyada for Adafruit Industries.
+  MIT license, all text above must be included in any redistribution
+ ****************************************************/
+#include <Adafruit_SleepyDog.h>
+#include <Adafruit_CC3000.h>
+#include <SPI.h>
+#include "utility/debug.h"
+#include "Adafruit_MQTT.h"
+#include "Adafruit_MQTT_CC3000.h"
+
+/*************************** CC3000 Pins ***********************************/
+
+#define ADAFRUIT_CC3000_IRQ   3  // MUST be an interrupt pin!
+#define ADAFRUIT_CC3000_VBAT  5  // VBAT & CS can be any digital pins.
+#define ADAFRUIT_CC3000_CS    10
+// Use hardware SPI for the remaining pins
+// On an UNO, SCK = 13, MISO = 12, and MOSI = 11
+
+/************************* WiFi Access Point *********************************/
+
+#define WLAN_SSID       "...your SSID..."  // can't be longer than 32 characters!
+#define WLAN_PASS       "...your password..."
+#define WLAN_SECURITY   WLAN_SEC_WPA2  // Can be: WLAN_SEC_UNSEC, WLAN_SEC_WEP,
+                                       //         WLAN_SEC_WPA or WLAN_SEC_WPA2
+
+/************************* Adafruit.io Setup *********************************/
+
+#define AIO_SERVER      "io.adafruit.com"
+#define AIO_SERVERPORT  1883
+#define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
+#define AIO_KEY         "...your AIO key..."
+
+/************ Global State (you don't need to change this!) ******************/
+
+// Setup the main CC3000 class, just like a normal CC3000 sketch.
+Adafruit_CC3000 cc3000 = Adafruit_CC3000(ADAFRUIT_CC3000_CS, ADAFRUIT_CC3000_IRQ, ADAFRUIT_CC3000_VBAT);
+
+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
+// Setup the CC3000 MQTT class by passing in the CC3000 class and MQTT server and login details.
+Adafruit_MQTT_CC3000 mqtt(&cc3000, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);
+
+// You don't need to change anything below this line!
+#define halt(s) { Serial.println(F( s )); while(1);  }
+
+// CC3000connect is a helper function that sets up the CC3000 and connects to
+// the WiFi network. See the cc3000helper.cpp tab above for the source!
+boolean CC3000connect(const char* wlan_ssid, const char* wlan_pass, uint8_t wlan_security);
+
+/****************************** Feeds ***************************************/
+
+// Setup a feed called 'photocell' for publishing.
+// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);
+
+// Setup a feed called 'onoff' for subscribing to changes.
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);
+
+/*************************** Sketch Code ************************************/
+
+void setup() {
+  Serial.begin(115200);
+
+  Serial.println(F("Adafruit MQTT demo"));
+
+  Serial.print(F("Free RAM: ")); Serial.println(getFreeRam(), DEC);
+
+  // Initialise the CC3000 module
+  Serial.print(F("\nInit the CC3000..."));
+  if (!cc3000.begin())
+      halt("Failed");
+
+  mqtt.subscribe(&onoffbutton);
+
+  while (! CC3000connect(WLAN_SSID, WLAN_PASS, WLAN_SECURITY)) {
+    Serial.println(F("Retrying WiFi"));
+    delay(1000);
+  }
+}
+
+uint32_t x=0;
+
+void loop() {
+  // Make sure to reset watchdog every loop iteration!
+  Watchdog.reset();
+
+  // Ensure the connection to the MQTT server is alive (this will make the first
+  // connection and automatically reconnect when disconnected).  See the MQTT_connect
+  // function definition further below.
+  MQTT_connect();
+
+  // this is our 'wait for incoming subscription packets' busy subloop
+  Adafruit_MQTT_Subscribe *subscription;
+  while ((subscription = mqtt.readSubscription(1000))) {
+    if (subscription == &onoffbutton) {
+      Serial.print(F("Got: "));
+      Serial.println((char *)onoffbutton.lastread);
+    }
+  }
+
+  // Now we can publish stuff!
+  Serial.print(F("\nSending photocell val "));
+  Serial.print(x);
+  Serial.print("...");
+  if (! photocell.publish(x++)) {
+    Serial.println(F("Failed"));
+  } else {
+    Serial.println(F("OK!"));
+  }
+
+  // ping the server to keep the mqtt connection alive
+  if(! mqtt.ping()) {
+    Serial.println(F("MQTT Ping failed."));
+  }
+
+}
+
+// Function to connect and reconnect as necessary to the MQTT server.
+// Should be called in the loop function and it will take care if connecting.
+void MQTT_connect() {
+  int8_t ret;
+
+  // Stop if already connected.
+  if (mqtt.connected()) {
+    return;
+  }
+
+  Serial.print("Connecting to MQTT... ");
+
+  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
+       Serial.println(mqtt.connectErrorString(ret));
+       if (ret < 0)
+            CC3000connect(WLAN_SSID, WLAN_PASS, WLAN_SECURITY);  // y0w, lets connect to wifi again
+       Serial.println("Retrying MQTT connection in 5 seconds...");
+       mqtt.disconnect();
+       delay(5000);  // wait 5 seconds
+  }
+  Serial.println("MQTT Connected!");
+}
--- a/examples/mqtt_esp8266/.zero.test.skip
+++ b/examples/mqtt_esp8266/.zero.test.skip
--- a/examples/mqtt_esp8266/mqtt_esp8266.ino
+++ b/examples/mqtt_esp8266/mqtt_esp8266.ino
@ -38,17 +38,25 @@ WiFiClient client;
 // or... use WiFiFlientSecure for SSL
 //WiFiClientSecure client;

+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
 // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_KEY);
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);

 /****************************** Feeds ***************************************/

 // Setup a feed called 'photocell' for publishing.
 // Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, AIO_USERNAME "/feeds/photocell");
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);

 // Setup a feed called 'onoff' for subscribing to changes.
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff");
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);

 /*************************** Sketch Code ************************************/

@ -144,4 +152,4 @@ void MQTT_connect() {
       }
  }
  Serial.println("MQTT Connected!");
-}
+}
--- a/examples/mqtt_esp8266_callback/mqtt_esp8266_callback.ino
+++ b/examples/mqtt_esp8266_callback/mqtt_esp8266_callback.ino
@ -1,185 +0,0 @@
-/***************************************************
-  Adafruit MQTT Library ESP8266 Example
-
-  Must use ESP8266 Arduino from:
-    https://github.com/esp8266/Arduino
-
-  Works great with Adafruit's Huzzah ESP board:
-  ----> https://www.adafruit.com/product/2471
-
-  Adafruit invests time and resources providing this open source code,
-  please support Adafruit and open-source hardware by purchasing
-  products from Adafruit!
-
-  Written by Tony DiCola for Adafruit Industries.
-  MIT license, all text above must be included in any redistribution
- ****************************************************/
-#include <ESP8266WiFi.h>
-#include "Adafruit_MQTT.h"
-#include "Adafruit_MQTT_Client.h"
-
-/************************* WiFi Access Point *********************************/
-
-#define WLAN_SSID       "network"
-#define WLAN_PASS       "password"
-
-/************************* Adafruit.io Setup *********************************/
-
-#define AIO_SERVER      "io.adafruit.com"
-#define AIO_SERVERPORT  1883
-#define AIO_USERNAME    "user"
-#define AIO_KEY         "key"
-
-/************ Global State (you don't need to change this!) ******************/
-
-// Create an ESP8266 WiFiClient class to connect to the MQTT server.
-WiFiClient client;
-
-// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_USERNAME, AIO_KEY);
-
-/****************************** Feeds ***************************************/
-
-// Setup a feed called 'time' for subscribing to current time
-Adafruit_MQTT_Subscribe timefeed = Adafruit_MQTT_Subscribe(&mqtt, "time/seconds");
-
-// Setup a feed called 'slider' for subscribing to changes on the slider
-Adafruit_MQTT_Subscribe slider = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/slider", MQTT_QOS_1);
-
-// Setup a feed called 'onoff' for subscribing to changes to the button
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff", MQTT_QOS_1);
-
-/*************************** Sketch Code ************************************/
-
-int sec;
-int min;
-int hour;
-
-int timeZone = -4; // utc-4 eastern daylight time (nyc)
-
-void timecallback(uint32_t current) {
-
-  // adjust to local time zone
-  current += (timeZone * 60 * 60);
-
-  // calculate current time
-  sec = current % 60;
-  current /= 60;
-  min = current % 60;
-  current /= 60;
-  hour = current % 24;
-
-  // print hour
-  if(hour == 0 || hour == 12)
-    Serial.print("12");
-  if(hour < 12)
-    Serial.print(hour);
-  else
-    Serial.print(hour - 12);
-
-  // print mins
-  Serial.print(":");
-  if(min < 10) Serial.print("0");
-  Serial.print(min);
-
-  // print seconds
-  Serial.print(":");
-  if(sec < 10) Serial.print("0");
-  Serial.print(sec);
-
-  if(hour < 12)
-    Serial.println(" am");
-  else
-    Serial.println(" pm");
-
-}
-
-void slidercallback(double x) {
-  Serial.print("Hey we're in a slider callback, the slider value is: ");
-  Serial.println(x);
-}
-
-void onoffcallback(char *data, uint16_t len) {
-  Serial.print("Hey we're in a onoff callback, the button value is: ");
-  Serial.println(data);
-}
-
-
-void setup() {
-  Serial.begin(115200);
-  delay(10);
-
-  Serial.println(F("Adafruit MQTT demo"));
-
-  // Connect to WiFi access point.
-  Serial.println(); Serial.println();
-  Serial.print("Connecting to ");
-  Serial.println(WLAN_SSID);
-
-  WiFi.begin(WLAN_SSID, WLAN_PASS);
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-  Serial.println();
-
-  Serial.println("WiFi connected");
-  Serial.println("IP address: "); Serial.println(WiFi.localIP());
-
-  timefeed.setCallback(timecallback);
-  slider.setCallback(slidercallback);
-  onoffbutton.setCallback(onoffcallback);
-  
-  // Setup MQTT subscription for time feed.
-  mqtt.subscribe(&timefeed);
-  mqtt.subscribe(&slider);
-  mqtt.subscribe(&onoffbutton);
-
-}
-
-uint32_t x=0;
-
-void loop() {
-  // Ensure the connection to the MQTT server is alive (this will make the first
-  // connection and automatically reconnect when disconnected).  See the MQTT_connect
-  // function definition further below.
-  MQTT_connect();
-
-  // this is our 'wait for incoming subscription packets and callback em' busy subloop
-  // try to spend your time here:
-  mqtt.processPackets(10000);
-  
-  // ping the server to keep the mqtt connection alive
-  // NOT required if you are publishing once every KEEPALIVE seconds
-  
-  if(! mqtt.ping()) {
-    mqtt.disconnect();
-  }
-}
-
-// Function to connect and reconnect as necessary to the MQTT server.
-// Should be called in the loop function and it will take care if connecting.
-void MQTT_connect() {
-  int8_t ret;
-
-  // Stop if already connected.
-  if (mqtt.connected()) {
-    return;
-  }
-
-  Serial.print("Connecting to MQTT... ");
-
-  uint8_t retries = 3;
-  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
-       Serial.println(mqtt.connectErrorString(ret));
-       Serial.println("Retrying MQTT connection in 10 seconds...");
-       mqtt.disconnect();
-       delay(10000);  // wait 10 seconds
-       retries--;
-       if (retries == 0) {
-         // basically die and wait for WDT to reset me
-         while (1);
-       }
-  }
-  Serial.println("MQTT Connected!");
-}
--- a/examples/mqtt_ethernet/mqtt_ethernet.ino
+++ b/examples/mqtt_ethernet/mqtt_ethernet.ino
@ -41,7 +41,17 @@ byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
 //Set up the ethernet client
 EthernetClient client;

-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_KEY);
+// Store the MQTT server, client ID, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+// Set a unique MQTT client ID using the AIO key + the date and time the sketch
+// was compiled (so this should be unique across multiple devices for a user,
+// alternatively you can manually set this to a GUID or other random value).
+const char MQTT_CLIENTID[] PROGMEM  = __TIME__ AIO_USERNAME;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_CLIENTID, MQTT_USERNAME, MQTT_PASSWORD);

 // You don't need to change anything below this line!
 #define halt(s) { Serial.println(F( s )); while(1);  }
@ -51,10 +61,12 @@ Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO

 // Setup a feed called 'photocell' for publishing.
 // Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt,  AIO_USERNAME "/feeds/photocell");
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);

 // Setup a feed called 'onoff' for subscribing to changes.
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff");
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);

 /*************************** Sketch Code ************************************/

--- a/examples/mqtt_fona/mqtt_fona.ino
+++ b/examples/mqtt_fona/mqtt_fona.ino
@ -25,9 +25,8 @@

 /*************************** FONA Pins ***********************************/

-// Default pins for Feather 32u4 FONA
-#define FONA_RX  9
-#define FONA_TX  8
+#define FONA_RX 2
+#define FONA_TX 3
 #define FONA_RST 4
 SoftwareSerial fonaSS = SoftwareSerial(FONA_TX, FONA_RX);

@ -53,8 +52,14 @@ Adafruit_FONA fona = Adafruit_FONA(FONA_RST);

 /************ Global State (you don't need to change this!) ******************/

+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
 // Setup the FONA MQTT class by passing in the FONA class and MQTT server and login details.
-Adafruit_MQTT_FONA mqtt(&fona, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_KEY);
+Adafruit_MQTT_FONA mqtt(&fona, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);

 // You don't need to change anything below this line!
 #define halt(s) { Serial.println(F( s )); while(1);  }
@ -67,10 +72,12 @@ boolean FONAconnect(const __FlashStringHelper *apn, const __FlashStringHelper *u

 // Setup a feed called 'photocell' for publishing.
 // Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, AIO_USERNAME "/feeds/photocell");
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);

 // Setup a feed called 'onoff' for subscribing to changes.
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff");
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);

 /*************************** Sketch Code ************************************/

@ -117,6 +124,17 @@ void loop() {
  // function definition further below.
  MQTT_connect();

+  Watchdog.reset();
+  
+  // this is our 'wait for incoming subscription packets' busy subloop
+  Adafruit_MQTT_Subscribe *subscription;
+  while ((subscription = mqtt.readSubscription(5000))) {
+    if (subscription == &onoffbutton) {
+      Serial.print(F("Got: "));
+      Serial.println((char *)onoffbutton.lastread);
+    }
+  }
+
  Watchdog.reset();
  // Now we can publish stuff!
  Serial.print(F("\nSending photocell val "));
@ -130,16 +148,6 @@ void loop() {
    txfailures = 0;
  }

-  Watchdog.reset();  
-  // this is our 'wait for incoming subscription packets' busy subloop
-  Adafruit_MQTT_Subscribe *subscription;
-  while ((subscription = mqtt.readSubscription(5000))) {
-    if (subscription == &onoffbutton) {
-      Serial.print(F("Got: "));
-      Serial.println((char *)onoffbutton.lastread);
-    }
-  }
-
  // ping the server to keep the mqtt connection alive, only needed if we're not publishing
  //if(! mqtt.ping()) {
  //  Serial.println(F("MQTT Ping failed."));
--- a/examples/mqtt_winc1500/mqtt_winc1500.ino
+++ b/examples/mqtt_winc1500/mqtt_winc1500.ino
@ -11,13 +11,15 @@
 #include <SPI.h>
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"
-#include <WiFi101.h>
+#include <Adafruit_WINC1500.h>
+

 /************************* WiFI Setup *****************************/
 #define WINC_CS   8
 #define WINC_IRQ  7
 #define WINC_RST  4
-#define WINC_EN   2     // or, tie EN to VCC
+
+Adafruit_WINC1500 WiFi(WINC_CS, WINC_IRQ, WINC_RST);

 char ssid[] = "yournetwork";     //  your network SSID (name)
 char pass[] = "yourpassword";    // your network password (use for WPA, or use as key for WEP)
@ -29,15 +31,25 @@ int status = WL_IDLE_STATUS;

 #define AIO_SERVER      "io.adafruit.com"
 #define AIO_SERVERPORT  1883
-#define AIO_USERNAME    "adafruitiousername"
-#define AIO_KEY         "adafruitiokey"
+#define AIO_USERNAME    "adafruit2"
+#define AIO_KEY         "3e148db54389a8b7c3efa9ddd2cd388317bcbf58"

 /************ Global State (you don't need to change this!) ******************/

 //Set up the wifi client
-WiFiClient client;
+Adafruit_WINC1500Client client;

-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_KEY);
+// Store the MQTT server, client ID, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+// Set a unique MQTT client ID using the AIO key + the date and time the sketch
+// was compiled (so this should be unique across multiple devices for a user,
+// alternatively you can manually set this to a GUID or other random value).
+const char MQTT_CLIENTID[] PROGMEM  = __TIME__ AIO_USERNAME;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_CLIENTID, MQTT_USERNAME, MQTT_PASSWORD);

 // You don't need to change anything below this line!
 #define halt(s) { Serial.println(F( s )); while(1);  }
@ -46,18 +58,18 @@ Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO

 // Setup a feed called 'photocell' for publishing.
 // Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, AIO_USERNAME "/feeds/photocell");
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);

 // Setup a feed called 'onoff' for subscribing to changes.
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff");
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);

 /*************************** Sketch Code ************************************/

 #define LEDPIN 13

-
 void setup() {
-  WiFi.setPins(WINC_CS, WINC_IRQ, WINC_RST, WINC_EN);

  while (!Serial);
  Serial.begin(115200);
--- a/examples/mqtt_yun/.leonardo.test.skip
+++ b/examples/mqtt_yun/.leonardo.test.skip
--- a/examples/mqtt_yun/.uno.test.skip
+++ b/examples/mqtt_yun/.uno.test.skip
--- a/examples/mqtt_yun/.zero.test.skip
+++ b/examples/mqtt_yun/.zero.test.skip
--- a/examples/mqtt_yun/mqtt_yun.ino
+++ b/examples/mqtt_yun/mqtt_yun.ino
@ -18,10 +18,11 @@
 ****************************************************/
 #include <Bridge.h>
 #include <Console.h>
-#include <BridgeClient.h>
+#include <YunClient.h>
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"

+
 /************************* Adafruit.io Setup *********************************/

 #define AIO_SERVER      "io.adafruit.com"
@ -29,23 +30,30 @@
 #define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
 #define AIO_KEY         "...your AIO key..."

-
 /************ Global State (you don't need to change this!) ******************/

-// Create a BridgeClient instance to communicate using the Yun's bridge & Linux OS.
-BridgeClient client;
+// Create a YunClient instance to communicate using the Yun's brighe & Linux OS.
+YunClient client;
+
+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;

 // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-Adafruit_MQTT_Client mqtt(&client, AIO_SERVER, AIO_SERVERPORT, AIO_USERNAME, AIO_KEY);
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);

 /****************************** Feeds ***************************************/

 // Setup a feed called 'photocell' for publishing.
 // Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
-Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, AIO_USERNAME "/feeds/photocell");
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);

 // Setup a feed called 'onoff' for subscribing to changes.
-Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, AIO_USERNAME "/feeds/onoff");
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);

 /*************************** Sketch Code ************************************/

--- a/keywords.txt
+++ b/keywords.txt
@ -3,7 +3,7 @@ Adafruit_MQTT_CC3000	KEYWORD1
 Adafruit_MQTT_FONA	KEYWORD1
 Adafruit_MQTT_Client	KEYWORD1
 Adafruit_MQTT_Publish	KEYWORD1
-Adafruit_MQTT_Subscribe	KEYWORD1
+Adafruit_MQTT_Subscribe KEYWORD1
 connect	KEYWORD2
 connectErrorString	KEYWORD2
 disconnect	KEYWORD2
--- a/library.properties
+++ b/library.properties
@ -1,8 +1,8 @@
 name=Adafruit MQTT Library
-version=0.20.1
+version=0.12.2
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
-sentence=MQTT library that supports the FONA, ESP8266, Yun, and generic Arduino Client hardware.
+sentence=MQTT library that supports the CC3000, FONA, ESP8266, Yun, and generic Arduino Client hardware.
 paragraph=Simple MQTT library that supports the bare minimum to publish and subscribe to topics.
 category=Communication
 url=https://github.com/adafruit/Adafruit_MQTT_Library