From 6afc87d3c8603d9ad2848101bbfdb39de827a6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 30 Jul 2021 23:16:03 +0000 Subject: [PATCH 01/10] Reduce unnecessary LCD CGRAM writes --- Firmware/lcd.cpp | 38 -------------------------------------- Firmware/lcd.h | 6 ------ Firmware/mmu.cpp | 3 --- Firmware/ultralcd.cpp | 22 ---------------------- Firmware/ultralcd.h | 3 --- 5 files changed, 72 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 37b70f1a1..bffaaa7f0 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -644,8 +644,6 @@ uint8_t lcd_status_update_delay = 0; lcd_longpress_func_t lcd_longpress_func = 0; -lcd_charsetup_func_t lcd_charsetup_func = 0; - lcd_lcdupdate_func_t lcd_lcdupdate_func = 0; static ShortTimer buttonBlanking; @@ -718,8 +716,6 @@ void lcd_update_enable(uint8_t enabled) lcd_next_update_millis = _millis() - 1; // Full update. lcd_clear(); - if (lcd_charsetup_func) - lcd_charsetup_func(); lcd_update(2); } else { @@ -924,28 +920,6 @@ const uint8_t lcd_chardata_clock[8] PROGMEM = { B00000, B00000}; //thanks Sonny Mounicou -const uint8_t lcd_chardata_arrup[8] PROGMEM = { - B00100, - B01110, - B11111, - B00000, - B00000, - B00000, - B00000, - B00000}; - -const uint8_t lcd_chardata_arrdown[8] PROGMEM = { - B00000, - B00000, - B00000, - B00000, - B00000, - B10001, - B01010, - B00100}; - - - void lcd_set_custom_characters(void) { lcd_createChar_P(LCD_STR_BEDTEMP[0], lcd_chardata_bedTemp); @@ -956,13 +930,6 @@ void lcd_set_custom_characters(void) lcd_createChar_P(LCD_STR_FOLDER[0], lcd_chardata_folder); lcd_createChar_P(LCD_STR_FEEDRATE[0], lcd_chardata_feedrate); lcd_createChar_P(LCD_STR_CLOCK[0], lcd_chardata_clock); - //lcd_createChar_P(LCD_STR_ARROW_UP[0], lcd_chardata_arrup); - //lcd_createChar_P(LCD_STR_ARROW_DOWN[0], lcd_chardata_arrdown); -} - -void lcd_set_custom_characters_arrows(void) -{ - lcd_createChar_P(1, lcd_chardata_arrdown); } const uint8_t lcd_chardata_arr2down[8] PROGMEM = { @@ -990,8 +957,3 @@ void lcd_set_custom_characters_nextpage(void) lcd_createChar_P(2, lcd_chardata_confirm); } -void lcd_set_custom_characters_degree(void) -{ - lcd_createChar_P(1, lcd_chardata_degree); -} - diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 65bb9dc92..09ff26dc0 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -112,8 +112,6 @@ extern uint8_t lcd_status_update_delay; extern lcd_longpress_func_t lcd_longpress_func; extern bool lcd_longpress_trigger; -extern lcd_charsetup_func_t lcd_charsetup_func; - extern lcd_lcdupdate_func_t lcd_lcdupdate_func; @@ -199,14 +197,10 @@ private: #define LCD_STR_FOLDER "\x05" #define LCD_STR_FEEDRATE "\x06" #define LCD_STR_CLOCK "\x07" -#define LCD_STR_ARROW_UP "\x0B" -#define LCD_STR_ARROW_DOWN "\x01" #define LCD_STR_ARROW_RIGHT "\x7E" //from the default character set extern void lcd_set_custom_characters(void); -extern void lcd_set_custom_characters_arrows(void); extern void lcd_set_custom_characters_nextpage(void); -extern void lcd_set_custom_characters_degree(void); //! @brief Consume click event inline void lcd_consume_click() diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index abc84c34d..8cd50f879 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -728,9 +728,6 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) screen=0; } - lcd_set_degree(); - - //5 seconds delay for (uint8_t i = 0; i < 5; i++) { if (lcd_clicked()) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 658e6b01f..03426e769 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3232,7 +3232,6 @@ void lcd_adjust_z() { #ifdef PINDA_THERMISTOR bool lcd_wait_for_pinda(float temp) { - lcd_set_custom_characters_degree(); setAllTargetHotends(0); setTargetBed(0); LongTimer pinda_timeout; @@ -3255,7 +3254,6 @@ bool lcd_wait_for_pinda(float temp) { break; } } - lcd_set_custom_characters_arrows(); lcd_update_enable(true); return target_temp_reached; } @@ -3263,7 +3261,6 @@ bool lcd_wait_for_pinda(float temp) { void lcd_wait_for_heater() { lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); - lcd_set_degree(); lcd_set_cursor(0, 4); lcd_print(LCD_STR_THERMOMETER[0]); lcd_print(ftostr3(degHotend(active_extruder))); @@ -3273,7 +3270,6 @@ void lcd_wait_for_heater() { } void lcd_wait_for_cool_down() { - lcd_set_custom_characters_degree(); setAllTargetHotends(0); setTargetBed(0); int fanSpeedBckp = fanSpeed; @@ -3292,12 +3288,10 @@ void lcd_wait_for_cool_down() { lcd_print(ftostr3(degBed())); lcd_print("/0"); lcd_print(LCD_STR_DEGREE); - lcd_set_custom_characters(); delay_keep_alive(1000); serialecho_temperatures(); } fanSpeed = fanSpeedBckp; - lcd_set_custom_characters_arrows(); lcd_update_enable(true); } @@ -3440,7 +3434,6 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg, if (multi_screen) { // Display the "next screen" indicator character. - // lcd_set_custom_characters_arrows(); lcd_set_custom_characters_nextpage(); lcd_set_cursor(19, 3); // Display the down arrow. @@ -4421,10 +4414,6 @@ static void lcd_fsensor_state_set() } #endif //FILAMENT_SENSOR -void lcd_set_degree() { - lcd_set_custom_characters_degree(); -} - #if (LANG_MODE != 0) void menu_setlang(unsigned char lang) @@ -4793,7 +4782,6 @@ static void wait_preheat() plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 60); delay_keep_alive(2000); lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); - lcd_set_custom_characters(); while (fabs(degHotend(0) - degTargetHotend(0)) > 3) { lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); @@ -8596,10 +8584,8 @@ void ultralcd_init() lcd_init(); lcd_refresh(); lcd_longpress_func = menu_lcd_longpress_func; - lcd_charsetup_func = menu_lcd_charsetup_func; lcd_lcdupdate_func = menu_lcd_lcdupdate_func; menu_menu = lcd_status_screen; - menu_lcd_charsetup_func(); SET_INPUT(BTN_EN1); SET_INPUT(BTN_EN2); @@ -8812,14 +8798,6 @@ void menu_lcd_longpress_func(void) } } -void menu_lcd_charsetup_func(void) -{ - if (menu_menu == lcd_status_screen) - lcd_set_custom_characters_degree(); - else - lcd_set_custom_characters_arrows(); -} - static inline bool z_menu_expired() { return (menu_menu == lcd_babystep_z diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 1f0577618..090bc6d4a 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -5,7 +5,6 @@ #include "config.h" extern void menu_lcd_longpress_func(void); -extern void menu_lcd_charsetup_func(void); extern void menu_lcd_lcdupdate_func(void); // Call with a false parameter to suppress the LCD update from various places like the planner or the temp control. @@ -219,8 +218,6 @@ void lcd_temp_calibration_set(); void display_loading(); -void lcd_set_degree(); - #if (LANG_MODE != 0) void lcd_language(); #endif From da2c80244035a46416b32bf442f749891c007de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 1 Aug 2021 11:10:03 +0000 Subject: [PATCH 02/10] Add two defines and use LCD_STR_DEGREE with consistency This saves 12 bytes of flash and 2 bytes of SRAM --- Firmware/lcd.cpp | 4 ++-- Firmware/lcd.h | 20 +++++++++++--------- Firmware/ultralcd.cpp | 16 ++++++++-------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index bffaaa7f0..4dfb00634 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -953,7 +953,7 @@ const uint8_t lcd_chardata_confirm[8] PROGMEM = { void lcd_set_custom_characters_nextpage(void) { - lcd_createChar_P(1, lcd_chardata_arr2down); - lcd_createChar_P(2, lcd_chardata_confirm); + lcd_createChar_P(LCD_STR_ARROW_2_DOWN[0], lcd_chardata_arr2down); + lcd_createChar_P(LCD_STR_CONFIRM[0], lcd_chardata_confirm); } diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 09ff26dc0..6b715896d 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -189,15 +189,17 @@ private: //Custom characters defined in the first 8 characters of the LCD -#define LCD_STR_BEDTEMP "\x00" -#define LCD_STR_DEGREE "\x01" -#define LCD_STR_THERMOMETER "\x02" -#define LCD_STR_UPLEVEL "\x03" -#define LCD_STR_REFRESH "\x04" -#define LCD_STR_FOLDER "\x05" -#define LCD_STR_FEEDRATE "\x06" -#define LCD_STR_CLOCK "\x07" -#define LCD_STR_ARROW_RIGHT "\x7E" //from the default character set +#define LCD_STR_BEDTEMP "\x00" +#define LCD_STR_DEGREE "\x01" +#define LCD_STR_ARROW_2_DOWN "\x01" +#define LCD_STR_THERMOMETER "\x02" +#define LCD_STR_CONFIRM "\x02" +#define LCD_STR_UPLEVEL "\x03" +#define LCD_STR_REFRESH "\x04" +#define LCD_STR_FOLDER "\x05" +#define LCD_STR_FEEDRATE "\x06" +#define LCD_STR_CLOCK "\x07" +#define LCD_STR_ARROW_RIGHT "\x7E" //from the default character set extern void lcd_set_custom_characters(void); extern void lcd_set_custom_characters_nextpage(void); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 03426e769..d19072bee 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3246,7 +3246,7 @@ bool lcd_wait_for_pinda(float temp) { lcd_print(ftostr3(current_temperature_pinda)); lcd_print('/'); lcd_print(ftostr3(temp)); - lcd_print(LCD_STR_DEGREE); + lcd_print(LCD_STR_DEGREE[0]); delay_keep_alive(1000); serialecho_temperatures(); if (pinda_timeout.expired(8 * 60 * 1000ul)) { //PINDA cooling from 60 C to 35 C takes about 7 minutes @@ -3266,7 +3266,7 @@ void lcd_wait_for_heater() { lcd_print(ftostr3(degHotend(active_extruder))); lcd_print('/'); lcd_print(ftostr3(degTargetHotend(active_extruder))); - lcd_print(LCD_STR_DEGREE); + lcd_print(LCD_STR_DEGREE[0]); } void lcd_wait_for_cool_down() { @@ -3281,13 +3281,13 @@ void lcd_wait_for_cool_down() { lcd_print(LCD_STR_THERMOMETER[0]); lcd_print(ftostr3(degHotend(0))); lcd_print("/0"); - lcd_print(LCD_STR_DEGREE); + lcd_print(LCD_STR_DEGREE[0]); lcd_set_cursor(9, 4); lcd_print(LCD_STR_BEDTEMP[0]); lcd_print(ftostr3(degBed())); lcd_print("/0"); - lcd_print(LCD_STR_DEGREE); + lcd_print(LCD_STR_DEGREE[0]); delay_keep_alive(1000); serialecho_temperatures(); } @@ -3436,8 +3436,8 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg, // Display the "next screen" indicator character. lcd_set_custom_characters_nextpage(); lcd_set_cursor(19, 3); - // Display the down arrow. - lcd_print(char(1)); + // Display the double down arrow. + lcd_print(LCD_STR_ARROW_2_DOWN[0]); } nlines = row; @@ -3478,7 +3478,7 @@ void lcd_show_fullscreen_message_and_wait_P(const char *msg) if (!multi_screen) { lcd_set_cursor(19, 3); // Display the confirm char. - lcd_print(char(2)); + lcd_print(LCD_STR_CONFIRM[0]); } // Wait for 5 seconds before displaying the next text. for (uint8_t i = 0; i < 100; ++ i) { @@ -3504,7 +3504,7 @@ void lcd_show_fullscreen_message_and_wait_P(const char *msg) lcd_set_cursor(19, 3); // Display the confirm char. - lcd_print(char(2)); + lcd_print(LCD_STR_CONFIRM[0]); } } } From 158877e73616320814ede663f2e53b1e9ac438ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 1 Aug 2021 11:20:29 +0000 Subject: [PATCH 03/10] Remove one space from Support -> Temperatures menu Saves 2 bytes of flash memory --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d19072bee..74cc26fc6 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1703,7 +1703,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\x01 \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 From e62bc4686f452f3222860146d28b7769b06200fd 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 04/10] Replace hardcoded values and optimise strings This commit saves 64 bytes of flash memory on my end --- 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 8cd50f879..31cad6d82 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("%c%3d/%d%c"), LCD_STR_THERMOMETER[0],(int)(degHotend(active_extruder) + 0.5), (int)(degTargetHotend(active_extruder) + 0.5), LCD_STR_DEGREE[0]); + 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)); lcd_space(9 - chars); delay_keep_alive(1000); } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 74cc26fc6..d3b642f2b 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%c"), type, val_current, val_target, LCD_STR_DEGREE[0]); + int chars = lcd_printf_P(_N("%c%3d/%d" LCD_STR_DEGREE), type, val_current, val_target); 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("%c%3d%%"), LCD_STR_FEEDRATE[0], feedmultiply); + int chars = lcd_printf_P(_N(LCD_STR_FEEDRATE "%3d%%"), 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("%c%02u:%02u%c%c"), LCD_STR_CLOCK[0], print_t / 60, print_t % 60, suff, suff_doubt); + chars = lcd_printf_P(_N(LCD_STR_CLOCK "%02u:%02u%c%c"), print_t / 60, print_t % 60, suff, suff_doubt); else //time>=100h - chars = lcd_printf_P(_N("%c%3uh %c%c"), LCD_STR_CLOCK[0], print_t / 60, suff, suff_doubt); + chars = lcd_printf_P(_N(LCD_STR_CLOCK "%3uh %c%c"), print_t / 60, suff, suff_doubt); } else - chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]); + chars = lcd_puts_P(_N(LCD_STR_CLOCK "--:-- ")); lcd_space(8 - chars); } @@ -1703,7 +1703,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\x01\n"), tmp, value); // no need to add -14.14 to string alignment + lcd_printf_P(PSTR(" %s%3d" LCD_STR_DEGREE "\n"), tmp, value); // no need to add -14.14 to string alignment } //! @brief Show Temperatures @@ -2878,8 +2878,8 @@ static void lcd_menu_xyz_skew() lcd_printf_P(_N( "%-14.14S:\n" "%S\n" - "%-14.14S:%3.2f\x01\n" - "%-14.14S:%3.2f\x01" + "%-14.14S:%3.2f" LCD_STR_DEGREE "\n" + "%-14.14S:%3.2f" LCD_STR_DEGREE ), _i("Measured skew"), ////MSG_MEASURED_SKEW c=14 separator, @@ -2888,7 +2888,7 @@ static void lcd_menu_xyz_skew() ); if (angleDiff < 100){ lcd_set_cursor(15,0); - lcd_printf_P(_N("%3.2f\x01"), _deg(angleDiff)); + lcd_printf_P(_N("%3.2f" LCD_STR_DEGREE), _deg(angleDiff)); } else{ lcd_puts_at_P(15,0, _T(MSG_NA)); From 976c8c4902017a59994cb7005ea33e01ae5aff47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 5 Feb 2022 18:57:18 +0000 Subject: [PATCH 05/10] Change message from .c to .cpp The allows us to include lcd.h and replace hardcoded value with define LCD_STR_REFRESH Also deleted a #define for bool which does not seem to be used. --- Firmware/{messages.c => messages.cpp} | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) rename Firmware/{messages.c => messages.cpp} (99%) diff --git a/Firmware/messages.c b/Firmware/messages.cpp similarity index 99% rename from Firmware/messages.c rename to Firmware/messages.cpp index 486d78ccd..1546ae961 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.cpp @@ -1,10 +1,8 @@ //messages.c #include "language.h" +#include "lcd.h" // Needed for LCD_STR_REFRESH //this is because we need include Configuration_prusa.h (CUSTOM_MENDEL_NAME) -#define bool char -#define true 1 -#define false 0 #include "Configuration_prusa.h" //internationalized messages @@ -80,7 +78,7 @@ const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unl const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////c=20 r=4 const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////c=20 r=2 -const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\x04Refresh"); ////c=18 +const char MSG_REFRESH[] PROGMEM_I1 = ISTR(LCD_STR_REFRESH "Refresh"); ////c=18 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14 const char MSG_RESUME_PRINT[] PROGMEM_I1 = ISTR("Resume print"); ////c=18 From d5b666d2604b60a13e6d1338902016feee144db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 5 Feb 2022 19:53:42 +0000 Subject: [PATCH 06/10] Add LCD_STR_SOLID_BLOCK to represent \xFF --- Firmware/lcd.h | 1 + Firmware/menu.cpp | 2 +- Firmware/ultralcd.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 6b715896d..c2b88b7c4 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -200,6 +200,7 @@ private: #define LCD_STR_FEEDRATE "\x06" #define LCD_STR_CLOCK "\x07" #define LCD_STR_ARROW_RIGHT "\x7E" //from the default character set +#define LCD_STR_SOLID_BLOCK "\xFF" //from the default character set extern void lcd_set_custom_characters(void); extern void lcd_set_custom_characters_nextpage(void); diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 8eb504a8b..f00b362d0 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -570,7 +570,7 @@ void menu_progressbar_update(uint16_t newVal) newCnt = LCD_WIDTH; while (newCnt > progressbar_block_count) { - lcd_print('\xFF'); + lcd_print(LCD_STR_SOLID_BLOCK[0]); progressbar_block_count++; } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d3b642f2b..5901b2f1d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8646,7 +8646,7 @@ static void lcd_connect_printer() { i = 0; lcd_puts_at_P(0, 3, PSTR(" ")); } - if (i!=0) lcd_puts_at_P((i * 20) / (NC_BUTTON_LONG_PRESS * 10), 3, "\xFF"); + if (i!=0) lcd_puts_at_P((i * 20) / (NC_BUTTON_LONG_PRESS * 10), 3, LCD_STR_SOLID_BLOCK[0]); if (i == NC_BUTTON_LONG_PRESS * 10) { no_response = false; } From a22a7ea9d7c4bfaa30842d5d467de39d9a3c24e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 5 Feb 2022 19:58:31 +0000 Subject: [PATCH 07/10] Change LCD_STR_UPLEVEL to LCD_STR_UPLEVEL[0] for consistency Saves 4 bytes of flash and 2 bytes of SRAM (Arduino IDE 1.8.19) --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5901b2f1d..86be43de5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7269,7 +7269,7 @@ void lcd_belttest() Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); lcd_set_cursor(10,3),lcd_printf_P(PSTR("%u"),Y); lcd_set_cursor(19, 3); - lcd_print(LCD_STR_UPLEVEL); + lcd_print(LCD_STR_UPLEVEL[0]); lcd_wait_for_click_delay(10); } } From 670214a30b8459259219dfc132639ec44ef97b69 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 6 Feb 2022 11:01:35 +0100 Subject: [PATCH 08/10] Fix indentation --- Firmware/lcd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index c2b88b7c4..e67715a3c 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -200,7 +200,7 @@ private: #define LCD_STR_FEEDRATE "\x06" #define LCD_STR_CLOCK "\x07" #define LCD_STR_ARROW_RIGHT "\x7E" //from the default character set -#define LCD_STR_SOLID_BLOCK "\xFF" //from the default character set +#define LCD_STR_SOLID_BLOCK "\xFF" //from the default character set extern void lcd_set_custom_characters(void); extern void lcd_set_custom_characters_nextpage(void); 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 09/10] 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 31cad6d82..8cd50f879 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 5972befcd..8162e450d 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)); From 121324d20b742303fecd34a78f1d909fa2f4ada4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 1 Aug 2021 11:20:29 +0000 Subject: [PATCH 10/10] Revert "Remove one space from Support -> Temperatures menu" This reverts commit 158877e73616320814ede663f2e53b1e9ac438ba. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8162e450d..fbd572570 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -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\x01\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