zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Temp Residency followup

Browse source
This commit is contained in:
Scott Lahteine 2020-07-07 01:50:57 -05:00
parent d3b2c09221
commit 9546847dc1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1813,12 +1813,12 @@ void Temperature::init() {
}while(0) }while(0)
#define _MINMAX_TEST(N,M) (HOTENDS > N && THERMISTOR_HEATER_##N && THERMISTOR_HEATER_##N != 998 && THERMISTOR_HEATER_##N != 999 && defined(HEATER_##N##_##M##TEMP)) #define _MINMAX_TEST(N,M) (HOTENDS > N && THERMISTOR_HEATER_##N && THERMISTOR_HEATER_##N != 998 && THERMISTOR_HEATER_##N != 999 && defined(HEATER_##N##_##M##TEMP))
#if _MINMAX_TEST(0, MIN) #if _MINMAX_TEST(0, MIN)
_TEMP_MIN_E(0); _TEMP_MIN_E(0);
#endif #endif
#if _MINMAX_TEST(0, MAX) #if _MINMAX_TEST(0, MAX)
_TEMP_MAX_E(0); _TEMP_MAX_E(0);
#endif #endif
#if _MINMAX_TEST(1, MIN) #if _MINMAX_TEST(1, MIN)
_TEMP_MIN_E(1); _TEMP_MIN_E(1);
@ -3099,7 +3099,7 @@ void Temperature::tick() {
if (!residency_start_ms) { if (!residency_start_ms) {
// Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time. // Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time.
if (temp_diff < TEMP_WINDOW) { if (temp_diff < TEMP_WINDOW)
residency_start_ms = now + (first_loop ? SEC_TO_MS(TEMP_RESIDENCY_TIME) / 3 : 0); residency_start_ms = now + (first_loop ? SEC_TO_MS(TEMP_RESIDENCY_TIME) / 3 : 0);
} }
else if (temp_diff > TEMP_HYSTERESIS) { else if (temp_diff > TEMP_HYSTERESIS) {