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

10
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -52,7 +52,7 @@
#endif
FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, const uint8_t ty) {
const char *str = itostr3(temp);
const char *str = i16tostr3(temp);
const uint8_t len = str[0] != ' ' ? 3 : str[1] != ' ' ? 2 : 1;
lcd_moveto(tx - len * (INFO_FONT_WIDTH) / 2 + 1, ty);
lcd_put_u8str(&str[3-len]);
@ -249,7 +249,7 @@ void MarlinUI::draw_status_screen() {
strcpy(zstring, ftostr52sp(LOGICAL_Z_POSITION(current_position[Z_AXIS])));
#if ENABLED(FILAMENT_LCD_DISPLAY)
strcpy(wstring, ftostr12ns(filament_width_meas));
strcpy(mstring, itostr3(100.0 * (
strcpy(mstring, i16tostr3(100.0 * (
parser.volumetric_enabled
? planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
: planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
@ -338,7 +338,7 @@ void MarlinUI::draw_status_screen() {
}
#endif
lcd_moveto(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y);
lcd_put_u8str(itostr3(thermalManager.fanPercent(spd)));
lcd_put_u8str(i16tostr3(thermalManager.fanPercent(spd)));
lcd_put_wchar(c);
}
}
@ -393,7 +393,7 @@ void MarlinUI::draw_status_screen() {
if (PAGE_CONTAINS(41, 48)) {
// Percent complete
lcd_moveto(55, 48);
lcd_put_u8str(itostr3(progress));
lcd_put_u8str(ui8tostr3(progress));
lcd_put_wchar('%');
}
#endif
@ -484,7 +484,7 @@ void MarlinUI::draw_status_screen() {
set_font(FONT_STATUSMENU);
lcd_moveto(12, EXTRAS_2_BASELINE);
lcd_put_u8str(itostr3(feedrate_percentage));
lcd_put_u8str(i16tostr3(feedrate_percentage));
lcd_put_wchar('%');
//

4
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View File

@ -258,11 +258,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
lcd_put_wchar('E');
lcd_put_wchar((char)('1' + extruder));
lcd_put_wchar(' ');
lcd_put_u8str(itostr3(thermalManager.degHotend(extruder)));
lcd_put_u8str(i16tostr3(thermalManager.degHotend(extruder)));
lcd_put_wchar('/');
if (get_blink() || !thermalManager.is_heater_idle(extruder))
lcd_put_u8str(itostr3(thermalManager.degTargetHotend(extruder)));
lcd_put_u8str(i16tostr3(thermalManager.degTargetHotend(extruder)));
}
#endif // ADVANCED_PAUSE_FEATURE