Skip to content

For Esp8266 Leave WDT at default during Setup #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Makuna merged 1 commit into from
Mar 30, 2016
Merged

For Esp8266 Leave WDT at default during Setup #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Task by Makuna
version=1.1.1
version=1.1.2
author=Michael C. Miller (makuna@live.com)
maintainer=Michael C. Miller (makuna@live.com)
sentence=A library that makes creating complex mulitple task projects easy.
Expand Down
2 changes: 1 addition & 1 deletion src/Task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 7 additions & 1 deletion src/TaskManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down