zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🐛 Fix LCD_COL_X_RJ

Browse source 
Followup to #22471
This commit is contained in:
Scott Lahteine 2021-08-15 19:02:08 -05:00 committed by Scott Lahteine
parent b3c8d9bec8
commit f0bca66d45
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/lcd/lcdprint.h
View file

@ -79,7 +79,6 @@
// Graphical LCD uses the menu font size for cursor positioning // Graphical LCD uses the menu font size for cursor positioning
#define LCD_COL_X(col) (( (col)) * (MENU_FONT_WIDTH)) #define LCD_COL_X(col) (( (col)) * (MENU_FONT_WIDTH))
#define LCD_ROW_Y(row) ((1 + (row)) * (MENU_LINE_HEIGHT)) #define LCD_ROW_Y(row) ((1 + (row)) * (MENU_LINE_HEIGHT))
#define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))
#else #else
@ -99,7 +98,6 @@
// Character LCD uses direct cursor positioning // Character LCD uses direct cursor positioning
#define LCD_COL_X(col) (col) #define LCD_COL_X(col) (col)
#define LCD_ROW_Y(row) (row) #define LCD_ROW_Y(row) (row)
#define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
#endif #endif
@ -107,6 +105,7 @@
#define MENU_LINE_HEIGHT MENU_FONT_HEIGHT #define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
#endif #endif
#define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
#define SETCURSOR(col, row) lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row)) #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_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
#define SETCURSOR_X(col) SETCURSOR(col, _lcdLineNr) #define SETCURSOR_X(col) SETCURSOR(col, _lcdLineNr)