From 9729e9c4500c36fed01d58161d44bde9a6a9423f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 1 Jun 2016 01:42:14 -0700 Subject: [PATCH] Combine ST7565 / U8GLIB_NHD_C12864 items in dogm --- Marlin/dogm_lcd_implementation.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index b0cd312b0..fda1f53ab 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -139,15 +139,12 @@ #if ENABLED(U8GLIB_ST7920) //U8GLIB_ST7920_128X64_RRD u8g(0,0,0); U8GLIB_ST7920_128X64_RRD u8g(0); -#elif ENABLED(MAKRPANEL) - // The MaKrPanel display, ST7565 controller as well - U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); -#elif ENABLED(VIKI2) || ENABLED(miniVIKI) - // Mini Viki and Viki 2.0 LCD, ST7565 controller as well - U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); #elif ENABLED(U8GLIB_LM6059_AF) // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250) U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); +#elif ENABLED(MAKRPANEL) || ENABLED(VIKI2) || ENABLED(miniVIKI) + // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller as well + U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); #elif ENABLED(U8GLIB_SSD1306) // Generic support for SSD1306 OLED I2C LCDs U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);