mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-07-17 01:22:36 +00:00
Merge remote-tracking branch 'upstream/dev' into rak-ethernet
# Conflicts: # examples/companion_radio/main.cpp
This commit is contained in:
@@ -32,6 +32,10 @@ void setup() {
|
||||
|
||||
board.begin();
|
||||
|
||||
#ifdef HAS_EXTERNAL_WATCHDOG
|
||||
external_watchdog.begin();
|
||||
#endif
|
||||
|
||||
#ifdef DISPLAY_CLASS
|
||||
if (display.begin()) {
|
||||
display.startFrame();
|
||||
@@ -150,4 +154,7 @@ void loop() {
|
||||
ui_task.loop();
|
||||
#endif
|
||||
rtc_clock.tick();
|
||||
#ifdef HAS_EXTERNAL_WATCHDOG
|
||||
external_watchdog.loop();
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user