Browse Source

Fix MAX_MESSAGE_LENGTH

Scott Lahteine 6 years ago
parent
commit
7f225b9421
1 changed files with 8 additions and 4 deletions
  1. 8
    4
      Marlin/src/lcd/ultralcd.cpp

+ 8
- 4
Marlin/src/lcd/ultralcd.cpp View File

29
   #if ENABLED(SDSUPPORT)
29
   #if ENABLED(SDSUPPORT)
30
     #include "../sd/cardreader.h"
30
     #include "../sd/cardreader.h"
31
   #endif
31
   #endif
32
+
32
   #if ENABLED(EXTENSIBLE_UI)
33
   #if ENABLED(EXTENSIBLE_UI)
33
     #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
34
     #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
34
   #endif
35
   #endif
35
-
36
-  #define MAX_MESSAGE_LENGTH 63
37
-  uint8_t MarlinUI::status_message_level; // = 0
38
-  char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
39
 #endif
36
 #endif
40
 
37
 
41
 #if HAS_SPI_LCD
38
 #if HAS_SPI_LCD
85
   #else
82
   #else
86
     #define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
83
     #define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
87
   #endif
84
   #endif
85
+#elif ENABLED(EXTENSIBLE_UI)
86
+  #define MAX_MESSAGE_LENGTH 63
88
 #else
87
 #else
89
   #define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
88
   #define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
90
 #endif
89
 #endif
91
 
90
 
91
+#if HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI)
92
+  uint8_t MarlinUI::status_message_level; // = 0
93
+  char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
94
+#endif
95
+
92
 #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
96
 #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
93
   bool MarlinUI::defer_return_to_status;
97
   bool MarlinUI::defer_return_to_status;
94
 #endif
98
 #endif

Loading…
Cancel
Save