Basic watchdog implementation

Author: SciLor

BoxButtonEars.cpp

@@ -77,7 +77,8 @@ void BoxButtonEars::reloadConfig() {
 
 void BoxButtonEars::waitForRelease() {
     while (true) {
-        delay(250);
+        delay(100);
+        Box.watchdog_feed();
         _earSmall.read();
         _earBig.read();
         if (!_earSmall.isPressed() && !_earBig.isPressed()) 

BoxPower.cpp

@@ -34,7 +34,7 @@ void BoxPower::_preparePowerDown() {
     Log.info("Prepare power down...");
     //TODO
     //smartconfig down
-    //disable watchdog
+    Box.watchdog_stop();
     setSdPower(false);
     setOtherPower(false);
     Box.boxLEDs.setAllBool(false);

Hackiebox.cpp

@@ -4,7 +4,10 @@ BoxConfig Config;
 BoxEvents Events;
 Hackiebox Box;
 void Hackiebox::setup() {  
-    //watchdog set 30s?
+    if (!watchdog_start()) {
+        watchdog_stop();
+        //reset box?!
+    }
 
     Log.init(LOG_LEVEL_VERBOSE, 115200/*, &logStream*/);
     Log.info("Booting Hackiebox, Free MEM=%ib...", freeMemory());
@@ -58,8 +61,59 @@ void Hackiebox::setup() {
 }
 
 void Hackiebox::loop() {  
+    watchdog_feed();
     _threadController.run();
-
-    //watchdog.feed
     webServer.handle();
-}
+}
+
+bool Hackiebox::watchdog_isFed() {
+    return _watchdog_fed;
+}
+void Hackiebox::watchdog_feed() {
+    _watchdog_fed = true;
+}
+void Hackiebox::watchdog_unfeed() {
+    _watchdog_fed = false;
+}
+void watchdog_handler() {
+    if (Box.watchdog_isFed()) {
+        MAP_WatchdogIntClear(WDT_BASE);
+        Box.watchdog_unfeed();
+    }
+}
+bool Hackiebox::watchdog_start() {
+    watchdog_feed();
+    // Enable the peripherals used by this example.
+    MAP_PRCMPeripheralClkEnable(PRCM_WDT, PRCM_RUN_MODE_CLK);
+
+    // Unlock to be able to configure the registers
+    MAP_WatchdogUnlock(WDT_BASE);
+    
+    //if (fpAppWDTCB != NULL) {
+        MAP_IntPrioritySet(INT_WDT, INT_PRIORITY_LVL_1);
+        MAP_WatchdogIntRegister(WDT_BASE, watchdog_handler);
+    //}
+    
+
+    // Set the watchdog timer reload value
+    MAP_WatchdogReloadSet(WDT_BASE, 80000000*15); //15s
+
+    // Start the timer. Once the timer is started, it cannot be disable.
+    MAP_WatchdogEnable(WDT_BASE);
+
+    return MAP_WatchdogRunning(WDT_BASE);
+}
+void Hackiebox::watchdog_stop() {  
+    // Unlock to be able to configure the registers
+    MAP_WatchdogUnlock(WDT_BASE);
+
+    // Disable stalling of the watchdog timer during debug events
+    MAP_WatchdogStallDisable(WDT_BASE);
+
+    // Clear the interrupt
+    MAP_WatchdogIntClear(WDT_BASE);
+
+    // Unregister the interrupt
+    MAP_WatchdogIntUnregister(WDT_BASE);
+}
+

Hackiebox.h

@@ -5,6 +5,11 @@
 
 #include <ThreadController.h>
 
+#include <hw_ints.h>
+#include <driverlib/wdt.h>
+#include <driverlib/rom_map.h>
+#include <driverlib/prcm.h>
+
 #include "BoxAccelerometer.h"
 #include "BoxBattery.h"
 #include "BoxButtonEars.h"
@@ -21,9 +26,19 @@
 
 class Hackiebox { 
     public:
+
         void
             setup(),
             loop();
+        
+        bool
+            watchdog_start(),
+            watchdog_isFed();
+        void
+            watchdog_stop(),
+            watchdog_feed(),
+            watchdog_unfeed();
+
 
         BoxAccelerometer boxAccel;
         BoxBattery boxBattery;
@@ -37,10 +52,14 @@ class Hackiebox {
 
         LogStream logStream;
 
-    private:
+    private:/*
+        typedef void (*fAPPWDTDevCallbk)();
+        void 
+            watchdog_handler();*/
+        
+        bool _watchdog_fed;
         ThreadController _threadController;
 };
-
 extern Hackiebox Box;
 
 #endif