MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up 12864 OLED code (#11388)

Browse Source
This commit is contained in:
Shen Yiming 2018-07-31 12:02:12 +08:00 committed by Scott Lahteine
parent c4f4c255b4
commit 8db91f0bd1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/ultralcd_impl_DOGM.h
View File

@ -356,10 +356,8 @@ static void lcd_implementation_init() {
OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH); OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH);
#endif #endif
#if ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306) #if !defined(LCD_RESET_PIN) && (ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306))
OUT_WRITE(LCD_PINS_RS, LOW); #define LCD_RESET_PIN LCD_PINS_RS
_delay_ms(500);
OUT_WRITE(LCD_PINS_RS, HIGH);
#endif #endif
#if PIN_EXISTS(LCD_RESET) #if PIN_EXISTS(LCD_RESET)
@ -369,7 +367,7 @@ static void lcd_implementation_init() {
_delay_ms(5); // delay to allow the display to initalize _delay_ms(5); // delay to allow the display to initalize
#endif #endif
#if PIN_EXISTS(LCD_RESET) || ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306) #if PIN_EXISTS(LCD_RESET)
u8g.begin(); u8g.begin();
#endif #endif