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

Merge f23e5e57dc into f3e0dfd481

This commit is contained in:
haarp 2025-08-26 01:09:39 -04:00 committed by GitHub
parent f3e0dfd481 f23e5e57dc
commit eae49183de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Firmware/Marlin_main.cpp
View File

@ -228,6 +228,7 @@ static bool temp_compensation_retracted = false;
#endif #endif
static bool cancel_heatup = false; static bool cancel_heatup = false;
bool CooldownNoWait;
int8_t busy_state = NOT_BUSY; int8_t busy_state = NOT_BUSY;
static long prev_busy_signal_ms = -1; static long prev_busy_signal_ms = -1;
@ -5438,17 +5439,19 @@ void process_commands()
*/ */
case 109: case 109:
{ {
CooldownNoWait = false;
LCD_MESSAGERPGM(_T(MSG_HEATING)); LCD_MESSAGERPGM(_T(MSG_HEATING));
heating_status = HeatingStatus::EXTRUDER_HEATING; heating_status = HeatingStatus::EXTRUDER_HEATING;
prusa_statistics(1); prusa_statistics(1);
#ifdef AUTOTEMP #ifdef AUTOTEMP
autotemp_enabled=false; autotemp_enabled=false;
#endif #endif
if (code_seen('S')) { if (code_seen('S')) {
setTargetHotend(code_value()); setTargetHotend(code_value());
} else if (code_seen('R')) { CooldownNoWait = true;
setTargetHotend(code_value()); } else if (code_seen('R')) {
setTargetHotend(code_value());
} }
#ifdef AUTOTEMP #ifdef AUTOTEMP
if (code_seen('S')) autotemp_min=code_value(); if (code_seen('S')) autotemp_min=code_value();
@ -5468,7 +5471,7 @@ void process_commands()
wait_for_heater(codenum, active_extruder); //loops until target temperature is reached wait_for_heater(codenum, active_extruder); //loops until target temperature is reached
LCD_MESSAGERPGM(_T(MSG_HEATING_COMPLETE)); LCD_MESSAGERPGM(_T(MSG_HEATING_COMPLETE));
heating_status = HeatingStatus::EXTRUDER_HEATING_COMPLETE; heating_status = HeatingStatus::EXTRUDER_HEATING_COMPLETE;
prusa_statistics(2); prusa_statistics(2);
previous_millis_cmd.start(); previous_millis_cmd.start();
@ -5491,7 +5494,7 @@ void process_commands()
case 190: case 190:
#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
{ {
bool CooldownNoWait = false; CooldownNoWait = false;
LCD_MESSAGERPGM(_T(MSG_BED_HEATING)); LCD_MESSAGERPGM(_T(MSG_BED_HEATING));
heating_status = HeatingStatus::BED_HEATING; heating_status = HeatingStatus::BED_HEATING;
prusa_statistics(1); prusa_statistics(1);
@ -9284,6 +9287,7 @@ static void wait_for_heater(long codenum, uint8_t extruder) {
cancel_heatup = false; cancel_heatup = false;
while ((!cancel_heatup) && ((residencyStart == -1) || while ((!cancel_heatup) && ((residencyStart == -1) ||
(residencyStart >= 0 && (((unsigned int)(_millis() - residencyStart)) < (TEMP_RESIDENCY_TIME * 1000UL))))) { (residencyStart >= 0 && (((unsigned int)(_millis() - residencyStart)) < (TEMP_RESIDENCY_TIME * 1000UL))))) {
if ((CooldownNoWait == true) && !target_direction) break;
#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