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

examples/simple_room_server/main.cpp

@@ -27,6 +27,10 @@ void setup() {
 
   board.begin();
 
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.begin();
+#endif
+
 #ifdef DISPLAY_CLASS
   if (display.begin()) {
     display.startFrame();
@@ -118,7 +122,9 @@ void loop() {
   ui_task.loop();
 #endif
   rtc_clock.tick();
-
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.loop();
+#endif
   if (the_mesh.getNodePrefs()->powersaving_enabled && !board.isUsbDataConnected()) {
     uint32_t sleep_secs = the_mesh.getPowerSaveSleepSeconds(30);
 #if defined(NRF52_PLATFORM)