3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Replace hardcoded values and optimise strings"

Browse Source 
This reverts commit e62bc4686f.
This commit is contained in:
Guðni Már Gilbert 2022-02-05 18:28:17 +00:00 committed by Alex Voinea
parent 670214a30b
commit ff00988303
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/mmu.cpp
View File

@ -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 //Print the hotend temperature (9 chars total) and fill rest of the line with space
lcd_set_cursor(0, 4); //line 4 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); lcd_space(9 - chars);
delay_keep_alive(1000); delay_keep_alive(1000);
} }

18
Firmware/ultralcd.cpp
View File

@ -409,7 +409,7 @@ static uint8_t menu_item_sdfile(const char* str_fn, char* str_fnl)
// Print temperature (nozzle/bed) (9 chars total) // Print temperature (nozzle/bed) (9 chars total)
void lcdui_print_temp(char type, int val_current, int val_target) 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); lcd_space(9 - chars);
} }
@ -448,7 +448,7 @@ void lcdui_print_planner_diag(void)
// Print feedrate (8 chars total) // Print feedrate (8 chars total)
void lcdui_print_feedrate(void) 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); lcd_space(8 - chars);
} }
@ -563,12 +563,12 @@ void lcdui_print_time(void)
} }
if (print_t < 6000) //time<100h 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 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 else
chars = lcd_puts_P(_N(LCD_STR_CLOCK "--:-- ")); chars = lcd_printf_P(_N("%c--:-- "), LCD_STR_CLOCK[0]);
lcd_space(8 - chars); 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; static const size_t maxChars = 15;
char tmp[maxChars]; char tmp[maxChars];
pgmtext_with_colon(ipgmLabel, 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 //! @brief Show Temperatures
@ -2879,8 +2879,8 @@ static void lcd_menu_xyz_skew()
lcd_printf_P(_N( lcd_printf_P(_N(
"%-14.14S:\n" "%-14.14S:\n"
"%S\n" "%S\n"
"%-14.14S:%3.2f" LCD_STR_DEGREE "\n" "%-14.14S:%3.2f\x01\n"
"%-14.14S:%3.2f" LCD_STR_DEGREE "%-14.14S:%3.2f\x01"
), ),
_i("Measured skew"), ////MSG_MEASURED_SKEW c=14 _i("Measured skew"), ////MSG_MEASURED_SKEW c=14
separator, separator,
@ -2889,7 +2889,7 @@ static void lcd_menu_xyz_skew()
); );
if (angleDiff < 100){ if (angleDiff < 100){
lcd_set_cursor(15,0); 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{ else{
lcd_puts_at_P(15,0, _T(MSG_NA)); lcd_puts_at_P(15,0, _T(MSG_NA));