Pārlūkot izejas kodu

Constrain LCD status message rendering

Scott Lahteine 7 gadus atpakaļ
vecāks
revīzija
ba5910ab6c
2 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 4
    2
      Marlin/ultralcd_impl_DOGM.h
  2. 2
    1
      Marlin/ultralcd_impl_HD44780.h

+ 4
- 2
Marlin/ultralcd_impl_DOGM.h Parādīt failu

@@ -634,7 +634,8 @@ static void lcd_implementation_status_screen() {
634 634
 
635 635
     #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
636 636
       if (PENDING(millis(), previous_lcd_status_ms + 5000UL)) {  //Display both Status message line and Filament display on the last line
637
-        lcd_print(lcd_status_message);
637
+        const char *str = lcd_status_message;
638
+        for (uint8_t i = 0; char c = str[i] && i < LCD_WIDTH; ++i) lcd_print(c);
638 639
       }
639 640
       else {
640 641
         lcd_printPGM(PSTR(LCD_STR_FILAM_DIA));
@@ -646,7 +647,8 @@ static void lcd_implementation_status_screen() {
646 647
         u8g.print('%');
647 648
       }
648 649
     #else
649
-      lcd_print(lcd_status_message);
650
+      const char *str = lcd_status_message;
651
+      for (uint8_t i = 0; char c = str[i] && i < LCD_WIDTH; ++i) lcd_print(c);
650 652
     #endif
651 653
   }
652 654
 }

+ 2
- 1
Marlin/ultralcd_impl_HD44780.h Parādīt failu

@@ -795,7 +795,8 @@ static void lcd_implementation_status_screen() {
795 795
 
796 796
   #endif // FILAMENT_LCD_DISPLAY && SDSUPPORT
797 797
 
798
-  lcd_print(lcd_status_message);
798
+  const char *str = lcd_status_message;
799
+  for (uint8_t i = 0; char c = str[i] && i < LCD_WIDTH; ++i) lcd_print(c);
799 800
 }
800 801
 
801 802
 #if ENABLED(ULTIPANEL)

Notiek ielāde…
Atcelt
Saglabāt