nRF52: Bootloader now doesn't reset RESETREAS

nRF52: If we reboot because of LOCKUP, don't enable DCDC converter Bangle.js2: Test screen now fails if no DCDC enabled
espruino · Jan 16, 2025 · ef27cea · ef27cea
1 parent 49c60d8
commit ef27cea
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,9 @@
             Fix escaping of `\r` in built-in modules, fixed regression that stopped Espruino WiFi 2v25 from connecting to Wifi
             BLE: always return privacy info from NRF.getSecurityStatus(), regardless of connection state
             Linux SDL build: mouse events now create `E.on("touch"` events like on CYD
+            nRF52: Bootloader now doesn't reset RESETREAS
+            nRF52: If we reboot because of LOCKUP, don't enable DCDC converter
+            Bangle.js2: Test screen now fails if no DCDC enabled
 
      2v25 : ESP32C3: Get analogRead working correctly
             Graphics: Adjust image alignment when rotating images to avoid cropping (fix #2535)

diff --git a/libs/js/banglejs/Bangle_showTestScreen.js b/libs/js/banglejs/Bangle_showTestScreen.js
@@ -34,7 +34,12 @@
       var av = analogRead(D3), v=av*13.359;
       chg |= Bangle.isCharging();
       if (av>mv) cup=1;
-      draw(8,'Chg',v.toFixed(2)+"v "+(Bangle.isCharging()?"charge":"discharge"),chg&&cup&&(v>2)&&(v<4.4));
+      var ok = chg&&cup&&(v>2)&&(v<4.4), msg = v.toFixed(2)+"v "+(Bangle.isCharging()?"charge":"discharge");
+      if (!peek32(0x40000578)) { // DCDCEN
+        msg = "NO DCDC";
+        ok = false;
+      }
+      draw(8,'Chg',msg,ok);
     },500);
   },1000);
   Bangle.on('swipe', e => {

diff --git a/libs/js/banglejs/Bangle_showTestScreen.min.js b/libs/js/banglejs/Bangle_showTestScreen.min.js
diff --git a/targets/nrf5x/bluetooth.c b/targets/nrf5x/bluetooth.c
@@ -2636,10 +2636,14 @@ static void ble_stack_init() {
     NRF_SDH_SOC_OBSERVER(m_soc_observer, APP_SOC_OBSERVER_PRIO, soc_evt_handler, NULL);
 #endif
 
-#if defined(PUCKJS) || defined(RUUVITAG) || defined(ESPR_DCDC_ENABLE)
-    // can only be enabled if we're sure we have a DC-DC
-    err_code = sd_power_dcdc_mode_set(NRF_POWER_DCDC_ENABLE);
-    APP_ERROR_CHECK(err_code);
+#if defined(ESPR_DCDC_ENABLE)
+    if (!(NRF_POWER->RESETREAS & POWER_RESETREAS_LOCKUP_Msk)) {
+      /* If we previously booted and got a LOCKUP reset, this could well be due to a DCDC
+      converter issue, so don't enable DCDC if that's the case. */
+      // can only be enabled if we're sure we have a DC-DC
+      err_code = sd_power_dcdc_mode_set(NRF_POWER_DCDC_ENABLE);
+      APP_ERROR_CHECK(err_code);
+    }
 #endif
 #if defined(ESPR_DCDC_HV_ENABLE)
     err_code = sd_power_dcdc0_mode_set(NRF_POWER_DCDC_ENABLE);

diff --git a/targets/nrf5x_dfu/main.c b/targets/nrf5x_dfu/main.c
@@ -396,8 +396,6 @@ int main(void)
       } else {
         // DICKENS: Enter bootloader only if BTN2 held as well
         if (!get_btn2_state()) {
-          // Clear reset reason flags
-          NRF_POWER->RESETREAS = 0xFFFFFFFF;
 #ifdef ESPR_BOOTLOADER_SPIFLASH
           lcd_init();
 #ifndef DICKENS
@@ -427,8 +425,6 @@ int main(void)
       while (*reasons) reasons++;
       reasons++;
     }
-    // Clear reset reason flags
-    NRF_POWER->RESETREAS = 0xFFFFFFFF;
     print_fw_version();
 #ifdef ESPR_BOOTLOADER_SPIFLASH
     if (!get_btn1_state()) flashCheckAndRun();