Rename print_stop() to lcd_print_stop_finish() for clarity
This commit is contained in:
parent
d37a2a173a
commit
94583c861b
|
|
@ -835,7 +835,7 @@ void lcd_status_screen() // NOT static due to using ins
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void print_stop();
|
void lcd_print_stop_finish();
|
||||||
|
|
||||||
void lcd_commands()
|
void lcd_commands()
|
||||||
{
|
{
|
||||||
|
|
@ -853,7 +853,7 @@ void lcd_commands()
|
||||||
lcd_setstatuspgm(_T(MSG_PRINT_ABORTED));
|
lcd_setstatuspgm(_T(MSG_PRINT_ABORTED));
|
||||||
lcd_commands_type = LcdCommands::Idle;
|
lcd_commands_type = LcdCommands::Idle;
|
||||||
lcd_commands_step = 0;
|
lcd_commands_step = 0;
|
||||||
print_stop();
|
lcd_print_stop_finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -6035,7 +6035,7 @@ static void lcd_sd_updir()
|
||||||
}
|
}
|
||||||
|
|
||||||
// continue stopping the print from the main loop after lcd_print_stop() is called
|
// continue stopping the print from the main loop after lcd_print_stop() is called
|
||||||
void print_stop()
|
void lcd_print_stop_finish()
|
||||||
{
|
{
|
||||||
// save printing time
|
// save printing time
|
||||||
stoptime = _millis();
|
stoptime = _millis();
|
||||||
|
|
@ -6069,9 +6069,9 @@ void print_stop()
|
||||||
|
|
||||||
void lcd_print_stop()
|
void lcd_print_stop()
|
||||||
{
|
{
|
||||||
// UnconditionalStop() will internally cause planner_abort_hard(), meaning we _cannot_ plan
|
// UnconditionalStop() will internally cause planner_abort_hard(), meaning we _cannot_ plan any
|
||||||
// any more move in this call! Any further move must happen inside print_stop(), which is called
|
// more move in this call! Any further move must happen inside lcd_print_stop_finish(), which is
|
||||||
// by the main loop one iteration later.
|
// called by the main loop one iteration later.
|
||||||
UnconditionalStop();
|
UnconditionalStop();
|
||||||
|
|
||||||
if (!card.sdprinting) {
|
if (!card.sdprinting) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue