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

Move MKS_12864OLED to lcd_implementation_init

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-12 08:50:51 -05:00
parent 009fd186f8
commit 4dad8628ff
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -13863,12 +13863,6 @@ void setup() {
pe_deactivate_magnet(1); pe_deactivate_magnet(1);
#endif #endif
#endif #endif
#if ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
SET_OUTPUT(LCD_PINS_DC);
OUT_WRITE(LCD_PINS_RS, LOW);
delay(1000);
WRITE(LCD_PINS_RS, HIGH);
#endif
#if ENABLED(USE_WATCHDOG) #if ENABLED(USE_WATCHDOG)
watchdog_init(); watchdog_init();

7
Marlin/ultralcd_impl_DOGM.h
View File

@ -350,6 +350,13 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
// Initialize or re-initialize the LCD // Initialize or re-initialize the LCD
static void lcd_implementation_init() { static void lcd_implementation_init() {
#if ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
SET_OUTPUT(LCD_PINS_DC);
OUT_WRITE(LCD_PINS_RS, LOW);
delay(1000);
WRITE(LCD_PINS_RS, HIGH);
#endif
#if PIN_EXISTS(LCD_BACKLIGHT) // Enable LCD backlight #if PIN_EXISTS(LCD_BACKLIGHT) // Enable LCD backlight
OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH); OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH);
#endif #endif