mathieu/Adafruit_MQTT_Library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert code formatting changes by CLion

Browse Source
This commit is contained in:
Lucas Jandrew 2020-02-24 01:22:58 -05:00
parent 8e8245d734
commit 3ba30fe64b
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Adafruit_MQTT.cpp
View File

@ -167,12 +167,10 @@ int8_t Adafruit_MQTT::connect() {
if (len != 4) { if (len != 4) {
return -1; return -1;
} }
if ((buffer[0] != (MQTT_CTRL_CONNECTACK << 4)) || (buffer[1] != 2)) { if ((buffer[0] != (MQTT_CTRL_CONNECTACK << 4)) || (buffer[1] != 2))
return -1; return -1;
} if (buffer[3] != 0)
if (buffer[3] != 0) {
return buffer[3]; return buffer[3];
}
// Setup subscriptions once connected. // Setup subscriptions once connected.
for (uint8_t i = 0; i < MAXSUBSCRIPTIONS; i++) { for (uint8_t i = 0; i < MAXSUBSCRIPTIONS; i++) {
@ -229,21 +227,9 @@ uint16_t Adafruit_MQTT::processPacketsUntil(uint8_t *buffer, uint8_t waitforpack
if (packetType == waitforpackettype) { if (packetType == waitforpackettype) {
return len; return len;
} else { } else {
// Serial.print("Packet Types: ");
// Serial.print(packetType);
// Serial.print(" ");
// Serial.println(waitforpackettype);
if (packetType == MQTT_CTRL_PUBLISH) { if (packetType == MQTT_CTRL_PUBLISH) {
handleSubscriptionPacket(len); handleSubscriptionPacket(len);
} else { } else {
Serial.print("Packet dropped: ");
Serial.print(len);
Serial.print(" ");
for (int i = 0; i < MAXBUFFERSIZE; i++) {
Serial.print(this->buffer[i]);
Serial.print(" ");
}
Serial.println();
ERROR_PRINTLN(F("Dropped a packet")); ERROR_PRINTLN(F("Dropped a packet"));
} }
} }
@ -259,9 +245,7 @@ uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t maxsize, uint16
// read the packet type: // read the packet type:
rlen = readPacket(pbuff, 1, timeout); rlen = readPacket(pbuff, 1, timeout);
if (rlen != 1) { if (rlen != 1) return 0;
return 0;
}
DEBUG_PRINT(F("Packet Type:\t")); DEBUG_PRINT(F("Packet Type:\t"));
DEBUG_PRINTBUFFER(pbuff, rlen); DEBUG_PRINTBUFFER(pbuff, rlen);
@ -273,9 +257,7 @@ uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t maxsize, uint16
do { do {
rlen = readPacket(pbuff, 1, timeout); rlen = readPacket(pbuff, 1, timeout);
if (rlen != 1) { if (rlen != 1) return 0;
return 0;
}
encodedByte = pbuff[0]; // save the last read val encodedByte = pbuff[0]; // save the last read val
pbuff++; // get ready for reading the next byte pbuff++; // get ready for reading the next byte
uint32_t intermediate = encodedByte & 0x7F; uint32_t intermediate = encodedByte & 0x7F;
@ -332,9 +314,7 @@ bool Adafruit_MQTT::disconnect() {
// Construct and send disconnect packet. // Construct and send disconnect packet.
uint8_t len = disconnectPacket(buffer); uint8_t len = disconnectPacket(buffer);
if (!sendPacket(buffer, len)) { if (!sendPacket(buffer, len)) DEBUG_PRINTLN(F("Unable to send disconnect packet"));
DEBUG_PRINTLN(F("Unable to send disconnect packet"));
}
return disconnectServer(); return disconnectServer();
@ -592,16 +572,14 @@ bool Adafruit_MQTT::ping(uint8_t num) {
while (num--) { while (num--) {
// Construct and send ping packet. // Construct and send ping packet.
uint8_t len = pingPacket(buffer); uint8_t len = pingPacket(buffer);
if (!sendPacket(buffer, len)) { if (!sendPacket(buffer, len))
continue; continue;
}
// Process ping reply. // Process ping reply.
processPacketsUntil(buffer, MQTT_CTRL_PINGRESP, PING_TIMEOUT_MS); len = processPacketsUntil(buffer, MQTT_CTRL_PINGRESP, PING_TIMEOUT_MS);
if (buffer[0] == (MQTT_CTRL_PINGRESP << 4)) { if (buffer[0] == (MQTT_CTRL_PINGRESP << 4))
return true; return true;
} }
}
return false; return false;
} }
@ -748,7 +726,8 @@ uint16_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
return len; return len;
} }
uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic, uint8_t qos) { uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
uint8_t qos) {
uint8_t *p = packet; uint8_t *p = packet;
uint16_t len; uint16_t len;