josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use lcd_home() wherever possible 

Fix cherry-pick conflict
This commit is contained in:
Alex Voinea 2023-01-24 13:05:48 +01:00
parent c7f9a46c86
commit 580b27e394
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/lcd.cpp
View File

@ -244,17 +244,18 @@ void lcd_refresh_noclear(void)
lcd_begin(0); lcd_begin(0);
} }
// Clear display, set cursor position to zero and unshift the display. It does not clear the custom characters memory
void lcd_clear(void) void lcd_clear(void)
{ {
lcd_command(LCD_CLEARDISPLAY, 1600); // clear display, set cursor position to zero lcd_command(LCD_CLEARDISPLAY, 1600);
lcd_currline = 0; lcd_currline = 0;
lcd_ddram_address = 0; lcd_ddram_address = 0;
} }
// Set cursor position to zero and in DDRAM. It does not unshift the display.
void lcd_home(void) void lcd_home(void)
{ {
lcd_command(LCD_RETURNHOME, 1600); // set cursor position to zero lcd_set_cursor(0, 0);
lcd_currline = 0;
lcd_ddram_address = 0; lcd_ddram_address = 0;
} }

4
Firmware/ultralcd.cpp
View File

@ -1747,8 +1747,8 @@ bool shouldPreheatOnlyNozzle() {
} }
} }
void lcd_print_target_temps_first_line(){ void lcd_print_target_temps_first_line() {
lcd_set_cursor(0, 0); lcd_home();
lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0)); lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0));
lcd_set_cursor(10, 0); lcd_set_cursor(10, 0);
int targetBedTemp = (int) degTargetBed(); int targetBedTemp = (int) degTargetBed();