Browse Source

Use lcd_printPGM_utf in more places

Fix #10256
Scott Lahteine 7 years ago
parent
commit
31df43212c
2 changed files with 7 additions and 7 deletions
  1. 3
    3
      Marlin/src/lcd/ultralcd_impl_DOGM.h
  2. 4
    4
      Marlin/src/lcd/ultralcd_impl_HD44780.h

+ 3
- 3
Marlin/src/lcd/ultralcd_impl_DOGM.h View File

412
     u8g.setPrintPos(0, h4 * 1);
412
     u8g.setPrintPos(0, h4 * 1);
413
     lcd_print_utf(lcd_status_message);
413
     lcd_print_utf(lcd_status_message);
414
     u8g.setPrintPos(0, h4 * 2);
414
     u8g.setPrintPos(0, h4 * 2);
415
-    lcd_printPGM(PSTR(MSG_HALTED));
415
+    lcd_printPGM_utf(PSTR(MSG_HALTED));
416
     u8g.setPrintPos(0, h4 * 3);
416
     u8g.setPrintPos(0, h4 * 3);
417
-    lcd_printPGM(PSTR(MSG_PLEASE_RESET));
417
+    lcd_printPGM_utf(PSTR(MSG_PLEASE_RESET));
418
   } while (u8g.nextPage());
418
   } while (u8g.nextPage());
419
 }
419
 }
420
 
420
 
581
     bool onpage = PAGE_CONTAINS(baseline + 1 - (DOG_CHAR_HEIGHT_EDIT), baseline);
581
     bool onpage = PAGE_CONTAINS(baseline + 1 - (DOG_CHAR_HEIGHT_EDIT), baseline);
582
     if (onpage) {
582
     if (onpage) {
583
       u8g.setPrintPos(0, baseline);
583
       u8g.setPrintPos(0, baseline);
584
-      lcd_printPGM(pstr);
584
+      lcd_printPGM_utf(pstr);
585
     }
585
     }
586
 
586
 
587
     if (value != NULL) {
587
     if (value != NULL) {

+ 4
- 4
Marlin/src/lcd/ultralcd_impl_HD44780.h View File

528
       lcd_erase_line(3); \
528
       lcd_erase_line(3); \
529
       if (strlen(STRING) <= LCD_WIDTH) { \
529
       if (strlen(STRING) <= LCD_WIDTH) { \
530
         lcd.setCursor((LCD_WIDTH - lcd_strlen_P(PSTR(STRING))) / 2, 3); \
530
         lcd.setCursor((LCD_WIDTH - lcd_strlen_P(PSTR(STRING))) / 2, 3); \
531
-        lcd_printPGM(PSTR(STRING)); \
531
+        lcd_printPGM_utf(PSTR(STRING)); \
532
         safe_delay(DELAY); \
532
         safe_delay(DELAY); \
533
       } \
533
       } \
534
       else { \
534
       else { \
601
     lcd.setCursor(0, 2);
601
     lcd.setCursor(0, 2);
602
   #else
602
   #else
603
     lcd.setCursor(0, 2);
603
     lcd.setCursor(0, 2);
604
-    lcd_printPGM(PSTR(MSG_HALTED));
604
+    lcd_printPGM_utf(PSTR(MSG_HALTED));
605
     lcd.setCursor(0, 3);
605
     lcd.setCursor(0, 3);
606
   #endif
606
   #endif
607
-  lcd_printPGM(PSTR(MSG_PLEASE_RESET));
607
+  lcd_printPGM_utf(PSTR(MSG_PLEASE_RESET));
608
 }
608
 }
609
 
609
 
610
 FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, const bool blink) {
610
 FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, const bool blink) {
1017
 
1017
 
1018
   void lcd_implementation_drawedit(const char* pstr, const char* const value=NULL) {
1018
   void lcd_implementation_drawedit(const char* pstr, const char* const value=NULL) {
1019
     lcd.setCursor(1, 1);
1019
     lcd.setCursor(1, 1);
1020
-    lcd_printPGM(pstr);
1020
+    lcd_printPGM_utf(pstr);
1021
     if (value != NULL) {
1021
     if (value != NULL) {
1022
       lcd.write(':');
1022
       lcd.write(':');
1023
       const uint8_t valrow = (lcd_strlen_P(pstr) + 1 + lcd_strlen(value) + 1) > (LCD_WIDTH - 2) ? 2 : 1;  // Value on the next row if it won't fit
1023
       const uint8_t valrow = (lcd_strlen_P(pstr) + 1 + lcd_strlen(value) + 1) > (LCD_WIDTH - 2) ? 2 : 1;  // Value on the next row if it won't fit

Loading…
Cancel
Save