Przeglądaj źródła

Fix FYSETC, MINIPANEL, MKS_MINI_12864 display (#13864)

Luu Lac 6 lat temu
rodzic
commit
39ebca6b5f
1 zmienionych plików z 7 dodań i 3 usunięć
  1. 7
    3
      Marlin/src/lcd/dogm/ultralcd_DOGM.h

+ 7
- 3
Marlin/src/lcd/dogm/ultralcd_DOGM.h Wyświetl plik

107
   // Generic support for SSD1309 OLED I2C LCDs
107
   // Generic support for SSD1309 OLED I2C LCDs
108
   #define U8G_CLASS U8GLIB_SSD1309_128X64
108
   #define U8G_CLASS U8GLIB_SSD1309_128X64
109
   #define U8G_PARAM (U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST)
109
   #define U8G_PARAM (U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST)
110
-#elif EITHER(MINIPANEL, FYSETC_MINI_12864)
111
-  // The MINIPanel display
110
+#elif ENABLED(MINIPANEL)
111
+  // MINIPanel display
112
   //#define U8G_CLASS U8GLIB_MINI12864
112
   //#define U8G_CLASS U8GLIB_MINI12864
113
   //#define U8G_PARAM DOGLCD_CS, DOGLCD_A0                            // 8 stripes
113
   //#define U8G_PARAM DOGLCD_CS, DOGLCD_A0                            // 8 stripes
114
+  #define U8G_CLASS U8GLIB_MINI12864_2X
115
+  #define U8G_PARAM DOGLCD_CS, DOGLCD_A0                              // 8 stripes
116
+#elif ENABLED(FYSETC_MINI_12864)
117
+  // The FYSETC_MINI_12864 display
114
   #define U8G_CLASS U8GLIB_MINI12864_2X_HAL
118
   #define U8G_CLASS U8GLIB_MINI12864_2X_HAL
115
-  #if BOTH(FYSETC_MINI_12864, FORCE_SOFT_SPI)
119
+  #if ENABLED(FORCE_SOFT_SPI)
116
     #define U8G_PARAM DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0   // 4 stripes SW-SPI
120
     #define U8G_PARAM DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0   // 4 stripes SW-SPI
117
   #else
121
   #else
118
     #define U8G_PARAM DOGLCD_CS, DOGLCD_A0                            // 4 stripes HW-SPI
122
     #define U8G_PARAM DOGLCD_CS, DOGLCD_A0                            // 4 stripes HW-SPI

Ładowanie…
Anuluj
Zapisz