Merge pull request #47 from adafruit/connack_custom_codes

Add Adafruit IO Custom MQTT CONNACK Return Codes
adafruit · Jun 29, 2016 · a05f1d9 · a05f1d9
2 parents 1d0feb2 + 39f1169
commit a05f1d9
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 9 deletions.
diff --git 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"
+  - arduino --install-library "Adafruit SleepyDog Library,Adafruit FONA Library,Adafruit CC3000 Library,Adafruit_WINC1500"
 script:
   - build_main_platforms
 notifications:

diff --git a/Adafruit_MQTT.cpp b/Adafruit_MQTT.cpp
@@ -222,7 +222,7 @@ int8_t Adafruit_MQTT::connect() {
       }
       success = true;
     }
-    if (! success) return 6; // failed to sub for some reason
+    if (! success) return -2; // failed to sub for some reason
   }
 
   return 0;
@@ -285,13 +285,15 @@ uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t timeout) {
 
 const __FlashStringHelper* Adafruit_MQTT::connectErrorString(int8_t code) {
    switch (code) {
-      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("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("Connection failed");
+      case -2: return F("Failed to subscribe");
       default: return F("Unknown error");
    }
 }

diff --git a/Adafruit_MQTT.h b/Adafruit_MQTT.h
@@ -68,7 +68,7 @@
 #define MQTT_QOS_1 0x1
 #define MQTT_QOS_0 0x0
 
-#define CONNECT_TIMEOUT_MS 3000
+#define CONNECT_TIMEOUT_MS 6000
 #define PUBLISH_TIMEOUT_MS 500
 #define PING_TIMEOUT_MS    500
 

diff --git a/examples/mqtt_2subs_esp8266/.due.test.skip b/examples/mqtt_2subs_esp8266/.due.test.skip
diff --git a/examples/mqtt_2subs_esp8266/.leonardo.test.skip b/examples/mqtt_2subs_esp8266/.leonardo.test.skip
diff --git a/examples/mqtt_2subs_esp8266/.uno.test.skip b/examples/mqtt_2subs_esp8266/.uno.test.skip
diff --git a/examples/mqtt_2subs_esp8266/.zero.test.skip b/examples/mqtt_2subs_esp8266/.zero.test.skip
diff --git a/examples/mqtt_arbitrary_data/.due.test.skip b/examples/mqtt_arbitrary_data/.due.test.skip
diff --git a/examples/mqtt_arbitrary_data/.leonardo.test.skip b/examples/mqtt_arbitrary_data/.leonardo.test.skip
diff --git a/examples/mqtt_arbitrary_data/.uno.test.skip b/examples/mqtt_arbitrary_data/.uno.test.skip
diff --git a/examples/mqtt_arbitrary_data/.zero.test.skip b/examples/mqtt_arbitrary_data/.zero.test.skip
diff --git a/examples/mqtt_cc3k/.leonardo.test.skip b/examples/mqtt_cc3k/.leonardo.test.skip
diff --git a/examples/mqtt_cc3k/.uno.test.skip b/examples/mqtt_cc3k/.uno.test.skip
diff --git a/examples/mqtt_cc3k/.zero.test.skip b/examples/mqtt_cc3k/.zero.test.skip
diff --git a/examples/mqtt_esp8266/.zero.test.skip b/examples/mqtt_esp8266/.zero.test.skip
diff --git a/examples/mqtt_yun/.leonardo.test.skip b/examples/mqtt_yun/.leonardo.test.skip
diff --git a/examples/mqtt_yun/.uno.test.skip b/examples/mqtt_yun/.uno.test.skip
diff --git a/examples/mqtt_yun/.zero.test.skip b/examples/mqtt_yun/.zero.test.skip