|
@ -4100,10 +4100,10 @@ inline void gcode_M104() { |
|
|
if (print_job_stop()) LCD_MESSAGEPGM(WELCOME_MSG); |
|
|
if (print_job_stop()) LCD_MESSAGEPGM(WELCOME_MSG); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) |
|
|
#if HAS_TEMP_HOTEND || HAS_TEMP_BED |
|
|
|
|
|
|
|
|
void print_heaterstates() { |
|
|
void print_heaterstates() { |
|
|
#if HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675) |
|
|
#if HAS_TEMP_HOTEND |
|
|
SERIAL_PROTOCOLPGM(" T:"); |
|
|
SERIAL_PROTOCOLPGM(" T:"); |
|
|
SERIAL_PROTOCOL_F(degHotend(target_extruder), 1); |
|
|
SERIAL_PROTOCOL_F(degHotend(target_extruder), 1); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
|
SERIAL_PROTOCOLPGM(" /"); |
|
@ -4179,10 +4179,10 @@ inline void gcode_M104() { |
|
|
inline void gcode_M105() { |
|
|
inline void gcode_M105() { |
|
|
if (setTargetedHotend(105)) return; |
|
|
if (setTargetedHotend(105)) return; |
|
|
|
|
|
|
|
|
#if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) |
|
|
#if HAS_TEMP_HOTEND || HAS_TEMP_BED |
|
|
SERIAL_PROTOCOLPGM(MSG_OK); |
|
|
SERIAL_PROTOCOLPGM(MSG_OK); |
|
|
print_heaterstates(); |
|
|
print_heaterstates(); |
|
|
#else // !HAS_TEMP_0 && !HAS_TEMP_BED
|
|
|
#else // !HAS_TEMP_HOTEND && !HAS_TEMP_BED
|
|
|
SERIAL_ERROR_START; |
|
|
SERIAL_ERROR_START; |
|
|
SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS); |
|
|
SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS); |
|
|
#endif |
|
|
#endif |
|
@ -4271,7 +4271,7 @@ inline void gcode_M109() { |
|
|
now = millis(); |
|
|
now = millis(); |
|
|
if (now > next_temp_ms) { //Print temp & remaining time every 1s while waiting
|
|
|
if (now > next_temp_ms) { //Print temp & remaining time every 1s while waiting
|
|
|
next_temp_ms = now + 1000UL; |
|
|
next_temp_ms = now + 1000UL; |
|
|
#if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) |
|
|
#if HAS_TEMP_HOTEND || HAS_TEMP_BED |
|
|
print_heaterstates(); |
|
|
print_heaterstates(); |
|
|
#endif |
|
|
#endif |
|
|
#ifdef TEMP_RESIDENCY_TIME |
|
|
#ifdef TEMP_RESIDENCY_TIME |
|
|