Browse Source

Merge pull request #5303 from AnHardt/reduce-sripes

Not more then 4 stripes for u8g-devices
Scott Lahteine 7 years ago
parent
commit
20b0889602
1 changed files with 22 additions and 11 deletions
  1. 22
    11
      Marlin/ultralcd_impl_DOGM.h

+ 22
- 11
Marlin/ultralcd_impl_DOGM.h View File

@@ -140,36 +140,47 @@
140 140
 
141 141
 // LCD selection
142 142
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
143
-  U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS);
143
+  U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS); // 2 stripes
144
+  // U8GLIB_ST7920_128X64 u8g(LCD_PINS_RS); // 8 stripes
144 145
 #elif ENABLED(U8GLIB_ST7920)
145
-  //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
146
-  U8GLIB_ST7920_128X64_RRD u8g(0);
146
+  //U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 2 stripes
147
+                                                                            // No 4 stripe device available from u8glib.
148
+  //U8GLIB_ST7920_128X64 u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS);    // Original u8glib device. 8 stripes
149
+  U8GLIB_ST7920_128X64_RRD u8g(0); // Number of stripes can be adjusted in ultralcd_st7920_u8glib_rrd.h with PAGE_HEIGHT
147 150
 #elif ENABLED(CARTESIO_UI)
148 151
   // The CartesioUI display
149 152
   #if DOGLCD_MOSI != -1 && DOGLCD_SCK != -1
150 153
     // using SW-SPI
151
-    U8GLIB_DOGM128 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);
154
+    //U8GLIB_DOGM128 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);  // 8 stripes
155
+    U8GLIB_DOGM128_2X u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 4 stripes
152 156
   #else
153
-    U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);
157
+    //U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
158
+    U8GLIB_DOGM128_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
154 159
   #endif
155 160
 #elif ENABLED(U8GLIB_LM6059_AF)
156 161
   // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
157
-  U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
162
+  //U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
163
+  U8GLIB_LM6059_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
158 164
 #elif ENABLED(MAKRPANEL) || ENABLED(VIKI2) || ENABLED(miniVIKI)
159 165
   // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller as well
160
-  U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
166
+  //U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
167
+  U8GLIB_NHD_C12864_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
161 168
 #elif ENABLED(U8GLIB_SSD1306)
162 169
   // Generic support for SSD1306 OLED I2C LCDs
163
-  U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);
170
+  //U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);  // 8 stripes
171
+  U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
164 172
 #elif ENABLED(U8GLIB_SH1106)
165 173
   // Generic support for SH1106 OLED I2C LCDs
166
-  U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);
174
+  //U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);  // 8 stripes
175
+  U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
167 176
 #elif ENABLED(MINIPANEL)
168 177
   // The MINIPanel display
169
-  U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0);
178
+  //U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
179
+  U8GLIB_MINI12864_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
170 180
 #else
171 181
   // for regular DOGM128 display with HW-SPI
172
-  U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0
182
+  //U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0  // 8 stripes
183
+  U8GLIB_DOGM128_2X u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0 // 4 stripes
173 184
 #endif
174 185
 
175 186
 #ifndef LCD_PIXEL_WIDTH

Loading…
Cancel
Save