Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
20b08896
Commit
20b08896
authored
Nov 27, 2016
by
Scott Lahteine
Committed by
GitHub
Nov 27, 2016
Browse files
Options
Downloads
Plain Diff
Merge pull request #5303 from AnHardt/reduce-sripes
Not more then 4 stripes for u8g-devices
parents
668e7378
24ca1a62
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/ultralcd_impl_DOGM.h
+22
-11
22 additions, 11 deletions
Marlin/ultralcd_impl_DOGM.h
with
22 additions
and
11 deletions
Marlin/ultralcd_impl_DOGM.h
+
22
−
11
View file @
20b08896
...
@@ -140,36 +140,47 @@
...
@@ -140,36 +140,47 @@
// LCD selection
// LCD selection
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
U8GLIB_ST7920_128X64_4X
u8g
(
LCD_PINS_RS
);
U8GLIB_ST7920_128X64_4X
u8g
(
LCD_PINS_RS
);
// 2 stripes
// U8GLIB_ST7920_128X64 u8g(LCD_PINS_RS); // 8 stripes
#elif ENABLED(U8GLIB_ST7920)
#elif ENABLED(U8GLIB_ST7920)
//U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
//U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 2 stripes
U8GLIB_ST7920_128X64_RRD
u8g
(
0
);
// No 4 stripe device available from u8glib.
//U8GLIB_ST7920_128X64 u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 8 stripes
U8GLIB_ST7920_128X64_RRD
u8g
(
0
);
// Number of stripes can be adjusted in ultralcd_st7920_u8glib_rrd.h with PAGE_HEIGHT
#elif ENABLED(CARTESIO_UI)
#elif ENABLED(CARTESIO_UI)
// The CartesioUI display
// The CartesioUI display
#if DOGLCD_MOSI != -1 && DOGLCD_SCK != -1
#if DOGLCD_MOSI != -1 && DOGLCD_SCK != -1
// using SW-SPI
// using SW-SPI
U8GLIB_DOGM128
u8g
(
DOGLCD_SCK
,
DOGLCD_MOSI
,
DOGLCD_CS
,
DOGLCD_A0
);
//U8GLIB_DOGM128 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 8 stripes
U8GLIB_DOGM128_2X
u8g
(
DOGLCD_SCK
,
DOGLCD_MOSI
,
DOGLCD_CS
,
DOGLCD_A0
);
// 4 stripes
#else
#else
U8GLIB_DOGM128
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
//U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // 8 stripes
U8GLIB_DOGM128_2X
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
// 4 stripes
#endif
#endif
#elif ENABLED(U8GLIB_LM6059_AF)
#elif ENABLED(U8GLIB_LM6059_AF)
// Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
// Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
U8GLIB_LM6059
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
//U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); // 8 stripes
U8GLIB_LM6059_2X
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
// 4 stripes
#elif ENABLED(MAKRPANEL) || ENABLED(VIKI2) || ENABLED(miniVIKI)
#elif ENABLED(MAKRPANEL) || ENABLED(VIKI2) || ENABLED(miniVIKI)
// The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller as well
// The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller as well
U8GLIB_NHD_C12864
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
//U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); // 8 stripes
U8GLIB_NHD_C12864_2X
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
// 4 stripes
#elif ENABLED(U8GLIB_SSD1306)
#elif ENABLED(U8GLIB_SSD1306)
// Generic support for SSD1306 OLED I2C LCDs
// Generic support for SSD1306 OLED I2C LCDs
U8GLIB_SSD1306_128X64
u8g
(
U8G_I2C_OPT_NONE
|
U8G_I2C_OPT_FAST
);
//U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes
U8GLIB_SSD1306_128X64_2X
u8g
(
U8G_I2C_OPT_NONE
|
U8G_I2C_OPT_FAST
);
// 4 stripes
#elif ENABLED(U8GLIB_SH1106)
#elif ENABLED(U8GLIB_SH1106)
// Generic support for SH1106 OLED I2C LCDs
// Generic support for SH1106 OLED I2C LCDs
U8GLIB_SH1106_128X64
u8g
(
U8G_I2C_OPT_NONE
|
U8G_I2C_OPT_FAST
);
//U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes
U8GLIB_SH1106_128X64_2X
u8g
(
U8G_I2C_OPT_NONE
|
U8G_I2C_OPT_FAST
);
// 4 stripes
#elif ENABLED(MINIPANEL)
#elif ENABLED(MINIPANEL)
// The MINIPanel display
// The MINIPanel display
U8GLIB_MINI12864
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
//U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0); // 8 stripes
U8GLIB_MINI12864_2X
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
// 4 stripes
#else
#else
// for regular DOGM128 display with HW-SPI
// for regular DOGM128 display with HW-SPI
U8GLIB_DOGM128
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
// HW-SPI Com: CS, A0
//U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0 // 8 stripes
U8GLIB_DOGM128_2X
u8g
(
DOGLCD_CS
,
DOGLCD_A0
);
// HW-SPI Com: CS, A0 // 4 stripes
#endif
#endif
#ifndef LCD_PIXEL_WIDTH
#ifndef LCD_PIXEL_WIDTH
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment