thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚚 Relocate and adjust DWIN E3V2 (#22471)

Browse Source
This commit is contained in:
Scott Lahteine
2021-07-31 05:32:13 -05:00
committed by GitHub
parent 332dde935d
commit 9bb5b10c0c
23 changed files with 305 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/lcd/lcdprint.h
View File

@@ -76,8 +76,10 @@
#define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT)
#define INFO_FONT_WIDTH 6
// Graphical LCD uses the menu font size for cursor positioning
#define LCD_COL_X(col) (( (col)) * (MENU_FONT_WIDTH))
#define LCD_ROW_Y(row) ((1 + (row)) * (MENU_FONT_HEIGHT))
#define LCD_ROW_Y(row) ((1 + (row)) * (MENU_LINE_HEIGHT))
#define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))
#else
@@ -94,13 +96,17 @@
#define LCD_PIXEL_WIDTH LCD_WIDTH
#define LCD_PIXEL_HEIGHT LCD_HEIGHT
// Character LCD uses direct cursor positioning
#define LCD_COL_X(col) (col)
#define LCD_ROW_Y(row) (row)
#define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
#endif
#define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
#define LCD_BOTTOM_ROW (LCD_PIXEL_HEIGHT - 1)
#ifndef MENU_LINE_HEIGHT
#define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
#endif
#define SETCURSOR(col, row) lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
#define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
#define SETCURSOR_X(col) SETCURSOR(col, _lcdLineNr)