Browse Source

Special override of LCD_WIDTH

Scott Lahteine 7 years ago
parent
commit
704d33c374

+ 1
- 1
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

1837
 #if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)
1837
 #if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)
1838
   #define SDSUPPORT   // Force SD Card support on for these displays
1838
   #define SDSUPPORT   // Force SD Card support on for these displays
1839
 #elif ENABLED(ULTRA_LCD) && ENABLED(DOGLCD) // No panel, just graphical LCD?
1839
 #elif ENABLED(ULTRA_LCD) && ENABLED(DOGLCD) // No panel, just graphical LCD?
1840
-  #define LCD_WIDTH 20 // Default is 22. For this Geeetech use 20
1840
+  #define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20
1841
 #endif
1841
 #endif
1842
 
1842
 
1843
 #endif // CONFIGURATION_H
1843
 #endif // CONFIGURATION_H

+ 5
- 1
Marlin/src/inc/Conditionals_LCD.h View File

287
 
287
 
288
 #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
288
 #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
289
   #ifndef LCD_WIDTH
289
   #ifndef LCD_WIDTH
290
-    #define LCD_WIDTH 22
290
+    #ifdef LCD_WIDTH_OVERRIDE
291
+      #define LCD_WIDTH LCD_WIDTH_OVERRIDE
292
+    #else
293
+      #define LCD_WIDTH 22
294
+    #endif
291
   #endif
295
   #endif
292
   #ifndef LCD_HEIGHT
296
   #ifndef LCD_HEIGHT
293
     #define LCD_HEIGHT 5
297
     #define LCD_HEIGHT 5

Loading…
Cancel
Save