Skip to content
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

Fix beta4 registration bug #123

Closed
wants to merge 3 commits into from
Closed

Fix beta4 registration bug #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff27a06
fix-net-fsm-call-bug
brentru Aug 20, 2021
8af8e83
Merge branch 'master' of github.com:adafruit/Adafruit_Wippersnapper_A…
brentru Aug 20, 2021
3b15e0d
update versions
brentru Aug 20, 2021
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
6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
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 Expand Up @@ -86,13 +86,9 @@ samd51: samd51-metro-airlift samd51-pyportal
clean-samd51: clean-samd51-metro-airlift clean-samd51-pyportal

samd51-metro-airlift:
mkdir -p build/$(BOARD_METRO_AIRLIFT)/
python3 $(BUILD_PLATFORM) metro_m4_airliftlite_tinyusb --export-binaries
python3 $(UF2CONV) examples/Wippersnapper_demo/build/adafruit.samd.adafruit_metro_m4_airliftlite/Wippersnapper_demo.ino.bin --base $(UF2_BASE_SAMD51) --family $(UF2_FAMILY_SAMD51) -o build/samd51-metro-airlift/$(PROJECT_NAME)-$(BOARD_METRO_AIRLIFT)-$(PROJECT_VER_MAJOR)-$(PROJECT_VER_MINOR)-$(PROJECT_VER_PATCH)-$(PROJECT_VER_BUILD).$(PROJECT_VER_BUILD_NUM).uf2

samd51-pyportal:
mkdir -p build/$(BOARD_PYPORTAL)/
python3 $(BUILD_PLATFORM) pyportal_tinyusb --export-binaries
python3 $(UF2CONV) examples/Wippersnapper_demo/build/adafruit.samd.adafruit_pyportal_m4/Wippersnapper_demo.ino.bin --base $(UF2_BASE_SAMD51) --family $(UF2_FAMILY_SAMD51) -o build/samd51-pyportal/$(PROJECT_NAME)-$(BOARD_PYPORTAL)-$(PROJECT_VER_MAJOR)-$(PROJECT_VER_MINOR)-$(PROJECT_VER_PATCH)-$(PROJECT_VER_BUILD).$(PROJECT_VER_BUILD_NUM).uf2

clean-samd51-metro-airlift:
Expand Down
6 changes: 4 additions & 2 deletions src/Wippersnapper.cpp
View file
Open in desktop
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
View file
Open in desktop
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