Changeset 540

Timestamp:

04/24/08 20:09:54 (3 weeks ago)

Author:

agr

Message:

sampl

Files:

• nano-RK/projects/SAMPL/client/nrk_cfg.h (modified) (1 diff)
• nano-RK/projects/SAMPL/gateway/nrk_cfg.h (modified) (1 diff)
• nano-RK/src/kernel/source/nrk.c (modified) (2 diffs)
• nano-RK/src/kernel/source/nrk_error.c (modified) (3 diffs)

nano-RK/projects/SAMPL/client/nrk_cfg.h

@@ -13 +13 @@
-// #define NRK_HALT_ON_ERROR
-//#define NRK_HALT_AND_LOOP_ON_ERROR
+#define NRK_REBOOT_ON_ERROR
+
+
-#define NRK_WATCHDOG
-// NRK_STACK_CHECK adds a little check to see if the bottom of the stack

nano-RK/projects/SAMPL/gateway/nrk_cfg.h

@@ -8 +8 @@
-// NRK_REPORT_ERRORS will cause the kernel to print out information about
-// missed deadlines or reserve violations
-
+//
-// NRK_HALT_ON_ERRORS will cause the kernel to freeze on errors so that
-// it is easier to see debugging messages.
-// #define NRK_HALT_ON_ERROR
-//#define NRK_HALT_AND_LOOP_ON_ERROR
+
+#define NRK_REBOOT_ON_ERROR
-
-#define NRK_WATCHDOG

nano-RK/src/kernel/source/nrk.c

@@ -71 +71 @@
-{
-        
-in
+uint8_
-//    unsigned char *stkc;
-        
@@ -82 +82 @@
-   #ifdef NRK_STARTUP_VOLTAGE_CHECK
-        if(nrk_voltage_status()==0) nrk_kernel_error_add(NRK_LOW_VOLTAGE,0);
+   #endif
+
+   #ifdef NRK_REBOOT_ON_ERROR
+   #ifndef NRK_WATCHDOG
+   while(1)
+           {
+                nrk_kprintf( PSTR("KERNEL CONFIG CONFLICT:  NRK_REBOOT_ON_ERROR needs watchdog!\r\n") );
+                for (i = 0; i < 100; i++)
+                        nrk_spin_wait_us (1000);
+           }
+   #endif
-   #endif
-

nano-RK/src/kernel/source/nrk_error.c

@@ -78 +78 @@
-  if (error_num == 0)
-    return 0;
-
+
+
-   #ifdef NRK_HALT_ON_ERROR
-   nrk_int_disable ();
@@ -84 +85 @@
-   nrk_watchdog_disable();
-   #endif
-
- /*  */
-
+ #endif 
+
+
-#ifdef NRK_HALT_AND_LOOP_ON_ERROR 
-    nrk_int_disable ();
@@ -170 +171 @@
-    putchar ('\r');
-    putchar ('\n');
-
+
+
+
+
+
+
+
-//t=error_num;
-#ifdef NRK_HALT_AND_LOOP_ON_ERROR