From 16461900c2ac51af535d57105a892149baaf8250 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Sat, 24 Sep 2016 00:36:37 -0500
Subject: [PATCH] Fix for HEATERS_PARALLEL
---
Marlin/temperature.cpp | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 3fbb0b06fd..ba9d9706b6 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -1286,9 +1286,7 @@ void Temperature::disable_all_heaters() {
}
#if HAS_TEMP_HOTEND
- setTargetHotend(0, 0);
- soft_pwm[0] = 0;
- WRITE_HEATER_0P(LOW); // Should HEATERS_PARALLEL apply here? Then change to DISABLE_HEATER(0)
+ DISABLE_HEATER(0);
#endif
#if HOTENDS > 1 && HAS_TEMP_1
@@ -1431,7 +1429,7 @@ void Temperature::isr() {
// Statics per heater
ISR_STATICS(0);
- #if (HOTENDS > 1) || ENABLED(HEATERS_PARALLEL)
+ #if HOTENDS > 1
ISR_STATICS(1);
#if HOTENDS > 2
ISR_STATICS(2);
@@ -1450,15 +1448,11 @@ void Temperature::isr() {
#if DISABLED(SLOW_PWM_HEATERS)
/**
- * standard PWM modulation
+ * Standard PWM modulation
*/
if (pwm_count == 0) {
soft_pwm_0 = soft_pwm[0];
- if (soft_pwm_0 > 0) {
- WRITE_HEATER_0(1);
- }
- else WRITE_HEATER_0P(0); // If HEATERS_PARALLEL should apply, change to WRITE_HEATER_0
-
+ WRITE_HEATER_0(soft_pwm_0 > 0 ? 1 : 0);
#if HOTENDS > 1
soft_pwm_1 = soft_pwm[1];
WRITE_HEATER_1(soft_pwm_1 > 0 ? 1 : 0);
@@ -1535,7 +1529,7 @@ void Temperature::isr() {
#define MIN_STATE_TIME 16 // MIN_STATE_TIME * 65.5 = time in milliseconds
#endif
- // Macros for Slow PWM timer logic - HEATERS_PARALLEL applies
+ // Macros for Slow PWM timer logic
#define _SLOW_PWM_ROUTINE(NR, src) \
soft_pwm_ ## NR = src; \
if (soft_pwm_ ## NR > 0) { \