josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4423 from 3d-gussner/MK3_3132_PFW-1542-v2 

PFW-1542 Handle fan error sooner when waiting for heating to complete
This commit is contained in:
3d-gussner 2023-10-03 10:17:04 +02:00 committed by GitHub
parent 4a91c5018d 341654692d
commit 525055c0ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Firmware/Marlin_main.cpp
View File

@ -6154,6 +6154,12 @@ Sigma_Exit:
while ( (!cancel_heatup) && (target_direction ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false))) ) while ( (!cancel_heatup) && (target_direction ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false))) )
{ {
if (lcd_commands_type == LcdCommands::LongPause) {
// Print was suddenly paused, break out of the loop
// This can happen when the firmware report a fan error
break;
}
if(( _millis() - codenum) > 1000 ) //Print Temp Reading every 1 second while heating up. if(( _millis() - codenum) > 1000 ) //Print Temp Reading every 1 second while heating up.
{ {
if (!farm_mode) { if (!farm_mode) {
@ -9788,6 +9794,11 @@ static void wait_for_heater(long codenum, uint8_t extruder) {
#else #else
while (target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder) && (CooldownNoWait == false))) { while (target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder) && (CooldownNoWait == false))) {
#endif //TEMP_RESIDENCY_TIME #endif //TEMP_RESIDENCY_TIME
if (lcd_commands_type == LcdCommands::LongPause) {
// Print was suddenly paused, break out of the loop
// This can happen when the firmware report a fan error
break;
}
if ((_millis() - codenum) > 1000UL) if ((_millis() - codenum) > 1000UL)
{ //Print Temp Reading and remaining time every 1 second while heating up/cooling down { //Print Temp Reading and remaining time every 1 second while heating up/cooling down
if (!farm_mode) { if (!farm_mode) {