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

Merge pull request #3417 from leptun/MK3_temperature_busy_messages 

Print busy messages while waiting for heaters
This commit is contained in:
Alex Voinea 2022-02-25 12:03:23 +02:00 committed by GitHub
parent e0877db707 0cc364ff7a
commit ce7cccab80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View File

@ -5353,7 +5353,6 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
homing_flag = true; // keep homing on to avoid babystepping while the LCD is enabled homing_flag = true; // keep homing on to avoid babystepping while the LCD is enabled
lcd_update_enable(true); lcd_update_enable(true);
KEEPALIVE_STATE(NOT_BUSY); //no need to print busy messages as we print current temperatures periodicaly
SERIAL_ECHOLNPGM("PINDA probe calibration start"); SERIAL_ECHOLNPGM("PINDA probe calibration start");
float zero_z; float zero_z;
@ -6671,15 +6670,12 @@ Sigma_Exit:
/* See if we are heating up or cooling down */ /* See if we are heating up or cooling down */
target_direction = isHeatingHotend(extruder); // true if heating, false if cooling target_direction = isHeatingHotend(extruder); // true if heating, false if cooling
KEEPALIVE_STATE(NOT_BUSY);
cancel_heatup = false; cancel_heatup = false;
wait_for_heater(codenum, extruder); //loops until target temperature is reached wait_for_heater(codenum, extruder); //loops until target temperature is reached
LCD_MESSAGERPGM(_T(MSG_HEATING_COMPLETE)); LCD_MESSAGERPGM(_T(MSG_HEATING_COMPLETE));
KEEPALIVE_STATE(IN_HANDLER);
heating_status = HeatingStatus::EXTRUDER_HEATING_COMPLETE; heating_status = HeatingStatus::EXTRUDER_HEATING_COMPLETE;
if (farm_mode) { prusa_statistics(2); }; if (farm_mode) { prusa_statistics(2); };
@ -6722,7 +6718,6 @@ Sigma_Exit:
cancel_heatup = false; cancel_heatup = false;
target_direction = isHeatingBed(); // true if heating, false if cooling target_direction = isHeatingBed(); // true if heating, false if cooling
KEEPALIVE_STATE(NOT_BUSY);
while ( (!cancel_heatup) && (target_direction ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false))) ) while ( (!cancel_heatup) && (target_direction ? (isHeatingBed()) : (isCoolingBed()&&(CooldownNoWait==false))) )
{ {
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.
@ -6745,7 +6740,6 @@ Sigma_Exit:
lcd_update(0); lcd_update(0);
} }
LCD_MESSAGERPGM(_T(MSG_BED_DONE)); LCD_MESSAGERPGM(_T(MSG_BED_DONE));
KEEPALIVE_STATE(IN_HANDLER);
heating_status = HeatingStatus::BED_HEATING_COMPLETE; heating_status = HeatingStatus::BED_HEATING_COMPLETE;
previous_millis_cmd.start(); previous_millis_cmd.start();

2
Firmware/ultralcd.cpp
View File

@ -7263,7 +7263,6 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
target_temperature_bed = (_isbed) ? 100 : 0; target_temperature_bed = (_isbed) ? 100 : 0;
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
KEEPALIVE_STATE(NOT_BUSY); //we are sending temperatures on serial line, so no need to send host keepalive messages
do { do {
_counter++; _counter++;
@ -7316,7 +7315,6 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
KEEPALIVE_STATE(IN_HANDLER);
return _stepresult; return _stepresult;
} }