microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Formatting in _draw_heater_status

Browse Source
2.0.x
Scott Lahteine 8 years ago
parent 6b9ca16f36
commit 266ae8912a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
Marlin/ultralcd_impl_HD44780.h
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save