Skip to content

Commit 1f4d0cb

Browse files
authored
Merge pull request #124 from adafruit/fix-fsm-in-wrapper
bump to 5, fix fsm issue
2 parents 49d4bc4 + fd5a1cb commit 1f4d0cb

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PROJECT_VER_MAJOR := 1
77
PROJECT_VER_MINOR := 0
88
PROJECT_VER_PATCH := 0
99
PROJECT_VER_BUILD := beta
10-
PROJECT_VER_BUILD_NUM := 4
10+
PROJECT_VER_BUILD_NUM := 5
1111

1212
BOARD_PYPORTAL := samd51-pyportal
1313
BOARD_METRO_AIRLIFT := samd51-metro-airlift

src/Wippersnapper.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,8 @@ void Wippersnapper::enableWDT(int timeoutMS) {
974974
*/
975975
/*******************************************************/
976976
void Wippersnapper::processPackets() {
977-
runNetFSM();
977+
// runNetFSM(); // NOTE: Removed for now, causes error with virtual _connect
978+
// method when caused with WS object in another file.
978979
feedWDT();
979980
// Process all incoming packets from Wippersnapper MQTT Broker
980981
WS._mqtt->processPackets(10);
@@ -996,7 +997,8 @@ void Wippersnapper::processPackets() {
996997
/*******************************************************/
997998
void Wippersnapper::publish(const char *topic, uint8_t *payload, uint16_t bLen,
998999
uint8_t qos) {
999-
runNetFSM();
1000+
// runNetFSM(); // NOTE: Removed for now, causes error with virtual _connect
1001+
// method when caused with WS object in another file.
10001002
feedWDT();
10011003
WS._mqtt->publish(topic, payload, bLen, qos);
10021004
}

src/Wippersnapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
#endif
6565

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

6969
// Reserved Adafruit IO MQTT topics
7070
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

0 commit comments

Comments
 (0)