Преглед изворни кода

Remove extraneous ui. prefixes

Scott Lahteine пре 6 година
родитељ
комит
2f8e89adc3

+ 1
- 1
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp Прегледај датотеку

981
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
981
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
982
       if (row < LCD_HEIGHT) {
982
       if (row < LCD_HEIGHT) {
983
         lcd_moveto(LCD_WIDTH - 9, row);
983
         lcd_moveto(LCD_WIDTH - 9, row);
984
-        _draw_heater_status(extruder, LCD_STR_THERMOMETER[0], ui.get_blink());
984
+        _draw_heater_status(extruder, LCD_STR_THERMOMETER[0], get_blink());
985
       }
985
       }
986
     }
986
     }
987
 
987
 

+ 1
- 1
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp Прегледај датотеку

162
     u8g.firstPage();
162
     u8g.firstPage();
163
     do {
163
     do {
164
       u8g.drawBitmapP(offx, offy, (START_BMPWIDTH + 7) / 8, START_BMPHEIGHT, start_bmp);
164
       u8g.drawBitmapP(offx, offy, (START_BMPWIDTH + 7) / 8, START_BMPHEIGHT, start_bmp);
165
-      ui.set_font(FONT_MENU);
165
+      set_font(FONT_MENU);
166
       #ifndef STRING_SPLASH_LINE2
166
       #ifndef STRING_SPLASH_LINE2
167
         const uint8_t txt1X = width - (sizeof(STRING_SPLASH_LINE1) - 1) * (MENU_FONT_WIDTH);
167
         const uint8_t txt1X = width - (sizeof(STRING_SPLASH_LINE1) - 1) * (MENU_FONT_WIDTH);
168
         u8g.drawStr(txt1X, (height + MENU_FONT_HEIGHT) / 2, STRING_SPLASH_LINE1);
168
         u8g.drawStr(txt1X, (height + MENU_FONT_HEIGHT) / 2, STRING_SPLASH_LINE1);

+ 1
- 1
Marlin/src/lcd/menu/menu.cpp Прегледај датотеку

232
     currentScreen = screen;
232
     currentScreen = screen;
233
     encoderPosition = encoder;
233
     encoderPosition = encoder;
234
     if (screen == status_screen) {
234
     if (screen == status_screen) {
235
-      ui.defer_status_screen(false);
235
+      defer_status_screen(false);
236
       #if ENABLED(AUTO_BED_LEVELING_UBL)
236
       #if ENABLED(AUTO_BED_LEVELING_UBL)
237
         ubl.lcd_map_control = false;
237
         ubl.lcd_map_control = false;
238
       #endif
238
       #endif

Loading…
Откажи
Сачувај