add software watchdog

Author: phkehl

examples/ex14/config.h

@@ -17,6 +17,8 @@
 
 #define FF_I2C_MASTER_SPEED   100
 
+//#define FF_SYS_SW_WATCHDOG  10
+
 // complete configuration by including the defaults
 #include "defconfig.h"
 

examples/ex14/ex14.c

@@ -46,7 +46,7 @@ void appCreateTask(void)
 {
     static uint8_t stack[250];
     static OS_TASK_t task;
-    osTaskCreate("app", 5, &task, stack, sizeof(stack), sAppTask, NULL);
+    osTaskCreate("app", 7, &task, stack, sizeof(stack), sAppTask, NULL);
 }
 
 /* ***** application functions *********************************************** */

projects/temperaturdings/config.h

@@ -22,6 +22,9 @@
 #define FF_SYS_TASK_STACK 260
 #define FF_OS_IDLE_STACK  80
 
+// software watchdog
+#define FF_SYS_SW_WATCHDOG  16
+
 // gain some memory by disabling serial port receive1
 #define FF_HW_RX_BUFSIZE 0
 

projects/temperaturdings/temperaturdings.c

@@ -523,6 +523,9 @@ static void sAppTask(void *pArg)
     // keep running...
     while (ENDLESS)
     {
+        // FIXME: need to use sw watchdog as sometimes the i2c stuff hangs :-(
+        sysAssertSwWatchdog();
+
         if (!osTaskDelayUntil(&sTime, MEAS_PERIOD))
         {
             WARNING("meas miss");

src/defconfig.h

@@ -129,6 +129,11 @@
 #  define FF_SYS_MON_STRLEN 64
 #endif
 
+//! software watchdog period [#SYS_TASK_PERIOD]
+#if !defined(FF_SYS_SW_WATCHDOG) || defined(__DOXYGEN__)
+#  define FF_SYS_SW_WATCHDOG 0
+#endif
+
 
 /* *************************************************************************** */
 

src/hw.c

@@ -403,7 +403,7 @@ __FORCEINLINE void hwLedLoadOff(void) { }
 #ifndef __DOXYGEN__ // STFU
 const const char skHwPanicStr[][6] PROGMEM =
 {
-    { "NONE\0" }, { "HW\0" }, { "OS\0" }, { "OTHER\0" }
+    { "NONE\0" }, { "HW\0" }, { "OS\0" }, { "SYS\0" }, { "OTHER\0" }
 };
 #endif
 
@@ -427,10 +427,14 @@ void hwPanic(const HW_PANIC_t reason, const uint32_t u0, const uint32_t u1)
             n = 3;
             time = 10000;
             break;
-        case HW_PANIC_OTHER:
+        case HW_PANIC_SYS:
             n = 4;
             time = 10000;
             break;
+        case HW_PANIC_OTHER:
+            n = 5;
+            time = 10000;
+            break;
         default:
             break;
     }

src/hw.h

@@ -117,7 +117,8 @@ typedef enum HW_PANIC_e
     HW_PANIC_NONE           = 0,  //!< null problemo
     HW_PANIC_HW             = 1,  //!< \ref HW problem (blinks two times)
     HW_PANIC_OS             = 2,  //!< \ref OS problem (blinks three times)
-    HW_PANIC_OTHER          = 3,  //!< other problem (blinks four times)
+    HW_PANIC_SYS            = 3,  //!< \ref SYS problem (blinks four times)
+    HW_PANIC_OTHER          = 4,  //!< other problem (blinks four times)
 } HW_PANIC_t;
 
 //! panic! (and display load LED blink code)

src/i2c.c

@@ -7,7 +7,7 @@
     \addtogroup I2C
     @{
 
-    \todo use interrupts?
+    \todo use interrupts? http://www.chrisherring.net/all/tutorial-interrupt-driven-twi-interface-for-avr-part1/
 */
 
 #include <string.h>        // libc: string operations

src/sys.c

@@ -14,6 +14,10 @@
 #include "hw.h"            // ff: hardware
 #include "sys.h"           // ff: system task
 
+#if ( (FF_SYS_SW_WATCHDOG < 0) || (FF_SYS_SW_WATCHDOG > 255) )
+#  error Illegal value for FF_SYS_SW_WATCHDOG!
+#endif
+
 /* ************************************************************************** */
 
 static uint8_t sSysTaskStack[FF_SYS_TASK_STACK];
@@ -22,7 +26,9 @@ static void sSysTask(void *pArg);
 
 void sysInit(void)
 {
-    DEBUG("sys: init (stack %"PRIu16", mon %"PRIu16")", (uint16_t)sizeof(sSysTaskStack), (uint16_t)FF_SYS_MON_PERIOD);
+    DEBUG("sys: init (stack %"PRIu16", mon %"PRIu16", prio "PRIu8")",
+        (uint16_t)sizeof(sSysTaskStack), (uint16_t)FF_SYS_MON_PERIOD,
+        (uint8_t)FF_SYS_TASK_PRIO);
 }
 
 void sysCreateSystemTask(void)
@@ -56,6 +62,14 @@ void sysRegisterMonFunc(SYS_MON_FUNC_t func) { UNUSED(func); }
 
 #define SYS_TASK_PERIOD 1000
 
+#if (FF_SYS_SW_WATCHDOG > 0)
+static uint8_t sSysSwWatchdogCount;
+void sysAssertSwWatchdog(void)
+{
+    sSysSwWatchdogCount = 0;
+}
+#endif
+
 static void sSysTask(void *pArg)
 {
     UNUSED(pArg);
@@ -72,6 +86,16 @@ static void sSysTask(void *pArg)
         hwAssertWatchdog();
         period++;
 
+#if (FF_SYS_SW_WATCHDOG > 0)
+        sSysSwWatchdogCount++;
+        if (sSysSwWatchdogCount >= FF_SYS_SW_WATCHDOG)
+        {
+            ERROR("sys: sw watchdog");
+            osTaskDelay(100);
+            hwPanic(HW_PANIC_SYS, 0x01, 0x00);
+        }
+#endif
+
         /* ***** stuff to be done every FF_SYS_MON_PERIOD seconds ***** */
 
 #if (FF_SYS_MON_VERBOSE > 0)

src/sys.h

@@ -14,6 +14,7 @@
     - #FF_SYS_MON_VERBOSE
     - #FF_SYS_TASK_PRIO
     - #FF_SYS_TASK_STACK
+    - #FF_SYS_SW_WATCHDOG
 
     @{
 */
@@ -46,6 +47,12 @@ typedef void (* SYS_MON_FUNC_t)(char *, size_t);
 */
 void sysRegisterMonFunc(SYS_MON_FUNC_t func);
 
+//! assert software watchdog
+/*!
+    Asserts the software watchdog. Active only if compiled in by setting #FF_SYS_SW_WATCHDOG > 0.
+*/
+void sysAssertSwWatchdog(void);
+
 
 /* *************************************************************************** */