SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Apply grace period to thermistor failure testing (#14167)

Browse source
This commit is contained in:
doggyfan 2019-05-28 21:36:03 +01:00 committed by Scott Lahteine
parent 0f04ba016f
commit e09d8811c1
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Marlin/src/module/temperature.cpp
View file

@ -82,6 +82,10 @@
#endif #endif
#endif #endif
#ifndef THERMAL_PROTECTION_GRACE_PERIOD
#define THERMAL_PROTECTION_GRACE_PERIOD 0 // No grace period needed on well-behaved boards
#endif
Temperature thermalManager; Temperature thermalManager;
/** /**
@ -991,9 +995,6 @@ void Temperature::manage_heater() {
#endif #endif
#if HAS_THERMAL_PROTECTION #if HAS_THERMAL_PROTECTION
#ifndef THERMAL_PROTECTION_GRACE_PERIOD
#define THERMAL_PROTECTION_GRACE_PERIOD 0 // No grace period needed on well-behaved boards
#endif
#if THERMAL_PROTECTION_GRACE_PERIOD > 0 #if THERMAL_PROTECTION_GRACE_PERIOD > 0
static millis_t grace_period = ms + THERMAL_PROTECTION_GRACE_PERIOD; static millis_t grace_period = ms + THERMAL_PROTECTION_GRACE_PERIOD;
if (ELAPSED(ms, grace_period)) grace_period = 0UL; if (ELAPSED(ms, grace_period)) grace_period = 0UL;
@ -2166,6 +2167,15 @@ void Temperature::set_current_temp_raw() {
#endif #endif
void Temperature::readings_ready() { void Temperature::readings_ready() {
#if THERMAL_PROTECTION_GRACE_PERIOD > 0
const millis_t ms = millis();
static millis_t grace_period = ms + THERMAL_PROTECTION_GRACE_PERIOD; // NOTE: millis() == 0 on reset
if (ELAPSED(ms, grace_period)) grace_period = 0;
#else
static constexpr millis_t grace_period = 0;
#endif
// Update the raw values if they've been read. Else we could be updating them during reading. // Update the raw values if they've been read. Else we could be updating them during reading.
if (!temp_meas_ready) set_current_temp_raw(); if (!temp_meas_ready) set_current_temp_raw();
@ -2207,6 +2217,9 @@ void Temperature::readings_ready() {
#endif // HOTENDS > 1 #endif // HOTENDS > 1
}; };
// Give ADC temperature readings time to settle at boot-up before testing
if (grace_period) return;
for (uint8_t e = 0; e < COUNT(temp_dir); e++) { for (uint8_t e = 0; e < COUNT(temp_dir); e++) {
const int16_t tdir = temp_dir[e], rawtemp = temp_hotend[e].raw * tdir; const int16_t tdir = temp_dir[e], rawtemp = temp_hotend[e].raw * tdir;
const bool heater_on = (temp_hotend[e].target > 0) const bool heater_on = (temp_hotend[e].target > 0)