Przeglądaj źródła

[2.0.x] Adding support for using the MKS_12864OLED with the SSD1306 controller (#8814)

* Adding support for using the MKS_12864OLED with the SSD1306 controller

* Update comment for correct controller type
Dan Delaney 7 lat temu
rodzic
commit
b055d8c39c

+ 5
- 3
Marlin/Configuration.h Wyświetl plik

1625
 //#define CR10_STOCKDISPLAY
1625
 //#define CR10_STOCKDISPLAY
1626
 
1626
 
1627
 //
1627
 //
1628
-// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1628
+// MKS OLED 1.3" 128x64 FULL GRAPHICS CONTROLLER
1629
 // http://reprap.org/wiki/MKS_12864OLED
1629
 // http://reprap.org/wiki/MKS_12864OLED
1630
 //
1630
 //
1631
 // Tiny, but very sharp OLED display
1631
 // Tiny, but very sharp OLED display
1632
-//
1633
-//#define MKS_12864OLED
1632
+// If there is a pixel shift, try the other controller.
1633
+
1634
+//#define MKS_12864OLED          // Uses the SH1106 controller (default)
1635
+//#define MKS_12864OLED_SSD1306  // Uses the SSD1306 controller
1634
 
1636
 
1635
 //
1637
 //
1636
 // AZSMZ 12864 LCD with SD
1638
 // AZSMZ 12864 LCD with SD

+ 5
- 0
Marlin/src/inc/Conditionals_LCD.h Wyświetl plik

130
   #define REPRAP_DISCOUNT_SMART_CONTROLLER
130
   #define REPRAP_DISCOUNT_SMART_CONTROLLER
131
   #define U8GLIB_SH1106
131
   #define U8GLIB_SH1106
132
 
132
 
133
+#elif ENABLED(MKS_12864OLED_SSD1306)
134
+
135
+  #define REPRAP_DISCOUNT_SMART_CONTROLLER
136
+  #define U8GLIB_SSD1306
137
+
133
 #elif ENABLED(MKS_MINI_12864)
138
 #elif ENABLED(MKS_MINI_12864)
134
 
139
 
135
   #define MINIPANEL
140
   #define MINIPANEL

+ 9
- 3
Marlin/src/inc/SanityCheck.h Wyświetl plik

1289
  *       REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER => REPRAP_DISCOUNT_SMART_CONTROLLER
1289
  *       REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER => REPRAP_DISCOUNT_SMART_CONTROLLER
1290
  *       SAV_3DGLCD => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
1290
  *       SAV_3DGLCD => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
1291
  *       MKS_12864OLED => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
1291
  *       MKS_12864OLED => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
1292
+ *       MKS_12864OLED_SSD1306 => U8GLIB_SSD1306 => ULTIMAKERCONTROLLER
1292
  *       miniVIKI => ULTIMAKERCONTROLLER
1293
  *       miniVIKI => ULTIMAKERCONTROLLER
1293
  *       VIKI2 => ULTIMAKERCONTROLLER
1294
  *       VIKI2 => ULTIMAKERCONTROLLER
1294
  *       ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
1295
  *       ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
1303
       && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
1304
       && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
1304
       && DISABLED(AZSMZ_12864) \
1305
       && DISABLED(AZSMZ_12864) \
1305
       && DISABLED(PANEL_ONE) \
1306
       && DISABLED(PANEL_ONE) \
1306
-      && DISABLED(MKS_12864OLED)
1307
+      && DISABLED(MKS_12864OLED) \
1308
+      && DISABLED(MKS_12864OLED_SSD1306)
1307
     + 1
1309
     + 1
1308
   #endif
1310
   #endif
1309
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
1311
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
1310
       && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
1312
       && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
1311
       && DISABLED(LCD_FOR_MELZI) \
1313
       && DISABLED(LCD_FOR_MELZI) \
1312
       && DISABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
1314
       && DISABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
1313
-      && DISABLED(MKS_12864OLED)
1315
+      && DISABLED(MKS_12864OLED) \
1316
+      && DISABLED(MKS_12864OLED_SSD1306)
1314
     + 1
1317
     + 1
1315
   #endif
1318
   #endif
1316
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
1319
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
1323
   #if ENABLED(MKS_12864OLED)
1326
   #if ENABLED(MKS_12864OLED)
1324
     + 1
1327
     + 1
1325
   #endif
1328
   #endif
1329
+  #if ENABLED(MKS_12864OLED_SSD1306)
1330
+    + 1
1331
+  #endif
1326
   #if ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
1332
   #if ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
1327
     + 1
1333
     + 1
1328
   #endif
1334
   #endif
1382
   #if ENABLED(LCD_I2C_VIKI)
1388
   #if ENABLED(LCD_I2C_VIKI)
1383
     + 1
1389
     + 1
1384
   #endif
1390
   #endif
1385
-  #if ENABLED(U8GLIB_SSD1306) && DISABLED(OLED_PANEL_TINYBOY2)
1391
+  #if ENABLED(U8GLIB_SSD1306) && DISABLED(OLED_PANEL_TINYBOY2) && DISABLED(MKS_12864OLED_SSD1306)
1386
     + 1
1392
     + 1
1387
   #endif
1393
   #endif
1388
   #if ENABLED(SAV_3DLCD)
1394
   #if ENABLED(SAV_3DLCD)

+ 5
- 0
Marlin/src/lcd/ultralcd_impl_DOGM.h Wyświetl plik

195
     //U8GLIB_64128N_2X_HAL u8g(DOGLCD_CS, DOGLCD_A0);  // using HW-SPI
195
     //U8GLIB_64128N_2X_HAL u8g(DOGLCD_CS, DOGLCD_A0);  // using HW-SPI
196
     U8GLIB_64128N_2X_HAL u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);  // using SW-SPI
196
     U8GLIB_64128N_2X_HAL u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);  // using SW-SPI
197
 
197
 
198
+#elif ENABLED(MKS_12864OLED_SSD1306)
199
+  // MKS 128x64 (SSD1306) OLED I2C LCD
200
+    U8GLIB_SSD1306_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);      // 8 stripes
201
+    //U8GLIB_SSD1306_128X64_2X u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 4 stripes
202
+
198
 #elif ENABLED(U8GLIB_SSD1306)
203
 #elif ENABLED(U8GLIB_SSD1306)
199
   // Generic support for SSD1306 OLED I2C LCDs
204
   // Generic support for SSD1306 OLED I2C LCDs
200
     //U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE  u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
205
     //U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE  u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes

+ 1
- 1
Marlin/src/pins/pins_RAMPS.h Wyświetl plik

339
 
339
 
340
     #else
340
     #else
341
 
341
 
342
-      #if ENABLED(MKS_12864OLED)
342
+      #if ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
343
         #define LCD_PINS_DC     25 // Set as output on init
343
         #define LCD_PINS_DC     25 // Set as output on init
344
         #define LCD_PINS_RS     27 // Pull low for 1s to init
344
         #define LCD_PINS_RS     27 // Pull low for 1s to init
345
         // DOGM SPI LCD Support
345
         // DOGM SPI LCD Support

+ 1
- 1
Marlin/src/pins/pins_RAMPS_PLUS.h Wyświetl plik

76
 #undef E1_CS_PIN
76
 #undef E1_CS_PIN
77
 
77
 
78
 #if ENABLED(ULTRA_LCD) && DISABLED(REPRAPWORLD_GRAPHICAL_LCD) && (DISABLED(NEWPANEL) || DISABLED(PANEL_ONE)) && DISABLED(CR10_STOCKDISPLAY)
78
 #if ENABLED(ULTRA_LCD) && DISABLED(REPRAPWORLD_GRAPHICAL_LCD) && (DISABLED(NEWPANEL) || DISABLED(PANEL_ONE)) && DISABLED(CR10_STOCKDISPLAY)
79
-  #if DISABLED(MKS_12864OLED)
79
+  #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
80
     #undef LCD_PINS_RS
80
     #undef LCD_PINS_RS
81
     #define LCD_PINS_RS     42   // 3DYMY boards pin 16 -> 42
81
     #define LCD_PINS_RS     42   // 3DYMY boards pin 16 -> 42
82
     #undef LCD_PINS_ENABLE
82
     #undef LCD_PINS_ENABLE

Ładowanie…
Anuluj
Zapisz