From 0764981aa1de01a0133c9ed9556db0c028cda1db Mon Sep 17 00:00:00 2001 From: Scott Lahteine <github@thinkyhead.com> Date: Mon, 23 Apr 2018 16:50:33 -0500 Subject: [PATCH] Fix compile for Malyan LCD Based on #10498 Co-Authored-By: xC0000005 <xc0000005@users.noreply.github.com> --- Marlin/ultralcd.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index f443875bed8..5adbf148e72 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -28,6 +28,13 @@ #if ENABLED(ULTRA_LCD) || ENABLED(MALYAN_LCD) void lcd_init(); bool lcd_detected(); + void lcd_update(); + void lcd_setalertstatusPGM(const char* message); +#else + inline void lcd_init() {} + inline bool lcd_detected() { return true; } + inline void lcd_update() {} + inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); } #endif #if ENABLED(ULTRA_LCD) @@ -50,7 +57,6 @@ int16_t lcd_strlen(const char* s); int16_t lcd_strlen_P(const char* s); - void lcd_update(); bool lcd_hasstatus(); void lcd_setstatus(const char* message, const bool persist=false); void lcd_setstatusPGM(const char* message, const int8_t level=0); @@ -228,20 +234,16 @@ void wait_for_release(); #endif -#else // no LCD +#else // MALYAN_LCD or no LCD constexpr bool lcd_wait_for_move = false; - inline void lcd_init() {} - inline bool lcd_detected() { return true; } - inline void lcd_update() {} inline void lcd_refresh() {} inline void lcd_buttons_update() {} inline bool lcd_hasstatus() { return false; } inline void lcd_setstatus(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); } inline void lcd_setstatusPGM(const char* const message, const int8_t level=0) { UNUSED(message); UNUSED(level); } inline void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...) { UNUSED(level); UNUSED(fmt); } - inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); } inline void lcd_reset_alert_level() {} inline void lcd_reset_status() {}