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

fix for readpacket

This commit is contained in:
ladyada 2016-06-07 22:17:05 -04:00
parent a85fc90df0
commit 7e888e576a
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Adafruit_MQTT_FONA.h
View File

@ -68,8 +68,7 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
return fona->TCPconnected(); return fona->TCPconnected();
} }
uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout, uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout) {
bool checkForValidPubPacket = false) {
uint8_t *buffp = buffer; uint8_t *buffp = buffer;
DEBUG_PRINTLN(F("Reading a packet..")); DEBUG_PRINTLN(F("Reading a packet.."));
@ -104,19 +103,8 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
if (len == maxlen) { // we read all we want, bail if (len == maxlen) { // we read all we want, bail
DEBUG_PRINT(F("Read packet:\t")); DEBUG_PRINT(F("Read packet:\t"));
DEBUG_PRINTBUFFER(buffer, len); DEBUG_PRINTBUFFER(buffer, len);
return len; return len;
} }
// special case where we just one one publication packet at a time
if (checkForValidPubPacket) {
if ((buffer[0] == (MQTT_CTRL_PUBLISH << 4)) && (buffer[1] == len-2)) {
// oooh a valid publish packet!
DEBUG_PRINT(F("Read PUBLISH packet:\t"));
DEBUG_PRINTBUFFER(buffer, len);
return len;
}
}
} }
#ifdef ADAFRUIT_SLEEPYDOG_H #ifdef ADAFRUIT_SLEEPYDOG_H
Watchdog.reset(); Watchdog.reset();
@ -125,7 +113,7 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
timeout -= MQTT_FONA_QUERYDELAY; // this is how long it takes to query the FONA for avail() timeout -= MQTT_FONA_QUERYDELAY; // this is how long it takes to query the FONA for avail()
delay(MQTT_FONA_INTERAVAILDELAY); delay(MQTT_FONA_INTERAVAILDELAY);
} }
return len; return len;
} }