Prechádzať zdrojové kódy

LCD menu optimalization - initial lcd update fix

Robert Pelnar 5 rokov pred
rodič
commit
2451455974

+ 0 - 2
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};

+ 1 - 8
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
 }
 

+ 0 - 5
Firmware/lcd.h

@@ -6,11 +6,6 @@
 #include <stdio.h>
 
 
-////////////////////////////////////
-// Create LCD class instance and chipset-specific information
-//#include "LiquidCrystal_Prusa.h"
-//extern LiquidCrystal_Prusa lcd;
-
 
 extern FILE _lcdout;
 

+ 0 - 2
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])

+ 3 - 2
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);