From 15713af468fe02581a767ff645b201c5497f1489 Mon Sep 17 00:00:00 2001 From: ladyada Date: Tue, 20 Oct 2015 23:51:03 -0400 Subject: [PATCH] switch to MQTT 3.1.1 by default --- Adafruit_MQTT.cpp | 6 ++++++ Adafruit_MQTT.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Adafruit_MQTT.cpp b/Adafruit_MQTT.cpp index 5558a65..c319384 100644 --- a/Adafruit_MQTT.cpp +++ b/Adafruit_MQTT.cpp @@ -287,7 +287,13 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) { p+=2; // fill in packet[1] last +#if (MQTT_PROTOCOL_LEVEL == 4) + p = stringprint_P(p, PSTR("MQTT")); +#elif (MQTT_PROTOCOL_LEVEL == 3) p = stringprint_P(p, PSTR("MQIsdp")); +#else + #error "No MQTT version selected!" +#endif p[0] = MQTT_PROTOCOL_LEVEL; p++; diff --git a/Adafruit_MQTT.h b/Adafruit_MQTT.h index e18110e..9d9fc71 100644 --- a/Adafruit_MQTT.h +++ b/Adafruit_MQTT.h @@ -45,7 +45,8 @@ #define DEBUG_PRINTBUFFER(buffer, len) {} #endif -#define MQTT_PROTOCOL_LEVEL 3 +// Use 3 (MQTT 3.0) or 4 (MQTT 3.1.1) +#define MQTT_PROTOCOL_LEVEL 4 #define MQTT_CTRL_CONNECT 0x01 #define MQTT_CTRL_CONNECTACK 0x02