Skip to content

Commit

Permalink
🐛 Fix LCD_COL_X_RJ
Browse files Browse the repository at this point in the history
Followup to #22471
  • Loading branch information
thinkyhead committed Aug 19, 2021
1 parent b3c8d9b commit f0bca66
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Marlin/src/lcd/lcdprint.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,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_LINE_HEIGHT))
#define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))

#else

Expand All @@ -99,14 +98,14 @@
// 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

#ifndef MENU_LINE_HEIGHT
#define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
#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_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
#define SETCURSOR_X(col) SETCURSOR(col, _lcdLineNr)
Expand Down

0 comments on commit f0bca66

Please sign in to comment.