Browse Source

🐛 Fix LCD_COL_X_RJ

Followup to #22471
Scott Lahteine 4 years ago
parent
commit
af0cd400be
1 changed files with 1 additions and 2 deletions
  1. 1
    2
      Marlin/src/lcd/lcdprint.h

+ 1
- 2
Marlin/src/lcd/lcdprint.h View File

79
   // Graphical LCD uses the menu font size for cursor positioning
79
   // Graphical LCD uses the menu font size for cursor positioning
80
   #define LCD_COL_X(col) ((    (col)) * (MENU_FONT_WIDTH))
80
   #define LCD_COL_X(col) ((    (col)) * (MENU_FONT_WIDTH))
81
   #define LCD_ROW_Y(row) ((1 + (row)) * (MENU_LINE_HEIGHT))
81
   #define LCD_ROW_Y(row) ((1 + (row)) * (MENU_LINE_HEIGHT))
82
-  #define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))
83
 
82
 
84
 #else
83
 #else
85
 
84
 
99
   // Character LCD uses direct cursor positioning
98
   // Character LCD uses direct cursor positioning
100
   #define LCD_COL_X(col) (col)
99
   #define LCD_COL_X(col) (col)
101
   #define LCD_ROW_Y(row) (row)
100
   #define LCD_ROW_Y(row) (row)
102
-  #define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
103
 
101
 
104
 #endif
102
 #endif
105
 
103
 
107
   #define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
105
   #define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
108
 #endif
106
 #endif
109
 
107
 
108
+#define LCD_COL_X_RJ(len)      (LCD_PIXEL_WIDTH - LCD_COL_X(len))
110
 #define SETCURSOR(col, row)    lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
109
 #define SETCURSOR(col, row)    lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
111
 #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
110
 #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
112
 #define SETCURSOR_X(col)       SETCURSOR(col, _lcdLineNr)
111
 #define SETCURSOR_X(col)       SETCURSOR(col, _lcdLineNr)

Loading…
Cancel
Save