Skip to content
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.

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

Heal the watchdog #4012

Merged
merged 1 commit into from
Jun 11, 2016
Merged

Conversation

Blue-Marlin
Copy link
Contributor

Heal the watchdog by replacing the unnecessary call to watchdog_reset() by
thermalManager.manage_heater()

See discussion in 'New feature: Non blocking tone queue #3995'

#if ENABLED(USE_WATCHDOG)
watchdog_reset();
#endif
thermalManager.manage_heater();
Copy link
Contributor

@jbrazio jbrazio Jun 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will not work.. why ?
Because our buzzer will need to depend on the thermal like I said before.

@jbrazio
Copy link
Contributor

jbrazio commented Jun 11, 2016

Travis said it..
Interesting definition of "healing" you've got.

$ build_marlin
Picked up JAVA_TOOL_OPTIONS: 
Loading configuration...
Xlib:  extension "RANDR" missing on display ":1.0".
Initializing packages...
Preparing boards...
Verifying...
In file included from sketch/Marlin.h:382:0,
                 from sketch/M100_Free_Mem_Chk.cpp:43:
sketch/buzzer.h: In member function 'void Buzzer::tone(const uint16_t&, const uint16_t&)':
buzzer.h:109: error: 'thermalManager' was not declared in this scope
         thermalManager.manage_heater();
         ^
exit status 1
'thermalManager' was not declared in this scope

@thinkyhead thinkyhead merged commit c7eeb09 into MarlinFirmware:RCBugFix Jun 11, 2016
@Blue-Marlin Blue-Marlin deleted the watchdoghealing branch June 11, 2016 23:18
@thinkyhead thinkyhead mentioned this pull request Jul 8, 2016
@jbrazio jbrazio modified the milestone: 1.1.0 Jul 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants