From 2451455974e6a3b4a028f0bd6a0001f3c9b6e539 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 16 Jul 2018 23:54:46 +0200 Subject: [PATCH] LCD menu optimalization - initial lcd update fix --- Firmware/Marlin_main.cpp | 2 -- Firmware/lcd.cpp | 9 +-------- Firmware/lcd.h | 5 ----- Firmware/tmc2130.cpp | 2 -- Firmware/ultralcd.cpp | 5 +++-- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index bf24a10e..8285dff2 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -907,8 +907,6 @@ void factory_reset(char level, bool quiet) } -//#include "LiquidCrystal_Prusa.h" -//extern LiquidCrystal_Prusa lcd; FILE _uartout = {0}; diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index acc3745c..19f18bd7 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -15,9 +15,6 @@ #include "fastio.h" - - - // commands #define LCD_CLEARDISPLAY 0x01 #define LCD_RETURNHOME 0x02 @@ -57,11 +54,6 @@ #define LCD_5x8DOTS 0x00 - -//LiquidCrystal_Prusa lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5,LCD_PINS_D6,LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7 -//LiquidCrystal_Prusa lcd; //RS,Enable,D4,D5,D6,D7 - - FILE _lcdout = {0}; @@ -254,6 +246,7 @@ void lcd_init(void) if (fourbitmode) lcd_displayfunction = LCD_4BITMODE | LCD_1LINE | LCD_5x8DOTS; else lcd_displayfunction = LCD_8BITMODE | LCD_1LINE | LCD_5x8DOTS; lcd_begin(LCD_WIDTH, LCD_HEIGHT, LCD_5x8DOTS, 1); + //lcd_clear(); fdev_setup_stream(lcdout, lcd_putchar, NULL, _FDEV_SETUP_WRITE); //setup lcdout stream } diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 731057ce..d472e694 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -6,11 +6,6 @@ #include -//////////////////////////////////// -// Create LCD class instance and chipset-specific information -//#include "LiquidCrystal_Prusa.h" -//extern LiquidCrystal_Prusa lcd; - extern FILE _lcdout; diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 8653f750..989f6f8f 100644 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -3,13 +3,11 @@ #ifdef TMC2130 #include "tmc2130.h" -//#include "LiquidCrystal_Prusa.h" #include "ultralcd.h" #include "language.h" #include "spi.h" -//extern LiquidCrystal_Prusa lcd; #define TMC2130_GCONF_NORMAL 0x00000000 // spreadCycle #define TMC2130_GCONF_SGSENS 0x00003180 // spreadCycle with stallguard (stall activates DIAG0 and DIAG1 [pushpull]) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8493dd2e..1b5eb40a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7228,12 +7228,13 @@ void menu_action_sddirectory(const char* filename, char* longFilename) void ultralcd_init() { lcd_init(); -// lcd_refresh(); + lcd_refresh(); lcd_longpress_func = menu_lcd_longpress_func; lcd_charsetup_func = menu_lcd_charsetup_func; lcd_lcdupdate_func = menu_lcd_lcdupdate_func; menu_menu = lcd_status_screen; - + menu_lcd_charsetup_func(); + SET_INPUT(BTN_EN1); SET_INPUT(BTN_EN2); WRITE(BTN_EN1, HIGH);