From 7f225b94210c02b5939652b5068cccaca1488b8c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 18 Nov 2018 01:08:57 -0600 Subject: [PATCH] Fix MAX_MESSAGE_LENGTH --- Marlin/src/lcd/ultralcd.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 9bb7c0672..4650b759c 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -29,13 +29,10 @@ #if ENABLED(SDSUPPORT) #include "../sd/cardreader.h" #endif + #if ENABLED(EXTENSIBLE_UI) #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u) #endif - - #define MAX_MESSAGE_LENGTH 63 - uint8_t MarlinUI::status_message_level; // = 0 - char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1]; #endif #if HAS_SPI_LCD @@ -85,10 +82,17 @@ #else #define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH) #endif +#elif ENABLED(EXTENSIBLE_UI) + #define MAX_MESSAGE_LENGTH 63 #else #define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH) #endif +#if HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI) + uint8_t MarlinUI::status_message_level; // = 0 + char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1]; +#endif + #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS bool MarlinUI::defer_return_to_status; #endif