bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Additional numtostr functions

Browse Source
This commit is contained in:
Scott Lahteine
2020-03-08 19:42:18 -05:00
parent 0f39386d9b
commit 13118dbd8d
7 changed files with 105 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
View File

@ -530,7 +530,7 @@ FORCE_INLINE void _draw_heater_status(const heater_ind_t heater, const char pref
if (prefix >= 0) lcd_put_wchar(prefix);
lcd_put_u8str(i16tostr3(t1 + 0.5));
lcd_put_u8str(i16tostr3rj(t1 + 0.5));
lcd_put_wchar('/');
#if !HEATER_IDLE_HANDLER
@ -582,7 +582,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
#endif
));
if (progress)
lcd_put_u8str(ui8tostr3(progress));
lcd_put_u8str(ui8tostr3rj(progress));
else
lcd_put_u8str_P(PSTR("---"));
lcd_put_wchar('%');
@ -631,7 +631,7 @@ void MarlinUI::draw_status_message(const bool blink) {
lcd_put_u8str_P(PSTR("Dia "));
lcd_put_u8str(ftostr12ns(filwidth.measured_mm));
lcd_put_u8str_P(PSTR(" V"));
lcd_put_u8str(i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
lcd_put_u8str(i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
lcd_put_wchar('%');
return;
}
@ -863,7 +863,7 @@ void MarlinUI::draw_status_screen() {
#if LCD_HEIGHT > 3
lcd_put_wchar(0, 2, LCD_STR_FEEDRATE[0]);
lcd_put_u8str(i16tostr3(feedrate_percentage));
lcd_put_u8str(i16tostr3rj(feedrate_percentage));
lcd_put_wchar('%');
char buffer[14];
@ -902,7 +902,7 @@ void MarlinUI::draw_status_screen() {
#endif
}
lcd_put_wchar(c);
lcd_put_u8str(i16tostr3(per));
lcd_put_u8str(i16tostr3rj(per));
lcd_put_wchar('%');
#endif
#endif
@ -941,7 +941,7 @@ void MarlinUI::draw_status_screen() {
#endif
lcd_put_wchar(LCD_WIDTH - 9, 1, LCD_STR_FEEDRATE[0]);
lcd_put_u8str(i16tostr3(feedrate_percentage));
lcd_put_u8str(i16tostr3rj(feedrate_percentage));
lcd_put_wchar('%');
// ========== Line 3 ==========
@ -1415,9 +1415,9 @@ void MarlinUI::draw_status_screen() {
* Print plot position
*/
lcd_put_wchar(_LCD_W_POS, 0, '(');
lcd_put_u8str(ui8tostr3(x_plot));
lcd_put_u8str(ui8tostr3rj(x_plot));
lcd_put_wchar(',');
lcd_put_u8str(ui8tostr3(y_plot));
lcd_put_u8str(ui8tostr3rj(y_plot));
lcd_put_wchar(')');
#if LCD_HEIGHT <= 3 // 16x2 or 20x2 display