Merge upstream changes from Marlin 2.1.2.2
This commit is contained in:
@@ -87,13 +87,15 @@ void GcodeSuite::M140_M190(const bool isM190) {
|
||||
// With PRINTJOB_TIMER_AUTOSTART, M190 can start the timer, and M140 can stop it
|
||||
TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.auto_job_check_timer(isM190, !isM190));
|
||||
|
||||
if (isM190)
|
||||
if (isM190) {
|
||||
thermalManager.wait_for_bed(no_wait_for_cooling);
|
||||
else
|
||||
}
|
||||
else {
|
||||
ui.set_status_reset_fn([]{
|
||||
const celsius_t c = thermalManager.degTargetBed();
|
||||
return c < 30 || thermalManager.degBedNear(c);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
#endif // HAS_HEATED_BED
|
||||
|
Reference in New Issue
Block a user