From 39ebca6b5ff28d03b9dbd2a99a19d48d4dc58fe4 Mon Sep 17 00:00:00 2001 From: Luu Lac <45380455+shitcreek@users.noreply.github.com> Date: Wed, 1 May 2019 00:37:52 -0500 Subject: [PATCH] Fix FYSETC, MINIPANEL, MKS_MINI_12864 display (#13864) --- Marlin/src/lcd/dogm/ultralcd_DOGM.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h index 8ce25d0e7..0e97b4c8f 100644 --- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h +++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h @@ -107,12 +107,16 @@ // Generic support for SSD1309 OLED I2C LCDs #define U8G_CLASS U8GLIB_SSD1309_128X64 #define U8G_PARAM (U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST) -#elif EITHER(MINIPANEL, FYSETC_MINI_12864) - // The MINIPanel display +#elif ENABLED(MINIPANEL) + // MINIPanel display //#define U8G_CLASS U8GLIB_MINI12864 //#define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 8 stripes + #define U8G_CLASS U8GLIB_MINI12864_2X + #define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 8 stripes +#elif ENABLED(FYSETC_MINI_12864) + // The FYSETC_MINI_12864 display #define U8G_CLASS U8GLIB_MINI12864_2X_HAL - #if BOTH(FYSETC_MINI_12864, FORCE_SOFT_SPI) + #if ENABLED(FORCE_SOFT_SPI) #define U8G_PARAM DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0 // 4 stripes SW-SPI #else #define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 4 stripes HW-SPI