Skip to content

Commit

Permalink
✨ Temperature variance monitor (#23373)
Browse files Browse the repository at this point in the history
  • Loading branch information
zeleps authored and thinkyhead committed May 7, 2022
1 parent b435487 commit 2ca1d84
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 9 deletions.
4 changes: 4 additions & 0 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,10 @@
#define WATCH_COOLER_TEMP_INCREASE 3 // Degrees Celsius
#endif

#if ANY(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_BED, THERMAL_PROTECTION_CHAMBER, THERMAL_PROTECTION_COOLER)
#define THERMAL_PROTECTION_VARIANCE_MONITOR // Detect a sensor malfunction preventing temperature updates
#endif

#if ENABLED(PIDTEMP)
// Add an experimental additional term to the heater power, proportional to the extrusion speed.
// A well-chosen Kc value should add just enough power to melt the increased material volume.
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/core/language.h
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@
#define STR_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !"
#define STR_T_HEATING_FAILED "Heating failed"
#define STR_T_THERMAL_RUNAWAY "Thermal Runaway"
#define STR_T_MALFUNCTION "Thermal Malfunction"
#define STR_T_MAXTEMP "MAXTEMP triggered"
#define STR_T_MINTEMP "MINTEMP triggered"
#define STR_ERR_PROBING_FAILED "Probing Failed"
Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/inc/Conditionals_post.h
Original file line number Diff line number Diff line change
Expand Up @@ -2564,6 +2564,9 @@
#if BOTH(HAS_COOLER, THERMAL_PROTECTION_COOLER) && WATCH_COOLER_TEMP_PERIOD > 0
#define WATCH_COOLER 1
#endif
#if NONE(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_CHAMBER, THERMAL_PROTECTION_BED, THERMAL_PROTECTION_COOLER)
#undef THERMAL_PROTECTION_VARIANCE_MONITOR
#endif
#if (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) \
&& (ENABLED(THERMAL_PROTECTION_BED) || !HAS_HEATED_BED) \
&& (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER) \
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/lcd/language/language_el.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ namespace Language_el {
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Αποτυχία θέρμανσης");
LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
LSTR MSG_THERMAL_RUNAWAY = _UxGT("ΘΕΡΜΙΚΗ ΔΙΑΦΥΓΗ");
LSTR MSG_TEMP_MALFUNCTION = _UxGT("ΘΕΡΜΙΚΗ ΔΥΣΛΕΙΤΟΥΡΓΙΑ");
LSTR MSG_ERR_MAXTEMP = _UxGT("ΠΕΡΙΤΤΗ ΘΕΡΜΟΚΡΑΣΙΑ");
LSTR MSG_ERR_MINTEMP = _UxGT("ΑΝΕΠΑΡΚΗΣ ΘΕΡΜΟΚΡΑΣΙΑ");
LSTR MSG_HALTED = _UxGT("Εκτυπωτής διεκόπη");
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/lcd/language/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ namespace Language_en {
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Heating Failed");
LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("Err: REDUNDANT TEMP");
LSTR MSG_THERMAL_RUNAWAY = _UxGT("THERMAL RUNAWAY");
LSTR MSG_TEMP_MALFUNCTION = _UxGT("TEMP MALFUNCTION");
LSTR MSG_THERMAL_RUNAWAY_BED = _UxGT("BED THERMAL RUNAWAY");
LSTR MSG_THERMAL_RUNAWAY_CHAMBER = _UxGT("CHAMBER T. RUNAWAY");
LSTR MSG_THERMAL_RUNAWAY_COOLER = _UxGT("Cooler Runaway");
Expand Down
55 changes: 47 additions & 8 deletions Marlin/src/module/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
Temperature thermalManager;

PGMSTR(str_t_thermal_runaway, STR_T_THERMAL_RUNAWAY);
PGMSTR(str_t_temp_malfunction, STR_T_MALFUNCTION);
PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);

/**
Expand Down Expand Up @@ -2570,14 +2571,30 @@ void Temperature::init() {
);
*/

// If the heater idle timeout expires, restart
if (TERN0(HEATER_IDLE_HANDLER, heater_idle[idle_index].timed_out)) {
state = TRInactive;
running_temp = 0;
}
else if (running_temp != target) { // If the target temperature changes, restart
running_temp = target;
state = target > 0 ? TRFirstHeating : TRInactive;
#if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
if (state == TRMalfunction) { // temperature invariance may continue, regardless of heater state
variance += ABS(current - last_temp); // no need for detection window now, a single change in variance is enough
last_temp = current;
if (!NEAR_ZERO(variance)) {
variance_timer = millis() + SEC_TO_MS(period_seconds);
variance = 0.0;
state = TRStable; // resume from where we detected the problem
}
}
#endif

if (TERN1(THERMAL_PROTECTION_VARIANCE_MONITOR, state != TRMalfunction)) {
// If the heater idle timeout expires, restart
if (TERN0(HEATER_IDLE_HANDLER, heater_idle[idle_index].timed_out)) {
state = TRInactive;
running_temp = 0;
TERN_(THERMAL_PROTECTION_VARIANCE_MONITOR, variance_timer = 0);
}
else if (running_temp != target) { // If the target temperature changes, restart
running_temp = target;
state = target > 0 ? TRFirstHeating : TRInactive;
TERN_(THERMAL_PROTECTION_VARIANCE_MONITOR, variance_timer = 0);
}
}

switch (state) {
Expand Down Expand Up @@ -2610,6 +2627,22 @@ void Temperature::init() {

const millis_t now = millis();

#if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
if (PENDING(now, variance_timer)) {
variance += ABS(current - last_temp);
last_temp = current;
}
else {
if (NEAR_ZERO(variance) && variance_timer) { // valid variance monitoring window
state = TRMalfunction;
break;
}
variance_timer = now + SEC_TO_MS(period_seconds);
variance = 0.0;
last_temp = current;
}
#endif

if (current >= running_temp - hysteresis_degc) {
timer = now + SEC_TO_MS(period_seconds);
break;
Expand All @@ -2622,6 +2655,12 @@ void Temperature::init() {
case TRRunaway:
TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
_temp_error(heater_id, FPSTR(str_t_thermal_runaway), GET_TEXT_F(MSG_THERMAL_RUNAWAY));

#if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
case TRMalfunction:
TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
_temp_error(heater_id, FPSTR(str_t_temp_malfunction), GET_TEXT_F(MSG_TEMP_MALFUNCTION));
#endif
}
}

Expand Down
8 changes: 7 additions & 1 deletion Marlin/src/module/temperature.h
Original file line number Diff line number Diff line change
Expand Up @@ -1041,12 +1041,18 @@ class Temperature {
return (RunawayIndex)_MAX(heater_id, 0);
}

enum TRState : char { TRInactive, TRFirstHeating, TRStable, TRRunaway };
enum TRState : char { TRInactive, TRFirstHeating, TRStable, TRRunaway
OPTARG(THERMAL_PROTECTION_VARIANCE_MONITOR, TRMalfunction)
};

typedef struct {
millis_t timer = 0;
TRState state = TRInactive;
float running_temp;
#if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
millis_t variance_timer = 0;
celsius_float_t last_temp = 0.0, variance = 0.0;
#endif
void run(const_celsius_float_t current, const_celsius_float_t target, const heater_id_t heater_id, const uint16_t period_seconds, const celsius_t hysteresis_degc);
} tr_state_machine_t;

Expand Down

0 comments on commit 2ca1d84

Please sign in to comment.