Merge pull request #7 from Makuna/esp8266WDTFix

For Esp8266 Leave WDT at default during Setup
Makuna · Mar 30, 2016 · efb2b54 · efb2b54
2 parents de9bbf1 + 8b55a90
commit efb2b54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Task by Makuna
-version=1.1.1
+version=1.1.2
 author=Michael C. Miller ([email protected])
 maintainer=Michael C. Miller ([email protected])
 sentence=A library that makes creating complex mulitple task projects easy.

diff --git a/src/Task.h b/src/Task.h
@@ -78,7 +78,7 @@ class Task
 protected:
     virtual bool OnStart() { return true; };
     virtual void OnStop() {};
-    virtual void OnUpdate(uint32_t deltaTime) = 0;
+    virtual void OnUpdate(uint32_t deltaTime) {};
 
     uint32_t _remainingTime;
     uint32_t _timeInterval;

diff --git a/src/TaskManager.cpp b/src/TaskManager.cpp
@@ -34,7 +34,13 @@ TaskManager::TaskManager() :
         _pFirstTask( NULL ),
         _pLastTask( NULL )
 {
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_AVR) && !defined(__arm__)
+
+#if defined(ARDUINO_ARCH_AVR) && !defined(__arm__)
+    // make sure the watch dog is disabled during setup
+    // avoid this for Esp8266 due to it will only disable the software watchdog
+    // but leave the hardware one to fire, further this would disable all the 
+    // built in hidden watchdog feed calls that would keep it from firing and
+    // thus causing an effect of enabling the watchdog rather than disabling
     wdt_reset();
     wdt_disable();
 #endif