浏览代码

Combine ST7565 / U8GLIB_NHD_C12864 items in dogm

Scott Lahteine 9 年前
父节点
当前提交
9729e9c450
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3
    6
      Marlin/dogm_lcd_implementation.h

+ 3
- 6
Marlin/dogm_lcd_implementation.h 查看文件

139
 #if ENABLED(U8GLIB_ST7920)
139
 #if ENABLED(U8GLIB_ST7920)
140
   //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
140
   //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
141
   U8GLIB_ST7920_128X64_RRD u8g(0);
141
   U8GLIB_ST7920_128X64_RRD u8g(0);
142
-#elif ENABLED(MAKRPANEL)
143
-  // The MaKrPanel display, ST7565 controller as well
144
-  U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
145
-#elif ENABLED(VIKI2) || ENABLED(miniVIKI)
146
-  // Mini Viki and Viki 2.0 LCD, ST7565 controller as well
147
-  U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
148
 #elif ENABLED(U8GLIB_LM6059_AF)
142
 #elif ENABLED(U8GLIB_LM6059_AF)
149
   // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
143
   // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
150
   U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
144
   U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
145
+#elif ENABLED(MAKRPANEL) || ENABLED(VIKI2) || ENABLED(miniVIKI)
146
+  // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller as well
147
+  U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
151
 #elif ENABLED(U8GLIB_SSD1306)
148
 #elif ENABLED(U8GLIB_SSD1306)
152
   // Generic support for SSD1306 OLED I2C LCDs
149
   // Generic support for SSD1306 OLED I2C LCDs
153
   U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);
150
   U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);

正在加载...
取消
保存