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

Sync with upstream 

Fix rebase issues
This commit is contained in:
Alex Voinea 2022-07-04 18:55:14 +02:00 committed by 3d-gussner
parent 5e46014359
commit f23e5e57dc
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Firmware/Marlin_main.cpp
View File

@ -235,6 +235,7 @@ uint8_t newFanSpeed = 0;
#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;
@ -6046,17 +6047,19 @@ Sigma_Exit:
*/ */
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();
@ -6078,7 +6081,7 @@ Sigma_Exit:
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);
//starttime=_millis(); //starttime=_millis();
@ -6102,7 +6105,7 @@ Sigma_Exit:
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);