|
|
|
@ -582,8 +582,8 @@ FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr,
|
|
|
|
|
FORCE_INLINE void _draw_heater_status(const int8_t heater, const char prefix, const bool blink) {
|
|
|
|
|
const bool isBed = heater < 0;
|
|
|
|
|
|
|
|
|
|
const float t1 = (isBed ? thermalManager.degBed() : thermalManager.degHotend(heater));
|
|
|
|
|
const float t2 = (isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater));
|
|
|
|
|
const float t1 = (isBed ? thermalManager.degBed() : thermalManager.degHotend(heater)),
|
|
|
|
|
t2 = (isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater));
|
|
|
|
|
|
|
|
|
|
if (prefix >= 0) lcd.print(prefix);
|
|
|
|
|
|
|
|
|
@ -592,11 +592,11 @@ FORCE_INLINE void _draw_heater_status(const int8_t heater, const char prefix, co
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
|
const bool is_idle = (!isBed ? thermalManager.is_heater_idle(heater) :
|
|
|
|
|
#if HAS_TEMP_BED
|
|
|
|
|
thermalManager.is_bed_idle()
|
|
|
|
|
#else
|
|
|
|
|
false
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_TEMP_BED
|
|
|
|
|
thermalManager.is_bed_idle()
|
|
|
|
|
#else
|
|
|
|
|
false
|
|
|
|
|
#endif
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!blink && is_idle) {
|
|
|
|
@ -606,7 +606,7 @@ FORCE_INLINE void _draw_heater_status(const int8_t heater, const char prefix, co
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
lcd.print(itostr3left(t2 + 0.5));
|
|
|
|
|
lcd.print(itostr3left(t2 + 0.5));
|
|
|
|
|
|
|
|
|
|
if (prefix >= 0) {
|
|
|
|
|
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
|
|
|
|
|