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

RP2040 WDT=8.3secs - enable after wifi connect #670

Merged
merged 3 commits into from
Dec 21, 2024
Merged

RP2040 WDT=8.3secs - enable after wifi connect #670

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2475f33
RP2040 WDT=8.3secs - enable after wifi connect
tyeth Dec 17, 2024
86936f2
Move enableWDT to after wifi connection for all platforms
tyeth Dec 20, 2024
24cf180
Correct verbiage for RP2040 rather than Pico
tyeth Dec 20, 2024
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: 6 additions & 0 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,12 @@ upload_port = /dev/cu.usbmodem1201
[env:raspberypi_picow]
extends = common:rp2040

[env:raspberypi_picow_debug_port_only]
extends = common:rp2040
build_flags =
-DUSE_TINYUSB
-DDEBUG_RP2040_PORT=Serial
brentru marked this conversation as resolved.
Show resolved Hide resolved

[env:raspberypi_picow_debug]
extends = common:rp2040
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
Expand Down
8 changes: 7 additions & 1 deletion src/Wippersnapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2748,8 +2748,10 @@ void Wippersnapper::connect() {
// Dump device info to the serial monitor
printDeviceInfo();

// enable global WDT
// enable global WDT
#ifndef ARDUINO_ARCH_RP2040
WS.enableWDT(WS_WDT_TIMEOUT);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider moving this guard into the enableWDT() call, so we aren't ifndef''ing each time we call enableWDT()`

#endif

// Generate device identifier
if (!generateDeviceUID()) {
Expand All @@ -2772,7 +2774,11 @@ void Wippersnapper::connect() {
WS_DEBUG_PRINTLN("Running Network FSM...");
// Run the network fsm
runNetFSM();
#ifdef ARDUINO_ARCH_RP2040
WS.enableWDT(WS_WDT_TIMEOUT); // wifi multi doesn't feed the WDT
#else
WS.feedWDT();
#endif

#ifdef USE_DISPLAY
WS._ui_helper->set_load_bar_icon_complete(loadBarIconCloud);
Expand Down
7 changes: 6 additions & 1 deletion src/Wippersnapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,12 @@ typedef enum {
FSM_NET_ESTABLISH_MQTT,
} fsm_net_t;

#define WS_WDT_TIMEOUT 60000 ///< WDT timeout
#ifdef ARDUINO_ARCH_RP2040
#define WS_WDT_TIMEOUT 8388 ///< Pico Max WDT timeout
tyeth marked this conversation as resolved.
Show resolved Hide resolved
#else
#define WS_WDT_TIMEOUT 60000 ///< WDT timeout
#endif

#define WS_MAX_ALT_WIFI_NETWORKS 3 ///< Maximum number of alternative networks
/* MQTT Configuration */
#define WS_KEEPALIVE_INTERVAL_MS \
Expand Down
Loading