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

Rename argument of ThermalStop for clarity

This commit is contained in:
Yuri D'Elia 2022-07-07 10:24:09 +02:00
parent b9fc73c4c3
commit 9ef80226c9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin.h
View File

@ -241,10 +241,10 @@ void prepare_move();
void kill(const char *full_screen_message = NULL, unsigned char id = 0); void kill(const char *full_screen_message = NULL, unsigned char id = 0);
void finishAndDisableSteppers(); void finishAndDisableSteppers();
void UnconditionalStop(); // Stop heaters, motion and clear current print status void UnconditionalStop(); // Stop heaters, motion and clear current print status
void ThermalStop(bool pause = false); // Emergency stop used by overtemp functions which allows void ThermalStop(bool allow_pause = false); // Emergency stop used by overtemp functions which allows
// recovery (with pause=true) // recovery (with pause=true)
bool IsStopped(); // Returns true if the print has been stopped bool IsStopped(); // Returns true if the print has been stopped
//put an ASCII command at the end of the current buffer, read from flash //put an ASCII command at the end of the current buffer, read from flash
#define enquecommand_P(cmd) enquecommand(cmd, true) #define enquecommand_P(cmd) enquecommand(cmd, true)

4
Firmware/Marlin_main.cpp
View File

@ -9983,11 +9983,11 @@ void UnconditionalStop()
// will introduce either over/under extrusion on the current segment, and will not // will introduce either over/under extrusion on the current segment, and will not
// survive a power panic. Switching Stop() to use the pause machinery instead (with // survive a power panic. Switching Stop() to use the pause machinery instead (with
// the addition of disabling the headers) could allow true recovery in the future. // the addition of disabling the headers) could allow true recovery in the future.
void ThermalStop(bool pause) void ThermalStop(bool allow_pause)
{ {
if(Stopped == false) { if(Stopped == false) {
Stopped = true; Stopped = true;
if(pause && (IS_SD_PRINTING || usb_timer.running())) { if(allow_pause && (IS_SD_PRINTING || usb_timer.running())) {
if (!isPrintPaused) { if (!isPrintPaused) {
// we cannot make a distinction for the host here, the pause must be instantaneous // we cannot make a distinction for the host here, the pause must be instantaneous
lcd_pause_print(); lcd_pause_print();