Skip to content

Commit

Permalink
Merge pull request #124 from adafruit/fix-fsm-in-wrapper
Browse files Browse the repository at this point in the history
bump to 5, fix fsm issue
  • Loading branch information
brentru authored Aug 20, 2021
2 parents 49d4bc4 + fd5a1cb commit 1f4d0cb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PROJECT_VER_MAJOR := 1
PROJECT_VER_MINOR := 0
PROJECT_VER_PATCH := 0
PROJECT_VER_BUILD := beta
PROJECT_VER_BUILD_NUM := 4
PROJECT_VER_BUILD_NUM := 5

BOARD_PYPORTAL := samd51-pyportal
BOARD_METRO_AIRLIFT := samd51-metro-airlift
Expand Down
6 changes: 4 additions & 2 deletions src/Wippersnapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,8 @@ void Wippersnapper::enableWDT(int timeoutMS) {
*/
/*******************************************************/
void Wippersnapper::processPackets() {
runNetFSM();
// runNetFSM(); // NOTE: Removed for now, causes error with virtual _connect
// method when caused with WS object in another file.
feedWDT();
// Process all incoming packets from Wippersnapper MQTT Broker
WS._mqtt->processPackets(10);
Expand All @@ -996,7 +997,8 @@ void Wippersnapper::processPackets() {
/*******************************************************/
void Wippersnapper::publish(const char *topic, uint8_t *payload, uint16_t bLen,
uint8_t qos) {
runNetFSM();
// runNetFSM(); // NOTE: Removed for now, causes error with virtual _connect
// method when caused with WS object in another file.
feedWDT();
WS._mqtt->publish(topic, payload, bLen, qos);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Wippersnapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#endif

#define WS_VERSION \
"1.0.0-beta.4" ///< WipperSnapper app. version (semver-formatted)
"1.0.0-beta.5" ///< WipperSnapper app. version (semver-formatted)

// Reserved Adafruit IO MQTT topics
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic
Expand Down

0 comments on commit 1f4d0cb

Please sign in to comment.