CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3132 from thinkyhead/rc_heating_failed_err

Browse Source
This commit is contained in:
Scott Lahteine 2016-03-13 03:23:14 -07:00
commit f928894c38
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/temperature.cpp
View File

@ -1112,13 +1112,13 @@ void disable_all_heaters() {
setTargetBed(0); setTargetBed(0);
#define DISABLE_HEATER(NR) { \ #define DISABLE_HEATER(NR) { \
target_temperature[NR] = 0; \ setTargetHotend(NR, 0); \
soft_pwm[NR] = 0; \ soft_pwm[NR] = 0; \
WRITE_HEATER_ ## NR (LOW); \ WRITE_HEATER_ ## NR (LOW); \
} }
#if HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675) #if HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675)
target_temperature[0] = 0; setTargetHotend(0, 0);
soft_pwm[0] = 0; soft_pwm[0] = 0;
WRITE_HEATER_0P(LOW); // Should HEATERS_PARALLEL apply here? Then change to DISABLE_HEATER(0) WRITE_HEATER_0P(LOW); // Should HEATERS_PARALLEL apply here? Then change to DISABLE_HEATER(0)
#endif #endif