If watchdog is on and automatic, ensure that reset() keeps the automatic kicking going

            Ensure that a console stays locked even after
            Ensure interpreter flags (eg echo) are cleared after a `reset()`
            nRF5x: When watchdog is on and automatic, automatically wake up often enough to service it

Author: gfwilliams

ChangeLog

@@ -5,6 +5,10 @@
             Smartibot devices now advertise on BLE as 'Smartibot abcd'
             nRF5x: Leave digital input disconnected for analog read (saves power)
             nRF5x: Return 'analog' as pin mode for any pin where input is disconnected
+            If watchdog is on and automatic, ensure that `reset()` keeps the automatic kicking going
+            Ensure that a console stays locked even after 
+            Ensure interpreter flags (eg echo) are cleared after a `reset()`
+            nRF5x: When watchdog is on and automatic, automatically wake up often enough to service it
 
      2v03 : nRF5x: Fix issue when calling NRF.setAdvertising while connected via BLE (fix #1659)
             nRF5x: 'dump()' not outputs `NRF.setSecurity` line if it has been called.

src/jsinteractive.c

@@ -777,7 +777,7 @@ void jsiSemiInit(bool autoLoad) {
   // Set state
   interruptedDuringEvent = false;
   // Set defaults
-  jsiStatus &= ~JSIS_SOFTINIT_MASK;
+  jsiStatus &= JSIS_SOFTINIT_MASK;
 #ifndef SAVE_ON_FLASH
   pinBusyIndicator = DEFAULT_BUSY_PIN_INDICATOR;
 #endif

src/jsinteractive.h

@@ -149,7 +149,8 @@ typedef enum {
   JSIS_COMPLETELY_RESET   = 1<<11, ///< Has the board powered on, having not loaded anything from flash
 
   JSIS_ECHO_OFF_MASK = JSIS_ECHO_OFF|JSIS_ECHO_OFF_FOR_LINE,
-  JSIS_SOFTINIT_MASK = JSIS_PASSWORD_PROTECTED // stuff that DOESN'T get reset on softinit
+  JSIS_SOFTINIT_MASK = JSIS_PASSWORD_PROTECTED|JSIS_WATCHDOG_AUTO // stuff that DOESN'T get reset on softinit
+    // watchdog can't be reset without a reboot so if it's set to auto we must keep it as auto
 } PACKED_FLAGS JsiStatus;
 
 extern JsiStatus jsiStatus;

src/jswrap_espruino.c

@@ -623,10 +623,9 @@ setInterval(function() {
 
 **NOTE:** This is only implemented on STM32 and nRF5x devices (all official Espruino boards).
 
-**NOTE:** On STM32 (Pico, WiFi, Original) with `setDeepSleep(1)`, or nRF52 (Puck, Pixl, MDBT42) you need to
+**NOTE:** On STM32 (Pico, WiFi, Original) with `setDeepSleep(1)` you need to
 explicitly wake Espruino up with an interval of less than the watchdog timeout or the watchdog will fire and
-the board will reboot.
-
+the board will reboot. You can do this with `setInterval("", time_in_milliseconds)`.
  */
 void jswrap_espruino_enableWatchdog(JsVarFloat time, JsVar *isAuto) {
   if (time<0 || isnan(time)) time=1;

targets/nrf5x/jshardware.c

@@ -1580,6 +1580,18 @@ bool jshSleep(JsSysTime timeUntilWake) {
    */
   if (timeUntilWake > jshGetTimeFromMilliseconds(240*1000))
     timeUntilWake = jshGetTimeFromMilliseconds(240*1000);
+
+  /* Are we set to ping the watchdog automatically? If so ensure
+   * that we always wake up often enough to ping it by ensuring
+   * we don't sleep for more than half the WDT time. */
+  if (jsiStatus&JSIS_WATCHDOG_AUTO) {
+    // actual time is CRV / 32768 seconds
+    // we just kicked watchdog (in jsinteractive.c) so aim to wake up just a little before it fires
+    JsSysTime max = jshGetTimeFromMilliseconds(NRF_WDT->CRV/34.000);
+    if (timeUntilWake > max) timeUntilWake = max;
+  }
+
+
   if (timeUntilWake < JSSYSTIME_MAX) {
 #ifdef BLUETOOTH
 #if NRF_SD_BLE_API_VERSION<5