Browse Source

START_ROW => START_COL

Scott Lahteine 9 years ago
parent
commit
d9f75f62c0
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      Marlin/dogm_lcd_implementation.h

+ 7
- 7
Marlin/dogm_lcd_implementation.h View File

135
   #define TALL_FONT_CORRECTION 0
135
   #define TALL_FONT_CORRECTION 0
136
 #endif
136
 #endif
137
 
137
 
138
-#define START_ROW              0
138
+#define START_COL              0
139
 
139
 
140
 // LCD selection
140
 // LCD selection
141
 #if ENABLED(U8GLIB_ST7920)
141
 #if ENABLED(U8GLIB_ST7920)
480
   else {
480
   else {
481
     u8g.setColorIndex(1); // unmarked text is black on white
481
     u8g.setColorIndex(1); // unmarked text is black on white
482
   }
482
   }
483
-  u8g.setPrintPos((START_ROW) * (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
483
+  u8g.setPrintPos((START_COL) * (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
484
 }
484
 }
485
 
485
 
486
 #if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
486
 #if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
490
     lcd_implementation_mark_as_selected(row, invert);
490
     lcd_implementation_mark_as_selected(row, invert);
491
 
491
 
492
     char c;
492
     char c;
493
-    int8_t n = LCD_WIDTH;
493
+    int8_t n = LCD_WIDTH - (START_COL);
494
 
494
 
495
     if (center && !valstr) {
495
     if (center && !valstr) {
496
       int8_t pad = (LCD_WIDTH - lcd_strlen_P(pstr)) / 2;
496
       int8_t pad = (LCD_WIDTH - lcd_strlen_P(pstr)) / 2;
513
   UNUSED(pre_char);
513
   UNUSED(pre_char);
514
 
514
 
515
   char c;
515
   char c;
516
-  uint8_t n = LCD_WIDTH - 2;
516
+  uint8_t n = LCD_WIDTH - (START_COL) - 2;
517
 
517
 
518
   lcd_implementation_mark_as_selected(row, isSelected);
518
   lcd_implementation_mark_as_selected(row, isSelected);
519
 
519
 
530
 static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) {
530
 static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) {
531
   char c;
531
   char c;
532
   uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
532
   uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
533
-  uint8_t n = LCD_WIDTH - 2 - vallen;
533
+  uint8_t n = LCD_WIDTH - (START_COL) - 2 - vallen;
534
 
534
 
535
   lcd_implementation_mark_as_selected(row, isSelected);
535
   lcd_implementation_mark_as_selected(row, isSelected);
536
 
536
 
570
 
570
 
571
 void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
571
 void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) {
572
   uint8_t rows = 1;
572
   uint8_t rows = 1;
573
-  uint8_t lcd_width = LCD_WIDTH, char_width = DOG_CHAR_WIDTH;
573
+  uint8_t lcd_width = LCD_WIDTH - (START_COL), char_width = DOG_CHAR_WIDTH;
574
   uint8_t vallen = lcd_strlen(value);
574
   uint8_t vallen = lcd_strlen(value);
575
 
575
 
576
   #if ENABLED(USE_BIG_EDIT_FONT)
576
   #if ENABLED(USE_BIG_EDIT_FONT)
604
   static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) {
604
   static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) {
605
     UNUSED(pstr);
605
     UNUSED(pstr);
606
     char c;
606
     char c;
607
-    uint8_t n = LCD_WIDTH - 1;
607
+    uint8_t n = LCD_WIDTH - (START_COL) - 1;
608
 
608
 
609
     if (longFilename[0]) {
609
     if (longFilename[0]) {
610
       filename = longFilename;
610
       filename = longFilename;

Loading…
Cancel
Save