Merge branch 'master' into nrf-softcrypt

src/nrf52/main-nrf52.cpp

@@ -33,8 +33,8 @@ void __attribute__((noreturn)) __assert_func(const char *file, int line, const c
 {
     DEBUG_MSG("assert failed %s: %d, %s, test=%s\n", file, line, func, failedexpr);
     // debugger_break(); FIXME doesn't work, possibly not for segger
-    while (1)
-        ; // FIXME, reboot!
+    // Reboot cpu
+    NVIC_SystemReset();
 }
 
 void getMacAddr(uint8_t *dmac)
@@ -196,4 +196,4 @@ void clearBonds() {
         nrf52Bluetooth->setup();
     }
     nrf52Bluetooth->clearBonds();
-}
+}