From 040ebd1675f7008d18f660f000a7a84dbce2c26e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 31 Mar 2018 20:47:20 -0500 Subject: [PATCH] Use lcd_printPGM_utf in more places Fix #10256 --- Marlin/ultralcd_impl_DOGM.h | 6 +++--- Marlin/ultralcd_impl_HD44780.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index 0a217f030..7fd8943ef 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -396,9 +396,9 @@ void lcd_kill_screen() { u8g.setPrintPos(0, h4 * 1); lcd_print_utf(lcd_status_message); u8g.setPrintPos(0, h4 * 2); - lcd_printPGM(PSTR(MSG_HALTED)); + lcd_printPGM_utf(PSTR(MSG_HALTED)); u8g.setPrintPos(0, h4 * 3); - lcd_printPGM(PSTR(MSG_PLEASE_RESET)); + lcd_printPGM_utf(PSTR(MSG_PLEASE_RESET)); } while (u8g.nextPage()); } @@ -565,7 +565,7 @@ void lcd_implementation_clear() { } // Automatically cleared by Picture Loop bool onpage = PAGE_CONTAINS(baseline + 1 - (DOG_CHAR_HEIGHT_EDIT), baseline); if (onpage) { u8g.setPrintPos(0, baseline); - lcd_printPGM(pstr); + lcd_printPGM_utf(pstr); } if (value != NULL) { diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index 3004a791b..cf8e7dfdf 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -520,7 +520,7 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) { lcd_erase_line(3); \ if (strlen(STRING) <= LCD_WIDTH) { \ lcd.setCursor((LCD_WIDTH - lcd_strlen_P(PSTR(STRING))) / 2, 3); \ - lcd_printPGM(PSTR(STRING)); \ + lcd_printPGM_utf(PSTR(STRING)); \ safe_delay(DELAY); \ } \ else { \ @@ -593,10 +593,10 @@ void lcd_kill_screen() { lcd.setCursor(0, 2); #else lcd.setCursor(0, 2); - lcd_printPGM(PSTR(MSG_HALTED)); + lcd_printPGM_utf(PSTR(MSG_HALTED)); lcd.setCursor(0, 3); #endif - lcd_printPGM(PSTR(MSG_PLEASE_RESET)); + lcd_printPGM_utf(PSTR(MSG_PLEASE_RESET)); } FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, const bool blink) { @@ -1009,7 +1009,7 @@ static void lcd_implementation_status_screen() { void lcd_implementation_drawedit(const char* pstr, const char* const value=NULL) { lcd.setCursor(1, 1); - lcd_printPGM(pstr); + lcd_printPGM_utf(pstr); if (value != NULL) { lcd.write(':'); 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