Removing remainder of whitespace differences
This commit is contained in:
parent
3ba30fe64b
commit
adb717f7dd
@ -47,17 +47,15 @@ int strncasecmp(const char * str1, const char * str2, int len) {
|
||||
|
||||
void printBuffer(uint8_t *buffer, uint16_t len) {
|
||||
DEBUG_PRINTER.print('\t');
|
||||
for (uint16_t i = 0; i < len; i++) {
|
||||
if (isprint(buffer[i])) {
|
||||
for (uint16_t i=0; i<len; i++) {
|
||||
if (isprint(buffer[i]))
|
||||
DEBUG_PRINTER.write(buffer[i]);
|
||||
} else {
|
||||
else
|
||||
DEBUG_PRINTER.print(" ");
|
||||
}
|
||||
DEBUG_PRINTER.print(F(" [0x"));
|
||||
if (buffer[i] < 0x10) {
|
||||
if (buffer[i] < 0x10)
|
||||
DEBUG_PRINTER.print("0");
|
||||
}
|
||||
DEBUG_PRINTER.print(buffer[i], HEX);
|
||||
DEBUG_PRINTER.print(buffer[i],HEX);
|
||||
DEBUG_PRINTER.print("], ");
|
||||
if (i % 8 == 7) {
|
||||
DEBUG_PRINTER.print("\n\t");
|
||||
@ -76,7 +74,7 @@ static uint8_t *stringprint(uint8_t *p, char *s) {
|
||||
}
|
||||
*/
|
||||
|
||||
static uint8_t *stringprint(uint8_t *p, const char *s, uint16_t maxlen = 0) {
|
||||
static uint8_t *stringprint(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.
|
||||
@ -89,12 +87,10 @@ static uint8_t *stringprint(uint8_t *p, const char *s, uint16_t maxlen = 0) {
|
||||
Serial.write(pgm_read_byte(s+i));
|
||||
}
|
||||
*/
|
||||
p[0] = len >> 8;
|
||||
p++;
|
||||
p[0] = len & 0xFF;
|
||||
p++;
|
||||
strncpy((char *) p, s, len);
|
||||
return p + len;
|
||||
p[0] = len >> 8; p++;
|
||||
p[0] = len & 0xFF; p++;
|
||||
strncpy((char *)p, s, len);
|
||||
return p+len;
|
||||
}
|
||||
|
||||
|
||||
@ -112,7 +108,7 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
|
||||
password = pass;
|
||||
|
||||
// reset subscriptions
|
||||
for (uint8_t i = 0; i < MAXSUBSCRIPTIONS; i++) {
|
||||
for (uint8_t i=0; i<MAXSUBSCRIPTIONS; i++) {
|
||||
subscriptions[i] = 0;
|
||||
}
|
||||
|
||||
@ -137,7 +133,7 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
|
||||
password = pass;
|
||||
|
||||
// reset subscriptions
|
||||
for (uint8_t i = 0; i < MAXSUBSCRIPTIONS; i++) {
|
||||
for (uint8_t i=0; i<MAXSUBSCRIPTIONS; i++) {
|
||||
subscriptions[i] = 0;
|
||||
}
|
||||
|
||||
@ -152,44 +148,37 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
|
||||
|
||||
int8_t Adafruit_MQTT::connect() {
|
||||
// Connect to the server.
|
||||
if (!connectServer()) {
|
||||
if (!connectServer())
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Construct and send connect packet.
|
||||
uint8_t len = connectPacket(buffer);
|
||||
if (!sendPacket(buffer, len)) {
|
||||
if (!sendPacket(buffer, len))
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Read connect response packet and verify it
|
||||
len = readFullPacket(buffer, MAXBUFFERSIZE, CONNECT_TIMEOUT_MS);
|
||||
if (len != 4) {
|
||||
if (len != 4)
|
||||
return -1;
|
||||
}
|
||||
if ((buffer[0] != (MQTT_CTRL_CONNECTACK << 4)) || (buffer[1] != 2))
|
||||
return -1;
|
||||
if (buffer[3] != 0)
|
||||
return buffer[3];
|
||||
|
||||
// Setup subscriptions once connected.
|
||||
for (uint8_t i = 0; i < MAXSUBSCRIPTIONS; i++) {
|
||||
for (uint8_t i=0; i<MAXSUBSCRIPTIONS; i++) {
|
||||
// Ignore subscriptions that aren't defined.
|
||||
if (subscriptions[i] == 0) {
|
||||
continue;
|
||||
}
|
||||
if (subscriptions[i] == 0) continue;
|
||||
|
||||
boolean success = false;
|
||||
for (uint8_t retry = 0; (retry < 3) && !success; retry++) { // retry until we get a suback
|
||||
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)) {
|
||||
if (!sendPacket(buffer, len))
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (MQTT_PROTOCOL_LEVEL < 3) { // older versions didn't suback
|
||||
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
|
||||
@ -201,13 +190,14 @@ int8_t Adafruit_MQTT::connect() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!success) return -2; // failed to sub for some reason
|
||||
if (! success) return -2; // failed to sub for some reason
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int8_t Adafruit_MQTT::connect(const char *user, const char *pass) {
|
||||
int8_t Adafruit_MQTT::connect(const char *user, const char *pass)
|
||||
{
|
||||
username = user;
|
||||
password = pass;
|
||||
return connect();
|
||||
@ -216,10 +206,10 @@ int8_t Adafruit_MQTT::connect(const char *user, const char *pass) {
|
||||
uint16_t Adafruit_MQTT::processPacketsUntil(uint8_t *buffer, uint8_t waitforpackettype, uint16_t timeout) {
|
||||
uint16_t len;
|
||||
|
||||
while (true) {
|
||||
while(true) {
|
||||
len = readFullPacket(buffer, MAXBUFFERSIZE, timeout);
|
||||
|
||||
if (len == 0) {
|
||||
if(len == 0){
|
||||
break;
|
||||
}
|
||||
|
||||
@ -247,8 +237,7 @@ uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t maxsize, uint16
|
||||
rlen = readPacket(pbuff, 1, timeout);
|
||||
if (rlen != 1) return 0;
|
||||
|
||||
DEBUG_PRINT(F("Packet Type:\t"));
|
||||
DEBUG_PRINTBUFFER(pbuff, rlen);
|
||||
DEBUG_PRINT(F("Packet Type:\t")); DEBUG_PRINTBUFFER(pbuff, rlen);
|
||||
pbuff++;
|
||||
|
||||
uint32_t value = 0;
|
||||
@ -264,49 +253,37 @@ uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t maxsize, uint16
|
||||
intermediate *= multiplier;
|
||||
value += intermediate;
|
||||
multiplier *= 128;
|
||||
if (multiplier > (128UL * 128UL * 128UL)) {
|
||||
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);
|
||||
DEBUG_PRINT(F("Packet Length:\t")); DEBUG_PRINTLN(value);
|
||||
|
||||
if (value > (maxsize - (pbuff - buffer) - 1)) {
|
||||
if (value > (maxsize - (pbuff-buffer) - 1)) {
|
||||
DEBUG_PRINTLN(F("Packet too big for buffer"));
|
||||
rlen = readPacket(pbuff, (maxsize - (pbuff - buffer) - 1), timeout);
|
||||
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);
|
||||
return ((pbuff - buffer)+rlen);
|
||||
}
|
||||
|
||||
const __FlashStringHelper *Adafruit_MQTT::connectErrorString(int8_t code) {
|
||||
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("Connection failed");
|
||||
case -2:
|
||||
return F("Failed to subscribe");
|
||||
default:
|
||||
return F("Unknown error");
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
@ -314,20 +291,21 @@ bool Adafruit_MQTT::disconnect() {
|
||||
|
||||
// Construct and send disconnect packet.
|
||||
uint8_t len = disconnectPacket(buffer);
|
||||
if (!sendPacket(buffer, len)) DEBUG_PRINTLN(F("Unable to send disconnect packet"));
|
||||
if (! sendPacket(buffer, len))
|
||||
DEBUG_PRINTLN(F("Unable to send disconnect packet"));
|
||||
|
||||
return disconnectServer();
|
||||
|
||||
}
|
||||
|
||||
|
||||
bool Adafruit_MQTT::publish(const char *topic, const char *data, uint8_t qos, bool retain) {
|
||||
return publish(topic, (uint8_t *) (data), strlen(data), qos, retain);
|
||||
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, bool retain) {
|
||||
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, retain);
|
||||
uint16_t len = publishPacket(buffer, topic, data, bLen, qos);
|
||||
if (!sendPacket(buffer, len))
|
||||
return false;
|
||||
|
||||
@ -372,17 +350,16 @@ bool Adafruit_MQTT::will(const char *topic, const char *payload, uint8_t qos, ui
|
||||
bool Adafruit_MQTT::subscribe(Adafruit_MQTT_Subscribe *sub) {
|
||||
uint8_t i;
|
||||
// see if we are already subscribed
|
||||
for (i = 0; i < MAXSUBSCRIPTIONS; i++) {
|
||||
for (i=0; i<MAXSUBSCRIPTIONS; i++) {
|
||||
if (subscriptions[i] == sub) {
|
||||
DEBUG_PRINTLN(F("Already subscribed"));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (i == MAXSUBSCRIPTIONS) { // add to subscriptionlist
|
||||
for (i = 0; i < MAXSUBSCRIPTIONS; i++) {
|
||||
if (i==MAXSUBSCRIPTIONS) { // add to subscriptionlist
|
||||
for (i=0; i<MAXSUBSCRIPTIONS; i++) {
|
||||
if (subscriptions[i] == 0) {
|
||||
DEBUG_PRINT(F("Added sub "));
|
||||
DEBUG_PRINTLN(i);
|
||||
DEBUG_PRINT(F("Added sub ")); DEBUG_PRINTLN(i);
|
||||
subscriptions[i] = sub;
|
||||
return true;
|
||||
}
|
||||
@ -397,7 +374,7 @@ bool Adafruit_MQTT::unsubscribe(Adafruit_MQTT_Subscribe *sub) {
|
||||
uint8_t i;
|
||||
|
||||
// see if we are already subscribed
|
||||
for (i = 0; i < MAXSUBSCRIPTIONS; i++) {
|
||||
for (i=0; i<MAXSUBSCRIPTIONS; i++) {
|
||||
|
||||
if (subscriptions[i] == sub) {
|
||||
|
||||
@ -407,12 +384,12 @@ bool Adafruit_MQTT::unsubscribe(Adafruit_MQTT_Subscribe *sub) {
|
||||
uint8_t len = unsubscribePacket(buffer, subscriptions[i]->topic);
|
||||
|
||||
// sending unsubscribe failed
|
||||
if (!sendPacket(buffer, len))
|
||||
if (! sendPacket(buffer, len))
|
||||
return false;
|
||||
|
||||
// if QoS for this subscription is 1 or 2, we need
|
||||
// to wait for the unsuback to confirm unsubscription
|
||||
if (subscriptions[i]->qos > 0 && MQTT_PROTOCOL_LEVEL > 3) {
|
||||
if(subscriptions[i]->qos > 0 && MQTT_PROTOCOL_LEVEL > 3) {
|
||||
|
||||
// wait for UNSUBACK
|
||||
len = readFullPacket(buffer, MAXBUFFERSIZE, CONNECT_TIMEOUT_MS);
|
||||
@ -439,30 +416,33 @@ void Adafruit_MQTT::processPackets(int16_t timeout) {
|
||||
|
||||
uint32_t elapsed = 0, endtime, starttime = millis();
|
||||
|
||||
while (elapsed < (uint32_t) timeout) {
|
||||
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);
|
||||
data = atoi((char *)sub->lastread);
|
||||
//Serial.print("*** calling int callback with : "); Serial.println(data);
|
||||
sub->callback_uint32t(data);
|
||||
} else if (sub->callback_double != NULL) {
|
||||
}
|
||||
else if (sub->callback_double != NULL) {
|
||||
// huh lets do the callback in doublefloat mode
|
||||
double data = 0;
|
||||
data = atof((char *) sub->lastread);
|
||||
data = atof((char *)sub->lastread);
|
||||
//Serial.print("*** calling double callback with : "); Serial.println(data);
|
||||
sub->callback_double(data);
|
||||
} else if (sub->callback_buffer != NULL) {
|
||||
}
|
||||
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) {
|
||||
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);
|
||||
((sub->io_mqtt)->*(sub->callback_io))((char *)sub->lastread, sub->datalen);
|
||||
}
|
||||
}
|
||||
|
||||
@ -476,35 +456,24 @@ void Adafruit_MQTT::processPackets(int16_t timeout) {
|
||||
}
|
||||
|
||||
Adafruit_MQTT_Subscribe *Adafruit_MQTT::readSubscription(int16_t timeout) {
|
||||
// Check if data is available to read.
|
||||
uint16_t len = readFullPacket(buffer, MAXBUFFERSIZE, timeout); // return one full packet
|
||||
return handleSubscriptionPacket(len);
|
||||
}
|
||||
|
||||
Adafruit_MQTT_Subscribe *Adafruit_MQTT::handleSubscriptionPacket(uint16_t len) {
|
||||
uint16_t i, topiclen, datalen;
|
||||
|
||||
if (!len) {
|
||||
// Check if data is available to read.
|
||||
uint16_t len = readFullPacket(buffer, MAXBUFFERSIZE, timeout); // return one full packet
|
||||
if (!len)
|
||||
return NULL; // No data available, just quit.
|
||||
}
|
||||
DEBUG_PRINT("Packet len: ");
|
||||
DEBUG_PRINTLN(len);
|
||||
DEBUG_PRINT("Packet len: "); DEBUG_PRINTLN(len);
|
||||
DEBUG_PRINTBUFFER(buffer, len);
|
||||
|
||||
if (len < 3) {
|
||||
return NULL;
|
||||
}
|
||||
if ((buffer[0] & 0xF0) != (MQTT_CTRL_PUBLISH) << 4) {
|
||||
return NULL;
|
||||
}
|
||||
if (len<3) return NULL;
|
||||
if ((buffer[0] & 0xF0) != (MQTT_CTRL_PUBLISH) << 4) return NULL;
|
||||
|
||||
// Parse out length of packet.
|
||||
topiclen = buffer[3];
|
||||
DEBUG_PRINT(F("Looking for subscription len "));
|
||||
DEBUG_PRINTLN(topiclen);
|
||||
DEBUG_PRINT(F("Looking for subscription len ")); DEBUG_PRINTLN(topiclen);
|
||||
|
||||
// Find subscription associated with this packet.
|
||||
for (i = 0; i < MAXSUBSCRIPTIONS; i++) {
|
||||
for (i=0; i<MAXSUBSCRIPTIONS; i++) {
|
||||
if (subscriptions[i]) {
|
||||
// Skip this subscription if its name length isn't the same as the
|
||||
// received topic name.
|
||||
@ -512,25 +481,22 @@ Adafruit_MQTT_Subscribe *Adafruit_MQTT::handleSubscriptionPacket(uint16_t len) {
|
||||
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) {
|
||||
DEBUG_PRINT(F("Found sub #"));
|
||||
DEBUG_PRINTLN(i);
|
||||
if (strncasecmp((char*)buffer+4, subscriptions[i]->topic, topiclen) == 0) {
|
||||
DEBUG_PRINT(F("Found sub #")); DEBUG_PRINTLN(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (i == MAXSUBSCRIPTIONS) {
|
||||
return NULL; // matching sub not found ???
|
||||
}
|
||||
if (i==MAXSUBSCRIPTIONS) return NULL; // matching sub not found ???
|
||||
|
||||
uint8_t packet_id_len = 0;
|
||||
uint16_t packetid = 0;
|
||||
// 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 = buffer[topiclen+4];
|
||||
packetid <<= 8;
|
||||
packetid |= buffer[topiclen + 5];
|
||||
packetid |= buffer[topiclen+5];
|
||||
}
|
||||
|
||||
// zero out the old data
|
||||
@ -538,22 +504,21 @@ Adafruit_MQTT_Subscribe *Adafruit_MQTT::handleSubscriptionPacket(uint16_t len) {
|
||||
|
||||
datalen = len - topiclen - packet_id_len - 4;
|
||||
if (datalen > SUBSCRIPTIONDATALEN) {
|
||||
datalen = SUBSCRIPTIONDATALEN - 1; // cut it off
|
||||
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);
|
||||
memmove(subscriptions[i]->lastread, buffer+4+topiclen+packet_id_len, datalen);
|
||||
subscriptions[i]->datalen = datalen;
|
||||
DEBUG_PRINT(F("Data len: "));
|
||||
DEBUG_PRINTLN(datalen);
|
||||
DEBUG_PRINT(F("Data: "));
|
||||
DEBUG_PRINTLN((char *) subscriptions[i]->lastread);
|
||||
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) {
|
||||
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"));
|
||||
if (!sendPacket(ackpacket, len))
|
||||
DEBUG_PRINT(F("Failed"));
|
||||
}
|
||||
|
||||
// return the valid matching subscription
|
||||
@ -597,7 +562,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
|
||||
|
||||
// fixed header, connection messsage no flags
|
||||
p[0] = (MQTT_CTRL_CONNECT << 4) | 0x0;
|
||||
p += 2;
|
||||
p+=2;
|
||||
// fill in packet[1] last
|
||||
|
||||
#if MQTT_PROTOCOL_LEVEL == 3
|
||||
@ -605,7 +570,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
|
||||
#elif MQTT_PROTOCOL_LEVEL == 4
|
||||
p = stringprint(p, "MQTT");
|
||||
#else
|
||||
#error "MQTT level not supported"
|
||||
#error "MQTT level not supported"
|
||||
#endif
|
||||
|
||||
p[0] = MQTT_PROTOCOL_LEVEL;
|
||||
@ -619,12 +584,12 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
|
||||
|
||||
p[0] |= MQTT_CONN_WILLFLAG;
|
||||
|
||||
if (will_qos == 1)
|
||||
if(will_qos == 1)
|
||||
p[0] |= MQTT_CONN_WILLQOS_1;
|
||||
else if (will_qos == 2)
|
||||
else if(will_qos == 2)
|
||||
p[0] |= MQTT_CONN_WILLQOS_2;
|
||||
|
||||
if (will_retain == 1)
|
||||
if(will_retain == 1)
|
||||
p[0] |= MQTT_CONN_WILLRETAIN;
|
||||
|
||||
}
|
||||
@ -640,7 +605,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
|
||||
p[0] = MQTT_CONN_KEEPALIVE & 0xFF;
|
||||
p++;
|
||||
|
||||
if (MQTT_PROTOCOL_LEVEL == 3) {
|
||||
if(MQTT_PROTOCOL_LEVEL == 3) {
|
||||
p = stringprint(p, clientid, 23); // Limit client ID to first 23 characters.
|
||||
} else {
|
||||
if (pgm_read_byte(clientid) != 0) {
|
||||
@ -668,7 +633,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
|
||||
|
||||
len = p - packet;
|
||||
|
||||
packet[1] = len - 2; // don't include the 2 bytes of fixed header data
|
||||
packet[1] = len-2; // don't include the 2 bytes of fixed header data
|
||||
DEBUG_PRINTLN(F("MQTT connect packet:"));
|
||||
DEBUG_PRINTBUFFER(buffer, len);
|
||||
return len;
|
||||
@ -677,20 +642,20 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
|
||||
|
||||
// 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, bool retain) {
|
||||
uint8_t *data, uint16_t bLen, uint8_t qos) {
|
||||
uint8_t *p = packet;
|
||||
uint16_t len = 0;
|
||||
uint16_t len=0;
|
||||
|
||||
// calc length of non-header data
|
||||
len += 2; // two bytes to set the topic size
|
||||
len += strlen(topic); // topic length
|
||||
if (qos > 0) {
|
||||
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 | retain;
|
||||
p[0] = MQTT_CTRL_PUBLISH << 4 | qos << 1;
|
||||
p++;
|
||||
|
||||
// fill in packet[1] last
|
||||
@ -698,28 +663,28 @@ uint16_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
|
||||
uint8_t encodedByte = len % 128;
|
||||
len /= 128;
|
||||
// if there are more data to encode, set the top bit of this byte
|
||||
if (len > 0) {
|
||||
if ( len > 0 ) {
|
||||
encodedByte |= 0x80;
|
||||
}
|
||||
p[0] = encodedByte;
|
||||
p++;
|
||||
} while (len > 0);
|
||||
} while ( len > 0 );
|
||||
|
||||
// topic comes before packet identifier
|
||||
p = stringprint(p, topic);
|
||||
|
||||
// add packet identifier. used for checking PUBACK in QOS > 0
|
||||
if (qos > 0) {
|
||||
if(qos > 0) {
|
||||
p[0] = (packet_id_counter >> 8) & 0xFF;
|
||||
p[1] = packet_id_counter & 0xFF;
|
||||
p += 2;
|
||||
p+=2;
|
||||
|
||||
// increment the packet id
|
||||
packet_id_counter++;
|
||||
}
|
||||
|
||||
memmove(p, data, bLen);
|
||||
p += bLen;
|
||||
p+= bLen;
|
||||
len = p - packet;
|
||||
DEBUG_PRINTLN(F("MQTT publish packet:"));
|
||||
DEBUG_PRINTBUFFER(buffer, len);
|
||||
@ -733,12 +698,12 @@ uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
|
||||
|
||||
p[0] = MQTT_CTRL_SUBSCRIBE << 4 | MQTT_QOS_1 << 1;
|
||||
// fill in packet[1] last
|
||||
p += 2;
|
||||
p+=2;
|
||||
|
||||
// packet identifier. used for checking SUBACK
|
||||
p[0] = (packet_id_counter >> 8) & 0xFF;
|
||||
p[1] = packet_id_counter & 0xFF;
|
||||
p += 2;
|
||||
p+=2;
|
||||
|
||||
// increment the packet id
|
||||
packet_id_counter++;
|
||||
@ -749,13 +714,14 @@ uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
|
||||
p++;
|
||||
|
||||
len = p - packet;
|
||||
packet[1] = len - 2; // don't include the 2 bytes of fixed header data
|
||||
packet[1] = len-2; // don't include the 2 bytes of fixed header data
|
||||
DEBUG_PRINTLN(F("MQTT subscription packet:"));
|
||||
DEBUG_PRINTBUFFER(buffer, len);
|
||||
return len;
|
||||
}
|
||||
|
||||
|
||||
|
||||
uint8_t Adafruit_MQTT::unsubscribePacket(uint8_t *packet, const char *topic) {
|
||||
|
||||
uint8_t *p = packet;
|
||||
@ -763,12 +729,12 @@ uint8_t Adafruit_MQTT::unsubscribePacket(uint8_t *packet, const char *topic) {
|
||||
|
||||
p[0] = MQTT_CTRL_UNSUBSCRIBE << 4 | 0x1;
|
||||
// fill in packet[1] last
|
||||
p += 2;
|
||||
p+=2;
|
||||
|
||||
// packet identifier. used for checking UNSUBACK
|
||||
p[0] = (packet_id_counter >> 8) & 0xFF;
|
||||
p[1] = packet_id_counter & 0xFF;
|
||||
p += 2;
|
||||
p+=2;
|
||||
|
||||
// increment the packet id
|
||||
packet_id_counter++;
|
||||
@ -776,7 +742,7 @@ uint8_t Adafruit_MQTT::unsubscribePacket(uint8_t *packet, const char *topic) {
|
||||
p = stringprint(p, topic);
|
||||
|
||||
len = p - packet;
|
||||
packet[1] = len - 2; // don't include the 2 bytes of fixed header data
|
||||
packet[1] = len-2; // don't include the 2 bytes of fixed header data
|
||||
DEBUG_PRINTLN(F("MQTT unsubscription packet:"));
|
||||
DEBUG_PRINTBUFFER(buffer, len);
|
||||
return len;
|
||||
@ -812,13 +778,11 @@ uint8_t Adafruit_MQTT::disconnectPacket(uint8_t *packet) {
|
||||
// Adafruit_MQTT_Publish Definition ////////////////////////////////////////////
|
||||
|
||||
Adafruit_MQTT_Publish::Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver,
|
||||
const char *feed, uint8_t
|
||||
q) {
|
||||
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);
|
||||
@ -842,8 +806,7 @@ bool Adafruit_MQTT_Publish::publish(const char *payload) {
|
||||
}
|
||||
|
||||
//publish buffer of arbitrary length
|
||||
bool Adafruit_MQTT_Publish::publish(uint8_t *payload, uint16_t
|
||||
bLen) {
|
||||
bool Adafruit_MQTT_Publish::publish(uint8_t *payload, uint16_t bLen) {
|
||||
|
||||
return mqtt->publish(topic, payload, bLen, qos);
|
||||
}
|
||||
@ -852,8 +815,7 @@ bLen) {
|
||||
// Adafruit_MQTT_Subscribe Definition //////////////////////////////////////////
|
||||
|
||||
Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver,
|
||||
const char *feed, uint8_t
|
||||
q) {
|
||||
const char *feed, uint8_t q) {
|
||||
mqtt = mqttserver;
|
||||
topic = feed;
|
||||
qos = q;
|
||||
@ -879,7 +841,7 @@ void Adafruit_MQTT_Subscribe::setCallback(SubscribeCallbackBufferType cb) {
|
||||
|
||||
void Adafruit_MQTT_Subscribe::setCallback(AdafruitIO_MQTT *io, SubscribeCallbackIOType cb) {
|
||||
callback_io = cb;
|
||||
io_mqtt = io;
|
||||
io_mqtt= io;
|
||||
}
|
||||
|
||||
void Adafruit_MQTT_Subscribe::removeCallback(void) {
|
||||
|
Loading…
Reference in New Issue
Block a user