Merge pull request #4073 from thinkyhead/rc_temp_mystery
Minor tweaks to M109 / M190
This commit is contained in:
commit
3a150f07c2
1 changed files with 31 additions and 33 deletions
|
@ -4702,12 +4702,23 @@ inline void gcode_M109() {
|
||||||
KEEPALIVE_STATE(NOT_BUSY);
|
KEEPALIVE_STATE(NOT_BUSY);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
// Target temperature might be changed during the loop
|
||||||
|
if (theTarget != thermalManager.degTargetHotend(target_extruder)) {
|
||||||
|
wants_to_cool = thermalManager.isCoolingHotend(target_extruder);
|
||||||
|
theTarget = thermalManager.degTargetHotend(target_extruder);
|
||||||
|
|
||||||
|
// Exit if S<lower>, continue if S<higher>, R<lower>, or R<higher>
|
||||||
|
if (no_wait_for_cooling && wants_to_cool) break;
|
||||||
|
|
||||||
|
// Prevent a wait-forever situation if R is misused i.e. M109 R0
|
||||||
|
// Try to calculate a ballpark safe margin by halving EXTRUDE_MINTEMP
|
||||||
|
if (wants_to_cool && theTarget < (EXTRUDE_MINTEMP)/2) break;
|
||||||
|
}
|
||||||
|
|
||||||
now = millis();
|
now = millis();
|
||||||
if (ELAPSED(now, next_temp_ms)) { //Print temp & remaining time every 1s while waiting
|
if (ELAPSED(now, next_temp_ms)) { //Print temp & remaining time every 1s while waiting
|
||||||
next_temp_ms = now + 1000UL;
|
next_temp_ms = now + 1000UL;
|
||||||
#if HAS_TEMP_HOTEND || HAS_TEMP_BED
|
|
||||||
print_heaterstates();
|
print_heaterstates();
|
||||||
#endif
|
|
||||||
#if TEMP_RESIDENCY_TIME > 0
|
#if TEMP_RESIDENCY_TIME > 0
|
||||||
SERIAL_PROTOCOLPGM(" W:");
|
SERIAL_PROTOCOLPGM(" W:");
|
||||||
if (residency_start_ms) {
|
if (residency_start_ms) {
|
||||||
|
@ -4722,19 +4733,6 @@ inline void gcode_M109() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Target temperature might be changed during the loop
|
|
||||||
if (theTarget != thermalManager.degTargetHotend(target_extruder)) {
|
|
||||||
wants_to_cool = thermalManager.isCoolingHotend(target_extruder);
|
|
||||||
theTarget = thermalManager.degTargetHotend(target_extruder);
|
|
||||||
|
|
||||||
// Exit if S<lower>, continue if S<higher>, R<lower>, or R<higher>
|
|
||||||
if (no_wait_for_cooling && wants_to_cool) break;
|
|
||||||
|
|
||||||
// Prevent a wait-forever situation if R is misused i.e. M109 R0
|
|
||||||
// Try to calculate a ballpark safe margin by halving EXTRUDE_MINTEMP
|
|
||||||
if (wants_to_cool && theTarget < (EXTRUDE_MINTEMP)/2) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
idle();
|
idle();
|
||||||
refresh_cmd_timeout(); // to prevent stepper_inactive_time from running out
|
refresh_cmd_timeout(); // to prevent stepper_inactive_time from running out
|
||||||
|
|
||||||
|
@ -4744,11 +4742,11 @@ inline void gcode_M109() {
|
||||||
|
|
||||||
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) residency_start_ms = millis();
|
if (temp_diff < TEMP_WINDOW) residency_start_ms = now;
|
||||||
}
|
}
|
||||||
else if (temp_diff > TEMP_HYSTERESIS) {
|
else if (temp_diff > TEMP_HYSTERESIS) {
|
||||||
// Restart the timer whenever the temperature falls outside the hysteresis.
|
// Restart the timer whenever the temperature falls outside the hysteresis.
|
||||||
residency_start_ms = millis();
|
residency_start_ms = now;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //TEMP_RESIDENCY_TIME > 0
|
#endif //TEMP_RESIDENCY_TIME > 0
|
||||||
|
@ -4789,6 +4787,19 @@ inline void gcode_M109() {
|
||||||
KEEPALIVE_STATE(NOT_BUSY);
|
KEEPALIVE_STATE(NOT_BUSY);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
// Target temperature might be changed during the loop
|
||||||
|
if (theTarget != thermalManager.degTargetBed()) {
|
||||||
|
wants_to_cool = thermalManager.isCoolingBed();
|
||||||
|
theTarget = thermalManager.degTargetBed();
|
||||||
|
|
||||||
|
// Exit if S<lower>, continue if S<higher>, R<lower>, or R<higher>
|
||||||
|
if (no_wait_for_cooling && wants_to_cool) break;
|
||||||
|
|
||||||
|
// Prevent a wait-forever situation if R is misused i.e. M190 R0
|
||||||
|
// Simply don't wait to cool a bed under 30C
|
||||||
|
if (wants_to_cool && theTarget < 30) break;
|
||||||
|
}
|
||||||
|
|
||||||
now = millis();
|
now = millis();
|
||||||
if (ELAPSED(now, next_temp_ms)) { //Print Temp Reading every 1 second while heating up.
|
if (ELAPSED(now, next_temp_ms)) { //Print Temp Reading every 1 second while heating up.
|
||||||
next_temp_ms = now + 1000UL;
|
next_temp_ms = now + 1000UL;
|
||||||
|
@ -4807,19 +4818,6 @@ inline void gcode_M109() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Target temperature might be changed during the loop
|
|
||||||
if (theTarget != thermalManager.degTargetBed()) {
|
|
||||||
wants_to_cool = thermalManager.isCoolingBed();
|
|
||||||
theTarget = thermalManager.degTargetBed();
|
|
||||||
|
|
||||||
// Exit if S<lower>, continue if S<higher>, R<lower>, or R<higher>
|
|
||||||
if (no_wait_for_cooling && wants_to_cool) break;
|
|
||||||
|
|
||||||
// Prevent a wait-forever situation if R is misused i.e. M190 R0
|
|
||||||
// Simply don't wait to cool a bed under 30C
|
|
||||||
if (wants_to_cool && theTarget < 30) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
idle();
|
idle();
|
||||||
refresh_cmd_timeout(); // to prevent stepper_inactive_time from running out
|
refresh_cmd_timeout(); // to prevent stepper_inactive_time from running out
|
||||||
|
|
||||||
|
@ -4829,11 +4827,11 @@ inline void gcode_M109() {
|
||||||
|
|
||||||
if (!residency_start_ms) {
|
if (!residency_start_ms) {
|
||||||
// Start the TEMP_BED_RESIDENCY_TIME timer when we reach target temp for the first time.
|
// Start the TEMP_BED_RESIDENCY_TIME timer when we reach target temp for the first time.
|
||||||
if (temp_diff < TEMP_BED_WINDOW) residency_start_ms = millis();
|
if (temp_diff < TEMP_BED_WINDOW) residency_start_ms = now;
|
||||||
}
|
}
|
||||||
else if (temp_diff > TEMP_BED_HYSTERESIS) {
|
else if (temp_diff > TEMP_BED_HYSTERESIS) {
|
||||||
// Restart the timer whenever the temperature falls outside the hysteresis.
|
// Restart the timer whenever the temperature falls outside the hysteresis.
|
||||||
residency_start_ms = millis();
|
residency_start_ms = now;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //TEMP_BED_RESIDENCY_TIME > 0
|
#endif //TEMP_BED_RESIDENCY_TIME > 0
|
||||||
|
|
Reference in a new issue