Skip to content

[2.0.x] SECURITYFIX missing max temp error when PID is used #11717

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
thinkyhead merged 3 commits into from
Sep 5, 2018
Merged

[2.0.x] SECURITYFIX missing max temp error when PID is used #11717

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b24d06
Securityfix missing max temp error when PID is used
AnHardt Sep 4, 2018
dba822d
Repair max_temp_error for the bed
AnHardt Sep 4, 2018
4500d1d
Update temperature.cpp
thinkyhead Sep 5, 2018
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
16 changes: 6 additions & 10 deletions Marlin/src/module/temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,14 +1722,12 @@ void Temperature::readings_ready() {

for (uint8_t e = 0; e < COUNT(temp_dir); e++) {
const int16_t tdir = temp_dir[e], rawtemp = current_temperature_raw[e] * tdir;
const bool heater_on = 0 <
const bool heater_on = (target_temperature[e] > 0)
#if ENABLED(PIDTEMP)
soft_pwm_amount[e]
#else
target_temperature[e]
|| (soft_pwm_amount[e] > 0)
#endif
;
if (rawtemp > maxttemp_raw[e] * tdir && heater_on) max_temp_error(e);
if (rawtemp > maxttemp_raw[e] * tdir) max_temp_error(e);
if (rawtemp < minttemp_raw[e] * tdir && !is_preheating(e) && heater_on) {
#ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
if (++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED)
Expand All @@ -1748,14 +1746,12 @@ void Temperature::readings_ready() {
#else
#define GEBED >=
#endif
const bool bed_on = 0 <
const bool bed_on = (target_temperature_bed > 0)
#if ENABLED(PIDTEMPBED)
soft_pwm_amount_bed
#else
target_temperature_bed
|| (soft_pwm_amount_bed > 0)
#endif
;
if (current_temperature_bed_raw GEBED bed_maxttemp_raw && bed_on) max_temp_error(-1);
if (current_temperature_bed_raw GEBED bed_maxttemp_raw) max_temp_error(-1);
if (bed_minttemp_raw GEBED current_temperature_bed_raw && bed_on) min_temp_error(-1);
#endif
}
Expand Down