Skip to content

Library Fixes #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brentru merged 7 commits into from
Aug 17, 2018
Merged

Library Fixes #127

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb537cc
Removing warnings
Aug 17, 2018
81cb29a
handle reading zero-length packets
Aug 17, 2018
6882fa2
updating travis to exclude archived libraries, addin Arduino WiFi101 …
Aug 17, 2018
9c0ce72
adding esp lib to travis
Aug 17, 2018
7ff5642
restrict builds to current hardware platforms
Aug 17, 2018
600e86c
travis, esp8266: skip esp target for non-esp-based examples
Aug 17, 2018
4640dc8
adding test skips for zero, fixing fingerprint error
Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Removing warnings
  • Loading branch information
brentru committed Aug 17, 2018
commit eb537cc08566cf8fc8206528437fe97720ef9a70
21 changes: 12 additions & 9 deletions Adafruit_MQTT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ int8_t Adafruit_MQTT::connect() {
success = true;
break;
}
//Serial.println("\t**failed, retrying!");
}
if (! success) return -2; // failed to sub for some reason
}
Expand All @@ -206,15 +205,20 @@ 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 (len = readFullPacket(buffer, MAXBUFFERSIZE, timeout)) {

//DEBUG_PRINT("Packet read size: "); DEBUG_PRINTLN(len);
// TODO: add subscription reading & call back processing here
while(true) {
len = readFullPacket(buffer, MAXBUFFERSIZE, timeout);

if ((buffer[0] >> 4) == waitforpackettype) {
//DEBUG_PRINTLN(F("Found right packet"));
if(len == 0){
break;
}

if ((buffer[0] >> 4) == waitforpackettype)
{
return len;
} else {
}
else
{
ERROR_PRINTLN(F("Dropped a packet"));
}
}
Expand Down Expand Up @@ -407,7 +411,6 @@ 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();

Expand Down Expand Up @@ -482,7 +485,7 @@ 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;
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;
Expand Down