bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Print progress enhancements (#14647)

Browse Source
This commit is contained in:
Marcio Teixeira
2019-07-17 02:12:39 -06:00
committed by Scott Lahteine
parent ebb1a7dc1f
commit 27c487bab7
13 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/motion.cpp
View File

@ -51,7 +51,7 @@
#include "../feature/bltouch.h"
#endif
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
#if HAS_DISPLAY
#include "../lcd/ultralcd.h"
#endif
@ -1044,7 +1044,7 @@ bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool
if (zz) SERIAL_CHAR('Z');
SERIAL_ECHOLNPGM(" " MSG_FIRST);
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
#if HAS_DISPLAY
ui.status_printf_P(0, PSTR(MSG_HOME " %s%s%s " MSG_FIRST), xx ? MSG_X : "", yy ? MSG_Y : "", zz ? MSG_Z : "");
#endif
return true;

2
Marlin/src/module/temperature.cpp
View File

@ -2923,7 +2923,7 @@ void Temperature::isr() {
#endif // AUTO_REPORT_TEMPERATURES
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
#if HAS_DISPLAY
void Temperature::set_heating_message(const uint8_t e) {
const bool heating = isHeatingHotend(e);
#if HOTENDS > 1

2
Marlin/src/module/temperature.h
View File

@ -785,7 +785,7 @@ class Temperature {
#endif
#endif
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
#if HAS_DISPLAY
static void set_heating_message(const uint8_t e);
#endif

2
Marlin/src/module/tool_change.cpp
View File

@ -982,7 +982,7 @@ void tool_change(const uint8_t tmp_extruder, bool no_move/*=false*/) {
singlenozzle_temp[active_extruder] = thermalManager.temp_hotend[0].target;
if (singlenozzle_temp[tmp_extruder] && singlenozzle_temp[tmp_extruder] != singlenozzle_temp[active_extruder]) {
thermalManager.setTargetHotend(singlenozzle_temp[tmp_extruder], 0);
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
#if HAS_DISPLAY
thermalManager.set_heating_message(0);
#endif
(void)thermalManager.wait_for_hotend(0, false); // Wait for heating or cooling