mirror of
https://github.com/mikecarper/MeshCore.git
synced 2026-07-28 22:19:25 +00:00
Merge branch 'dev' of github.com:meshcore-dev/MeshCore into keymindCascade
# Conflicts: # examples/simple_repeater/main.cpp # examples/simple_room_server/main.cpp # src/helpers/sensors/EnvironmentSensorManager.cpp # src/helpers/sensors/MicroNMEALocationProvider.h
This commit is contained in:
@@ -564,6 +564,10 @@ void setup() {
|
||||
|
||||
board.begin();
|
||||
|
||||
#ifdef HAS_EXTERNAL_WATCHDOG
|
||||
external_watchdog.begin();
|
||||
#endif
|
||||
|
||||
if (!radio_init()) { halt(); }
|
||||
|
||||
fast_rng.begin(radio_driver.getRngSeed());
|
||||
@@ -595,4 +599,7 @@ void setup() {
|
||||
void loop() {
|
||||
the_mesh.loop();
|
||||
rtc_clock.tick();
|
||||
#ifdef HAS_EXTERNAL_WATCHDOG
|
||||
external_watchdog.loop();
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user