Browse Source

Fix compile error with MAX_MESSAGE_LENGTH

Fix #9988
Scott Lahteine 7 years ago
parent
commit
03e3011332
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      Marlin/src/lcd/ultralcd.cpp

+ 5
- 1
Marlin/src/lcd/ultralcd.cpp View File

92
         lcd_status_message_level;    // Higher level blocks lower level
92
         lcd_status_message_level;    // Higher level blocks lower level
93
 
93
 
94
 #if ENABLED(STATUS_MESSAGE_SCROLLING)
94
 #if ENABLED(STATUS_MESSAGE_SCROLLING)
95
-  #define MAX_MESSAGE_LENGTH max(CHARSIZE * 2 * (LCD_WIDTH), LONG_FILENAME_LENGTH)
95
+  #if LONG_FILENAME_LENGTH > CHARSIZE * 2 * (LCD_WIDTH)
96
+    #define MAX_MESSAGE_LENGTH LONG_FILENAME_LENGTH
97
+  #else
98
+    #define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
99
+  #endif
96
   uint8_t status_scroll_pos = 0;
100
   uint8_t status_scroll_pos = 0;
97
 #else
101
 #else
98
   #define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
102
   #define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)

Loading…
Cancel
Save