From 6a45d52bb4301bad2aadc087217d10421a30ddd1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 3 Mar 2019 05:37:15 -0600
Subject: [PATCH] Remove dead code in get_pid_output, consolidate
See #12981
---
Marlin/temperature.cpp | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 1a58a1048a..4b4a68f4d0 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -613,25 +613,20 @@ float Temperature::get_pid_output(const int8_t e) {
pid_error[HOTEND_INDEX] = target_temperature[HOTEND_INDEX] - current_temperature[HOTEND_INDEX];
dTerm[HOTEND_INDEX] = PID_K2 * PID_PARAM(Kd, HOTEND_INDEX) * (current_temperature[HOTEND_INDEX] - temp_dState[HOTEND_INDEX]) + float(PID_K1) * dTerm[HOTEND_INDEX];
temp_dState[HOTEND_INDEX] = current_temperature[HOTEND_INDEX];
- #if HEATER_IDLE_HANDLER
- if (heater_idle_timeout_exceeded[HOTEND_INDEX]) {
- pid_output = 0;
- pid_reset[HOTEND_INDEX] = true;
- }
- else
- #endif
- if (pid_error[HOTEND_INDEX] > PID_FUNCTIONAL_RANGE) {
- pid_output = BANG_MAX;
- pid_reset[HOTEND_INDEX] = true;
- }
- else if (pid_error[HOTEND_INDEX] < -(PID_FUNCTIONAL_RANGE) || target_temperature[HOTEND_INDEX] == 0
+
+ if (target_temperature[HOTEND_INDEX] == 0
+ || pid_error[HOTEND_INDEX] < -(PID_FUNCTIONAL_RANGE)
#if HEATER_IDLE_HANDLER
|| heater_idle_timeout_exceeded[HOTEND_INDEX]
#endif
- ) {
+ ) {
pid_output = 0;
pid_reset[HOTEND_INDEX] = true;
}
+ else if (pid_error[HOTEND_INDEX] > PID_FUNCTIONAL_RANGE) {
+ pid_output = BANG_MAX;
+ pid_reset[HOTEND_INDEX] = true;
+ }
else {
if (pid_reset[HOTEND_INDEX]) {
temp_iState[HOTEND_INDEX] = 0.0;