Diff: WizziDebug.cpp

Revision:

8:87a867b8a129

Parent:

7:8e75991f65e5

Child:

9:87d9cc850af1

--- a/WizziDebug.cpp	Tue Apr 02 08:54:07 2019 +0000
+++ b/WizziDebug.cpp	Wed Jul 31 16:49:03 2019 +0000
@@ -119,10 +119,9 @@
 {
     if (test) return;
         
-    char* assert_msg = "ASSERT ";
     int assert_size;
     
-    assert_size = sprintf(g_dbg_msg, assert_msg);
+    assert_size = sprintf(g_dbg_msg, "ASSERT ");
     
     // expand assert string
     va_list args;
@@ -135,7 +134,7 @@
     g_dbg_serial->printf(g_dbg_msg);
         
 #ifdef __REBOOT_ON_ASSERT__
-    Thread::wait(1000);
+    ThisThread::sleep_for(1000);
     NVIC_SystemReset();
 #else
     DigitalOut* dbg_led = NULL;
@@ -151,7 +150,7 @@
         {
             *(dbg_led) = !(*(dbg_led));
         }
-        Thread::wait(30);
+        ThisThread::sleep_for(30);
         //wait_ms(30);
     }
 #endif
@@ -247,7 +246,7 @@
     
     while (true)
     {
-        g_dbg_print.wait();
+        g_dbg_print.try_acquire();
         
         if (g_dbg_missing)
         {
@@ -272,7 +271,7 @@
 #endif
 
             g_dbg_ressource.unlock();
-            Thread::yield();
+            ThisThread::yield();
         }
 
     }
@@ -282,30 +281,3 @@
 {
     g_dbg_rx_callback = rx_isr;
 }
-
-// Reset_Handler
-// NMI_Handler
-// HardFault_Handler
-// MemManage_Handler
-// BusFault_Handler
-// UsageFault_Handler
-extern "C" void HardFault_Handler() {
-    ASSERT(false, "Hard Fault!\r\n");
-    //NVIC_SystemReset();
-}
-extern "C" void NMI_Handler() {
-    ASSERT(false, "NMI Fault!\r\n");
-    //NVIC_SystemReset();
-}
-extern "C" void MemManage_Handler() {
-    ASSERT(false, "MemManage Fault!\r\n");
-    //NVIC_SystemReset();
-}
-extern "C" void BusFault_Handler() {
-    ASSERT(false, "BusFault Fault!\r\n");
-    //NVIC_SystemReset();
-}
-extern "C" void UsageFault_Handler() {
-    ASSERT(false, "UsageFault Fault!\r\n");
-    //NVIC_SystemReset();
-}