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

Rename LCD menus according to variable types (#12892)

Browse Source
This commit is contained in:
Scott Lahteine
2019-01-12 16:01:04 -06:00
committed by GitHub
parent ed3ab5e212
commit eb78aed863
13 changed files with 109 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,7 +528,7 @@ FORCE_INLINE void _draw_heater_status(const int8_t heater, const char prefix, co
if (prefix >= 0) lcd_put_wchar(prefix);
lcd_put_u8str(itostr3(t1 + 0.5));
lcd_put_u8str(i16tostr3(t1 + 0.5));
lcd_put_wchar('/');
#if !HEATER_IDLE_HANDLER
@ -548,7 +548,7 @@ FORCE_INLINE void _draw_heater_status(const int8_t heater, const char prefix, co
}
else
#endif
lcd_put_u8str(itostr3left(t2 + 0.5));
lcd_put_u8str(i16tostr3left(t2 + 0.5));
if (prefix >= 0) {
lcd_put_wchar(LCD_STR_DEGREE[0]);
@ -578,7 +578,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
#endif
));
if (progress)
lcd_put_u8str(itostr3(progress));
lcd_put_u8str(ui8tostr3(progress));
else
lcd_put_u8str_P(PSTR("---"));
lcd_put_wchar('%');
@ -627,7 +627,7 @@ void MarlinUI::draw_status_message(const bool blink) {
lcd_put_u8str_P(PSTR("Dia "));
lcd_put_u8str(ftostr12ns(filament_width_meas));
lcd_put_u8str_P(PSTR(" V"));
lcd_put_u8str(itostr3(100.0 * (
lcd_put_u8str(i16tostr3(100.0 * (
parser.volumetric_enabled
? planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
: planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
@ -849,7 +849,7 @@ void MarlinUI::draw_status_screen() {
lcd_moveto(0, 2);
lcd_put_wchar(LCD_STR_FEEDRATE[0]);
lcd_put_u8str(itostr3(feedrate_percentage));
lcd_put_u8str(i16tostr3(feedrate_percentage));
lcd_put_wchar('%');
char buffer[14];
@ -883,7 +883,7 @@ void MarlinUI::draw_status_screen() {
per = planner.flow_percentage[0];
}
lcd_put_wchar(c);
lcd_put_u8str(itostr3(per));
lcd_put_u8str(i16tostr3(per));
lcd_put_wchar('%');
#endif
#endif
@ -924,7 +924,7 @@ void MarlinUI::draw_status_screen() {
lcd_moveto(LCD_WIDTH - 9, 1);
lcd_put_wchar(LCD_STR_FEEDRATE[0]);
lcd_put_u8str(itostr3(feedrate_percentage));
lcd_put_u8str(i16tostr3(feedrate_percentage));
lcd_put_wchar('%');
// ========== Line 3 ==========
@ -1378,9 +1378,9 @@ void MarlinUI::draw_status_screen() {
*/
lcd_moveto(_LCD_W_POS, 0);
lcd_put_wchar('(');
lcd_put_u8str(itostr3(x));
lcd_put_u8str(ui8tostr3(x));
lcd_put_wchar(',');
lcd_put_u8str(itostr3(inverted_y));
lcd_put_u8str(ui8tostr3(inverted_y));
lcd_put_wchar(')');
#if LCD_HEIGHT <= 3 // 16x2 or 20x2 display