MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🐛 Fix STATUS_COMBINE_HEATERS compile (#22405)

Browse Source
This commit is contained in:
ellensp 2021-07-21 07:44:15 +12:00 committed by Scott Lahteine
parent 0e9eb5f6ce
commit 8283f1577a
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -264,6 +264,8 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
#define HOTEND_BITMAP(N,S) status_hotend_a_bmp #define HOTEND_BITMAP(N,S) status_hotend_a_bmp
#endif #endif
#if DISABLED(STATUS_COMBINE_HEATERS)
if (PAGE_CONTAINS(STATUS_HEATERS_Y, STATUS_HEATERS_BOT)) { if (PAGE_CONTAINS(STATUS_HEATERS_Y, STATUS_HEATERS_BOT)) {
#define BAR_TALL (STATUS_HEATERS_HEIGHT - 2) #define BAR_TALL (STATUS_HEATERS_HEIGHT - 2)
@ -288,6 +290,8 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
} // PAGE_CONTAINS } // PAGE_CONTAINS
#endif // !STATUS_COMBINE_HEATERS
if (PAGE_UNDER(7)) { if (PAGE_UNDER(7)) {
#if HEATER_IDLE_HANDLER #if HEATER_IDLE_HANDLER
const bool dodraw = (blink || !thermalManager.heater_idle[heater_id].timed_out); const bool dodraw = (blink || !thermalManager.heater_idle[heater_id].timed_out);