From ff009883035a58ec3a8739198cd365f9da6e23c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 5 Feb 2022 18:28:17 +0000 Subject: [PATCH] Revert "Replace hardcoded values and optimise strings" This reverts commit e62bc4686f452f3222860146d28b7769b06200fd. --- Firmware/mmu.cpp | 2 +- Firmware/ultralcd.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 31cad6d8..8cd50f87 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -738,7 +738,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) //Print the hotend temperature (9 chars total) and fill rest of the line with space lcd_set_cursor(0, 4); //line 4 - int chars = lcd_printf_P(_N(LCD_STR_THERMOMETER "%3d/%d" LCD_STR_DEGREE),(int)(degHotend(active_extruder) + 0.5), (int)(degTargetHotend(active_extruder) + 0.5)); + int chars = lcd_printf_P(_N("%c%3d/%d%c"), LCD_STR_THERMOMETER[0],(int)(degHotend(active_extruder) + 0.5), (int)(degTargetHotend(active_extruder) + 0.5), LCD_STR_DEGREE[0]); lcd_space(9 - chars); delay_keep_alive(1000); } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5972befc..8162e450 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -409,7 +409,7 @@ static uint8_t menu_item_sdfile(const char* str_fn, char* str_fnl) // Print temperature (nozzle/bed) (9 chars total) void lcdui_print_temp(char type, int val_current, int val_target) { - int chars = lcd_printf_P(_N("%c%3d/%d" LCD_STR_DEGREE), type, val_current, val_target); + int chars = lcd_printf_P(_N("%c%3d/%d%c"), type, val_current, val_target, LCD_STR_DEGREE[0]); lcd_space(9 - chars); } @@ -448,7 +448,7 @@ void lcdui_print_planner_diag(void) // Print feedrate (8 chars total) void lcdui_print_feedrate(void) { - int chars = lcd_printf_P(_N(LCD_STR_FEEDRATE "%3d%%"), feedmultiply); + int chars = lcd_printf_P(_N("%c%3d%%"), LCD_STR_FEEDRATE[0], feedmultiply); lcd_space(8 - chars); } @@ -563,12 +563,12 @@ void lcdui_print_time(void) } if (print_t < 6000) //time<100h - chars = lcd_printf_P(_N(LCD_STR_CLOCK "%02u:%02u%c%c"), print_t / 60, print_t % 60, suff, suff_doubt); + chars = lcd_printf_P(_N("%c%02u:%02u%c%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff, suff_doubt); else //time>=100h - chars = lcd_printf_P(_N(LCD_STR_CLOCK "%3uh %c%c"), print_t / 60, suff, suff_doubt); + chars = lcd_printf_P(_N("%c%3uh %c%c"), LCD_STR_CLOCK[0], print_t / 60, suff, suff_doubt); } else - chars = lcd_puts_P(_N(LCD_STR_CLOCK "--:-- ")); + chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]); lcd_space(8 - chars); } @@ -1702,7 +1702,7 @@ static void lcd_menu_temperatures_line(const char *ipgmLabel, int value){ static const size_t maxChars = 15; char tmp[maxChars]; pgmtext_with_colon(ipgmLabel, tmp, maxChars); - lcd_printf_P(PSTR(" %s%3d" LCD_STR_DEGREE "\n"), tmp, value); // no need to add -14.14 to string alignment + lcd_printf_P(PSTR(" %s%3d\x01\n"), tmp, value); // no need to add -14.14 to string alignment } //! @brief Show Temperatures @@ -2879,8 +2879,8 @@ static void lcd_menu_xyz_skew() lcd_printf_P(_N( "%-14.14S:\n" "%S\n" - "%-14.14S:%3.2f" LCD_STR_DEGREE "\n" - "%-14.14S:%3.2f" LCD_STR_DEGREE + "%-14.14S:%3.2f\x01\n" + "%-14.14S:%3.2f\x01" ), _i("Measured skew"), ////MSG_MEASURED_SKEW c=14 separator, @@ -2889,7 +2889,7 @@ static void lcd_menu_xyz_skew() ); if (angleDiff < 100){ lcd_set_cursor(15,0); - lcd_printf_P(_N("%3.2f" LCD_STR_DEGREE), _deg(angleDiff)); + lcd_printf_P(_N("%3.2f\x01"), _deg(angleDiff)); } else{ lcd_puts_at_P(15,0, _T(MSG_NA));