Clean up LCD conditionals, DWIN

2020-09-06 21:40:58 -05:00
parent b709baba7a
commit a445746a8b
35 changed files with 253 additions and 169 deletions
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2612,14 +2612,14 @@
  #ifndef LCD_WIDTH
    #if HAS_GRAPHICAL_LCD
      #define LCD_WIDTH 21
-    #else
+    #elif HAS_CHARACTER_LCD
      #define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
    #endif
  #endif
  #ifndef LCD_HEIGHT
    #if HAS_GRAPHICAL_LCD
      #define LCD_HEIGHT 5
-    #else
+    #elif HAS_CHARACTER_LCD
      #define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)
    #endif
  #endif