CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MAX_MESSAGE_LENGTH

Browse Source
This commit is contained in:
Scott Lahteine 2018-11-18 01:08:57 -06:00
parent 06674a321a
commit 7f225b9421
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/lcd/ultralcd.cpp
View File

@ -29,13 +29,10 @@
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#endif #endif
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u) #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
#endif #endif
#define MAX_MESSAGE_LENGTH 63
uint8_t MarlinUI::status_message_level; // = 0
char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
#endif #endif
#if HAS_SPI_LCD #if HAS_SPI_LCD
@ -85,10 +82,17 @@
#else #else
#define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH) #define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
#endif #endif
#elif ENABLED(EXTENSIBLE_UI)
#define MAX_MESSAGE_LENGTH 63
#else #else
#define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH) #define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
#endif #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 #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
bool MarlinUI::defer_return_to_status; bool MarlinUI::defer_return_to_status;
#endif #endif