asaril/marlin2_i2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove extraneous ui. prefixes

Browse source
This commit is contained in:
Scott Lahteine 2019-02-05 19:04:26 -06:00
parent 870757aa17
commit 2f8e89adc3
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
View file

@ -981,7 +981,7 @@ void MarlinUI::draw_status_screen() {
void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
if (row < LCD_HEIGHT) {
lcd_moveto(LCD_WIDTH - 9, row);
_draw_heater_status(extruder, LCD_STR_THERMOMETER[0], ui.get_blink());
_draw_heater_status(extruder, LCD_STR_THERMOMETER[0], get_blink());
}
}

2
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View file

@ -162,7 +162,7 @@ void MarlinUI::set_font(const MarlinFont font_nr) {
u8g.firstPage();
do {
u8g.drawBitmapP(offx, offy, (START_BMPWIDTH + 7) / 8, START_BMPHEIGHT, start_bmp);
ui.set_font(FONT_MENU);
set_font(FONT_MENU);
#ifndef STRING_SPLASH_LINE2
const uint8_t txt1X = width - (sizeof(STRING_SPLASH_LINE1) - 1) * (MENU_FONT_WIDTH);
u8g.drawStr(txt1X, (height + MENU_FONT_HEIGHT) / 2, STRING_SPLASH_LINE1);

2
Marlin/src/lcd/menu/menu.cpp
View file

@ -232,7 +232,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint32_t encoder/*=0*/) {
currentScreen = screen;
encoderPosition = encoder;
if (screen == status_screen) {
ui.defer_status_screen(false);
defer_status_screen(false);
#if ENABLED(AUTO_BED_LEVELING_UBL)
ubl.lcd_map_control = false;
#endif