Print progress enhancements (#14647)
This commit is contained in:
committed by
Scott Lahteine
parent
ebb1a7dc1f
commit
27c487bab7
@ -28,6 +28,9 @@
|
||||
*/
|
||||
void GcodeSuite::M117() {
|
||||
|
||||
ui.set_status(parser.string_arg);
|
||||
if (parser.string_arg && parser.string_arg[0])
|
||||
ui.set_status(parser.string_arg);
|
||||
else
|
||||
ui.reset_status();
|
||||
|
||||
}
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include "../../inc/MarlinConfig.h"
|
||||
|
||||
#if ENABLED(LCD_SET_PROGRESS_MANUALLY) && EITHER(EXTENSIBLE_UI, ULTRA_LCD)
|
||||
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||
|
||||
#include "../gcode.h"
|
||||
#include "../../lcd/ultralcd.h"
|
||||
@ -42,4 +42,4 @@ void GcodeSuite::M73() {
|
||||
ui.set_progress(parser.value_byte());
|
||||
}
|
||||
|
||||
#endif // LCD_SET_PROGRESS_MANUALLY && (EXTENSIBLE_UI || ULTRA_LCD)
|
||||
#endif // LCD_SET_PROGRESS_MANUALLY
|
||||
|
@ -26,6 +26,7 @@
|
||||
|
||||
#include "../gcode.h"
|
||||
#include "../../sd/cardreader.h"
|
||||
#include "../../lcd/ultralcd.h"
|
||||
|
||||
/**
|
||||
* M23: Open a file
|
||||
@ -36,6 +37,10 @@ void GcodeSuite::M23() {
|
||||
// Simplify3D includes the size, so zero out all spaces (#7227)
|
||||
for (char *fn = parser.string_arg; *fn; ++fn) if (*fn == ' ') *fn = '\0';
|
||||
card.openFile(parser.string_arg, true);
|
||||
|
||||
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||
ui.set_progress(0);
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif // SDSUPPORT
|
||||
|
@ -125,7 +125,7 @@ void GcodeSuite::M109() {
|
||||
print_job_timer.start();
|
||||
#endif
|
||||
|
||||
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
|
||||
#if HAS_DISPLAY
|
||||
if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
|
||||
thermalManager.set_heating_message(target_extruder);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user