Rename ultralcd => marlinui

4 years ago · 141f6825ce
93 changed files with 105 additions and 107 deletions
--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
@ -145,7 +145,7 @@ uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_va
 }
 #if ENABLED(LIGHTWEIGHT_UI)
-  #include "../../../lcd/ultralcd.h"
+  #include "../../../lcd/marlinui.h"
  #include "../../shared/HAL_ST7920.h"
  #define ST7920_CS_PIN LCD_PINS_RS
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@ -59,7 +59,7 @@
 #include "sd/cardreader.h"
-#include "lcd/ultralcd.h"
+#include "lcd/marlinui.h"
 #if HAS_TOUCH_XPT2046
  #include "lcd/touch/touch_buttons.h"
 #endif
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@ -36,7 +36,7 @@
 #endif
 #if ENABLED(LCD_BED_LEVELING)
-  #include "../../lcd/ultralcd.h"
+  #include "../../lcd/marlinui.h"
 #endif
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@ -30,7 +30,7 @@
  #include "../../../HAL/shared/eeprom_api.h"
  #include "../../../libs/hex_print.h"
  #include "../../../module/settings.h"
-  #include "../../../lcd/ultralcd.h"
+  #include "../../../lcd/marlinui.h"
  #include "../../../module/stepper.h"
  #include "../../../module/planner.h"
  #include "../../../module/motion.h"
--- a/Marlin/src/feature/cancel_object.cpp
+++ b/Marlin/src/feature/cancel_object.cpp
@ -25,7 +25,7 @@
 #include "cancel_object.h"
 #include "../gcode/gcode.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 CancelObject cancelable;
--- a/Marlin/src/feature/hotend_idle.cpp
+++ b/Marlin/src/feature/hotend_idle.cpp
@ -34,7 +34,7 @@
 #include "../module/temperature.h"
 #include "../module/motion.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 extern HotendIdleProtection hotend_idle;
--- a/Marlin/src/feature/mmu2/mmu2.cpp
+++ b/Marlin/src/feature/mmu2/mmu2.cpp
@ -30,7 +30,7 @@
 MMU2 mmu2;
 #include "../../gcode/gcode.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../libs/buzzer.h"
 #include "../../libs/nozzle.h"
 #include "../../module/temperature.h"
--- a/Marlin/src/feature/password/password.h
+++ b/Marlin/src/feature/password/password.h
@ -21,7 +21,7 @@
 */
 #pragma once
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 class Password {
 public:
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@ -55,7 +55,7 @@
  #include "../lcd/extui/ui_api.h"
 #endif
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #if HAS_BUZZER
  #include "../libs/buzzer.h"
--- a/Marlin/src/feature/power_monitor.cpp
+++ b/Marlin/src/feature/power_monitor.cpp
@ -26,7 +26,7 @@
 #include "power_monitor.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../lcd/lcdprint.h"
 #include "../libs/numtostr.h"
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@ -45,7 +45,7 @@ uint32_t PrintJobRecovery::cmd_sdpos, // = 0
 #endif
 #include "../sd/cardreader.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../gcode/queue.h"
 #include "../gcode/gcode.h"
 #include "../module/motion.h"
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@ -22,7 +22,7 @@
 #pragma once
 #include "../inc/MarlinConfig.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #if HAS_TRINAMIC_CONFIG
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@ -111,7 +111,7 @@
 #include "../../module/motion.h"
 #include "../../module/tool_change.h"
 #include "../../module/temperature.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #define EXTRUSION_MULTIPLIER 1.0
 #define PRIME_LENGTH 10.0
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@ -42,7 +42,7 @@
 #endif
 #if HAS_DISPLAY
-  #include "../../../lcd/ultralcd.h"
+  #include "../../../lcd/marlinui.h"
 #endif
 #if ENABLED(AUTO_BED_LEVELING_LINEAR)
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@ -34,7 +34,7 @@
 #include "../../queue.h"
 #include "../../../libs/buzzer.h"
-#include "../../../lcd/ultralcd.h"
+#include "../../../lcd/marlinui.h"
 #include "../../../module/motion.h"
 #include "../../../module/stepper.h"
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@ -45,7 +45,7 @@
  #include "../../feature/bltouch.h"
 #endif
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #if ENABLED(DWIN_CREALITY_LCD)
  #include "../../lcd/dwin/e3v2/dwin.h"
 #endif
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@ -29,7 +29,7 @@
 #include "../../module/motion.h"
 #include "../../module/stepper.h"
 #include "../../module/endstops.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #if HAS_BED_PROBE
  #include "../../module/probe.h"
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@ -30,7 +30,7 @@
  #include "../../feature/backlash.h"
 #endif
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../module/motion.h"
 #include "../../module/planner.h"
 #include "../../module/tool_change.h"
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
@ -37,7 +37,7 @@
 #include "../../module/probe.h"
 #include "../../feature/probe_temp_comp.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../MarlinCore.h" // for wait_for_heatup and idle()
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@ -27,7 +27,7 @@
 #include "../gcode.h"
 #include "../../module/motion.h"
 #include "../../module/probe.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../feature/bedlevel/bedlevel.h"
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@ -47,7 +47,7 @@
 #endif
 #if HAS_RESUME_CONTINUE
-  #include "../../lcd/ultralcd.h"
+  #include "../../lcd/marlinui.h"
 #endif
 #ifndef GET_PIN_MAP_PIN_M43
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@ -22,7 +22,7 @@
 #include "../gcode.h"
 #include "../../MarlinCore.h" // for stepper_inactive_time, disable_e_steppers
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../module/stepper.h"
 #if ENABLED(AUTO_BED_LEVELING_UBL)
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@ -25,7 +25,7 @@
 #include "../../module/temperature.h"
 #include "../../module/planner.h"       // for planner.finish_and_disable
 #include "../../module/printcounter.h"  // for print_job_timer.stop
-#include "../../lcd/ultralcd.h"         // for LCD_MESSAGEPGM_P
+#include "../../lcd/marlinui.h"         // for LCD_MESSAGEPGM_P
 #include "../../inc/MarlinConfig.h"
--- a/Marlin/src/gcode/control/M999.cpp
+++ b/Marlin/src/gcode/control/M999.cpp
@ -22,7 +22,7 @@
 #include "../gcode.h"
-#include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
+#include "../../lcd/marlinui.h" // for lcd_reset_alert_level
 #include "../../MarlinCore.h"   // for marlin_state
 #include "../queue.h"           // for flush_and_request_resend
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@ -32,7 +32,7 @@
 #include "../../../module/printcounter.h"
 #if HAS_LCD_MENU
-  #include "../../../lcd/ultralcd.h"
+  #include "../../../lcd/marlinui.h"
 #endif
 #if ENABLED(POWER_LOSS_RECOVERY)
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@ -34,7 +34,7 @@
 #endif
 #if HAS_LCD_MENU
-  #include "../../../lcd/ultralcd.h"
+  #include "../../../lcd/marlinui.h"
 #endif
 #if ENABLED(MMU2_MENUS)
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@ -35,7 +35,7 @@
 #endif
 #if HAS_LCD_MENU
-  #include "../../../lcd/ultralcd.h"
+  #include "../../../lcd/marlinui.h"
 #endif
 #if ENABLED(PRUSA_MMU2)
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@ -27,7 +27,7 @@
 #include "../../gcode.h"
 #include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
-#include "../../../lcd/ultralcd.h"
+#include "../../../lcd/marlinui.h"
 #if ENABLED(EXTENSIBLE_UI)
  #include "../../../lcd/extui/ui_api.h"
 #endif
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@ -27,7 +27,7 @@
 #include "../../gcode.h"
 #include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
-#include "../../../lcd/ultralcd.h"
+#include "../../../lcd/marlinui.h"
 /**
 * M413: Enable / Disable power-loss recovery
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@ -26,7 +26,7 @@
 #include "../gcode.h"
 #include "../../module/motion.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../libs/buzzer.h"
 /**
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@ -32,7 +32,7 @@
 #include "../../MarlinCore.h"     // for wait_for_user_response()
 #if HAS_LCD_MENU
-  #include "../../lcd/ultralcd.h"
+  #include "../../lcd/marlinui.h"
 #elif ENABLED(EXTENSIBLE_UI)
  #include "../../lcd/extui/ui_api.h"
 #endif
--- a/Marlin/src/gcode/lcd/M117.cpp
+++ b/Marlin/src/gcode/lcd/M117.cpp
@ -21,7 +21,7 @@
 */
 #include "../gcode.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 /**
 * M117: Set LCD Status Message
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@ -25,7 +25,7 @@
 #if PREHEAT_COUNT
 #include "../gcode.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 /**
 * M145: Set the heatup state for a material in the LCD menu
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@ -25,7 +25,7 @@
 #if HAS_LCD_CONTRAST
 #include "../gcode.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 /**
 * M250: Read and optionally set the LCD contrast
--- a/Marlin/src/gcode/lcd/M300.cpp
+++ b/Marlin/src/gcode/lcd/M300.cpp
@ -26,7 +26,7 @@
 #include "../gcode.h"
-#include "../../lcd/ultralcd.h" // i2c-based BUZZ
+#include "../../lcd/marlinui.h" // i2c-based BUZZ
 #include "../../libs/buzzer.h"  // Buzzer, if possible
 /**
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@ -25,7 +25,7 @@
 #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
 #include "../gcode.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../sd/cardreader.h"
 /**
--- a/Marlin/src/gcode/motion/G4.cpp
+++ b/Marlin/src/gcode/motion/G4.cpp
@ -22,7 +22,7 @@
 #include "../gcode.h"
 #include "../../module/stepper.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 /**
 * G4: Dwell S<seconds> or P<milliseconds>
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@ -29,7 +29,7 @@ GCodeQueue queue;
 #include "gcode.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../sd/cardreader.h"
 #include "../module/planner.h"
 #include "../module/temperature.h"
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@ -32,7 +32,7 @@
 #endif
 #if EITHER(LCD_SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE)
-  #include "../../lcd/ultralcd.h"
+  #include "../../lcd/marlinui.h"
 #endif
 #if ENABLED(POWER_LOSS_RECOVERY)
--- a/Marlin/src/gcode/sd/M23.cpp
+++ b/Marlin/src/gcode/sd/M23.cpp
@ -26,7 +26,7 @@
 #include "../gcode.h"
 #include "../../sd/cardreader.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 /**
 * M23: Open a file
--- a/Marlin/src/gcode/sd/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@ -27,7 +27,7 @@
 #include "../gcode.h"
 #include "../../sd/cardreader.h"
 #include "../../module/printcounter.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #if ENABLED(PARK_HEAD_ON_PAUSE)
  #include "../../feature/pause.h"
--- a/Marlin/src/gcode/stats/M31.cpp
+++ b/Marlin/src/gcode/stats/M31.cpp
@ -24,7 +24,7 @@
 #include "../../core/serial.h"
 #include "../../module/printcounter.h"
 #include "../../libs/duration_t.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 /**
 * M31: Get the time since the start of SD Print (or last M109)
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@ -22,7 +22,7 @@
 #include "../gcode.h"
 #include "../../module/printcounter.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../MarlinCore.h" // for startOrResumeJob
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@ -34,7 +34,7 @@
 #include "../../module/temperature.h"
 #include "../../module/motion.h"
 #include "../../module/planner.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../MarlinCore.h" // for startOrResumeJob, etc.
--- a/Marlin/src/gcode/temp/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@ -29,7 +29,7 @@
 #include "../../module/temperature.h"
 #if PREHEAT_COUNT
-  #include "../../lcd/ultralcd.h"
+  #include "../../lcd/marlinui.h"
 #endif
 #if ENABLED(SINGLENOZZLE)
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@ -33,7 +33,7 @@
 #include "../gcode.h"
 #include "../../module/temperature.h"
 #include "../../module/motion.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
  #include "../../module/printcounter.h"
--- a/Marlin/src/gcode/temp/M141_M191.cpp
+++ b/Marlin/src/gcode/temp/M141_M191.cpp
@ -34,7 +34,7 @@
 #include "../../module/temperature.h"
 #include "../../module/motion.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
  #include "../../module/printcounter.h"
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@ -25,7 +25,7 @@
 #if HAS_PID_HEATING
 #include "../gcode.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 #include "../../module/temperature.h"
 #if ENABLED(EXTENSIBLE_UI)
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@ -16,10 +16,10 @@
 #if HAS_MARLINUI_HD44780
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../MarlinCore.h"
-#include "ultralcd_HD44780.h"
+#include "marlinui_HD44780.h"
 #include <string.h>
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@ -25,14 +25,14 @@
 #if HAS_MARLINUI_HD44780
 /**
- * ultralcd_HD44780.cpp
+ * marlinui_HD44780.cpp
 *
 * LCD display implementations for Hitachi HD44780.
 * These are the most common LCD character displays.
 */
-#include "ultralcd_HD44780.h"
+#include "marlinui_HD44780.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../libs/numtostr.h"
 #include "../../sd/cardreader.h"
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.h
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.h
--- a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
@ -37,11 +37,11 @@
 #if IS_TFTGLCD_PANEL
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../MarlinCore.h"
 #include "../../libs/numtostr.h"
-#include "ultralcd_TFTGLCD.h"
+#include "marlinui_TFTGLCD.h"
 #include <string.h>
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@ -25,7 +25,7 @@
 #if IS_TFTGLCD_PANEL
 /**
- * ultralcd_TFTGLCD.cpp
+ * marlinui_TFTGLCD.cpp
 *
 * Implementation of the LCD display routines for a TFT GLCD displays with external controller.
 * This display looks like a REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER but has good text font
@ -42,8 +42,8 @@
  #include <Wire.h>
 #endif
-#include "ultralcd_TFTGLCD.h"
+#include "marlinui_TFTGLCD.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../libs/numtostr.h"
 #include "../../sd/cardreader.h"
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.h
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.h
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@ -29,7 +29,7 @@
 */
 #include "../../inc/MarlinConfig.h"
-#include "ultralcd_DOGM.h"
+#include "marlinui_DOGM.h"
 #define BW(N) ((N + 7) / 8)
--- a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
+++ b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
@ -11,9 +11,9 @@
 #if HAS_MARLINUI_U8GLIB
-#include "ultralcd_DOGM.h"
+#include "marlinui_DOGM.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../MarlinCore.h"
 #include "../fontutils.h"
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@ -21,7 +21,7 @@
 */
 /**
- * lcd/dogm/ultralcd_DOGM.h
+ * lcd/dogm/marlinui_DOGM.h
 *
 * Implementation of the LCD display routines for a DOGM128 graphic display.
 * by STB for ErikZalm/Marlin. Common LCD 128x64 pixel graphic displays.
@ -39,7 +39,7 @@
 #if HAS_MARLINUI_U8GLIB
-#include "ultralcd_DOGM.h"
+#include "marlinui_DOGM.h"
 #include "u8g_fontutf8.h"
 #if ENABLED(SHOW_BOOTSCREEN)
@ -49,7 +49,7 @@
 #include "../lcdprint.h"
 #include "../fontutils.h"
 #include "../../libs/numtostr.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../sd/cardreader.h"
 #include "../../module/temperature.h"
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.h
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.h
@ -22,7 +22,7 @@
 #pragma once
 /**
- * lcd/dogm/ultralcd_DOGM.h
+ * lcd/dogm/marlinui_DOGM.h
 */
 #include "../../inc/MarlinConfigPre.h"
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@ -30,8 +30,8 @@
 #if HAS_MARLINUI_U8GLIB && DISABLED(LIGHTWEIGHT_UI)
 #include "dogm_Statusscreen.h"
-#include "ultralcd_DOGM.h"
+#include "marlinui_DOGM.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../lcdprint.h"
 #include "../../libs/numtostr.h"
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@ -46,7 +46,7 @@
 #include "status_screen_lite_ST7920.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../fontutils.h"
 #include "../lcdprint.h"
 #include "../../libs/duration_t.h"
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
@ -58,7 +58,7 @@
 #if HAS_MARLINUI_U8GLIB && (PIN_EXISTS(FSMC_CS) || HAS_SPI_GRAPHICAL_TFT)
 #include "HAL_LCD_com_defines.h"
-#include "ultralcd_DOGM.h"
+#include "marlinui_DOGM.h"
 #include <string.h>
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@ -47,7 +47,7 @@
 #include <string.h>
 #include "../../fontutils.h"
-#include "../../ultralcd.h"
+#include "../../marlinui.h"
 #include "../../../sd/cardreader.h"
--- a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
@ -35,7 +35,7 @@
 #include "../../../../../module/planner.h"
 #include "../../../ui_api.h"
-#include "../../../../ultralcd.h"
+#include "../../../../marlinui.h"
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
  uint16_t distanceToMove = 10;
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
@ -35,7 +35,7 @@
 #include "../../../../../module/planner.h"
 #include "../../../ui_api.h"
-#include "../../../../ultralcd.h"
+#include "../../../../marlinui.h"
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
  uint16_t distanceToMove = 10;
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
@ -34,7 +34,7 @@
 #include "../../../../../module/motion.h"
 #include "../../../../../module/planner.h"
-#include "../../../../ultralcd.h"
+#include "../../../../marlinui.h"
 #include "../../../ui_api.h"
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
@ -41,7 +41,7 @@
  #include "../../../../feature/powerloss.h"
 #endif
 #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
-  #include "../../../ultralcd.h"
+  #include "../../../marlinui.h"
 #endif
 extern lv_group_t * g;
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
@ -44,7 +44,7 @@
 #include "../../../../inc/MarlinConfig.h"
 #include HAL_PATH(../../HAL, tft/xpt2046.h)
-#include "../../../ultralcd.h"
+#include "../../../marlinui.h"
 XPT2046 touch;
 #if ENABLED(POWER_LOSS_RECOVERY)
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp
@ -33,7 +33,7 @@
 #include "../../../../module/temperature.h"
 #include "../../../../gcode/queue.h"
 #include "../../../../gcode/gcode.h"
-#include "../../../../lcd/ultralcd.h"
+#include "../../../../lcd/marlinui.h"
 #include "../../../../sd/cardreader.h"
 #include "../../../../module/planner.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
--- a/Marlin/src/lcd/extui/malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui/malyan_lcd.cpp
@ -49,7 +49,7 @@
 #include "ui_api.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../sd/cardreader.h"
 #include "../../module/temperature.h"
 #include "../../module/stepper.h"
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@ -45,7 +45,7 @@
 #if ENABLED(EXTENSIBLE_UI)
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../gcode/queue.h"
 #include "../../module/motion.h"
 #include "../../module/planner.h"
@ -1053,11 +1053,9 @@ namespace ExtUI {
 } // namespace ExtUI
-// At the moment, we piggy-back off the ultralcd calls, but this could be cleaned up in the future
+// At the moment we hook into MarlinUI methods, but this could be cleaned up in the future
-void MarlinUI::init() {
+void MarlinUI::init() { ExtUI::onStartup(); }
  ExtUI::onStartup();
 }
 void MarlinUI::update() { ExtUI::onIdle(); }
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@ -10,7 +10,7 @@
 #include "../inc/MarlinConfig.h"
 #if HAS_WIRED_LCD
-  #include "ultralcd.h"
+  #include "marlinui.h"
  #include "../MarlinCore.h"
 #endif
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@ -31,7 +31,7 @@
 #endif
 // All displays share the MarlinUI class
-#include "ultralcd.h"
+#include "marlinui.h"
 MarlinUI ui;
 #if HAS_DISPLAY
@ -117,7 +117,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 #if HAS_WIRED_LCD
 #if HAS_MARLINUI_U8GLIB
-  #include "dogm/ultralcd_DOGM.h"
+  #include "dogm/marlinui_DOGM.h"
 #endif
 #include "lcdprint.h"
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
--- a/Marlin/src/lcd/menu/game/game.h
+++ b/Marlin/src/lcd/menu/game/game.h
@ -22,9 +22,9 @@
 #pragma once
 #include "../../../inc/MarlinConfigPre.h"
-#include "../../dogm/ultralcd_DOGM.h"
+#include "../../dogm/marlinui_DOGM.h"
 #include "../../lcdprint.h"
-#include "../../ultralcd.h"
+#include "../../marlinui.h"
 //#define MUTE_GAMES
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@ -21,7 +21,7 @@
 */
 #pragma once
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../libs/numtostr.h"
 #include "../../inc/MarlinConfig.h"
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@ -22,7 +22,7 @@
 #pragma once
 #include "menu.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../../gcode/queue.h" // for inject_P
 #include "../../inc/MarlinConfigPre.h"
--- a/Marlin/src/lcd/menu/menu_touch_screen.cpp
+++ b/Marlin/src/lcd/menu/menu_touch_screen.cpp
@ -25,7 +25,7 @@
 #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
 #include "menu_item.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 void touch_screen_calibration() {
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@ -47,7 +47,7 @@
  #include "../../feature/babystep.h"
  #include "../lcdprint.h"
  #if HAS_MARLINUI_U8GLIB
-    #include "../dogm/ultralcd_DOGM.h"
+    #include "../dogm/marlinui_DOGM.h"
  #endif
  void _lcd_babystep(const AxisEnum axis, PGM_P const msg) {
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@ -23,7 +23,7 @@
 #include "touch.h"
-#include "../ultralcd.h"  // for ui methods
+#include "../marlinui.h"  // for ui methods
 #include "../menu/menu_item.h" // for touch_screen_calibration
 #include "../../module/temperature.h"
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@ -26,7 +26,7 @@
 #include "ui_320x240.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../menu/menu.h"
 #include "../../libs/numtostr.h"
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@ -26,7 +26,7 @@
 #include "ui_480x320.h"
-#include "../ultralcd.h"
+#include "../marlinui.h"
 #include "../menu/menu.h"
 #include "../../libs/numtostr.h"
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@ -27,7 +27,7 @@
 #include HAL_PATH(../../HAL, tft/xpt2046.h)
 XPT2046 touchIO;
-#include "../../lcd/ultralcd.h" // For EN_C bit mask
+#include "../../lcd/marlinui.h" // For EN_C bit mask
 /**
 * Draw and Touch processing
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@ -34,7 +34,7 @@
 // For homing:
 #include "planner.h"
 #include "endstops.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../MarlinCore.h"
 #if HAS_BED_PROBE
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@ -30,7 +30,7 @@
 #include "../MarlinCore.h"
 #include "../sd/cardreader.h"
 #include "temperature.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
  #include HAL_PATH(../HAL, endstop_interrupts.h)
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@ -36,7 +36,7 @@
 #if IS_SCARA
  #include "../libs/buzzer.h"
-  #include "../lcd/ultralcd.h"
+  #include "../lcd/marlinui.h"
 #endif
 #if HAS_BED_PROBE
@ -52,7 +52,7 @@
 #endif
 #if HAS_DISPLAY
-  #include "../lcd/ultralcd.h"
+  #include "../lcd/marlinui.h"
 #endif
 #if HAS_FILAMENT_SENSOR
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@ -66,7 +66,7 @@
 #include "stepper.h"
 #include "motion.h"
 #include "temperature.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../gcode/parser.h"
 #include "../MarlinCore.h"
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@ -36,7 +36,7 @@
 #include "endstops.h"
 #include "../gcode/gcode.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../MarlinCore.h" // for stop(), disable_e_steppers
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@ -54,7 +54,7 @@
  #include "../lcd/dwin/e3v2/dwin.h"
 #endif
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../libs/vector_3.h"   // for matrix_3x3
 #include "../gcode/gcode.h"
 #include "../MarlinCore.h"
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@ -92,7 +92,7 @@ Stepper stepper; // Singleton
 #include "motion.h"
 #include "temperature.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #include "../gcode/queue.h"
 #include "../sd/cardreader.h"
 #include "../MarlinCore.h"
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@ -34,7 +34,7 @@
 #include "planner.h"
 #include "../HAL/shared/Delay.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #if ENABLED(DWIN_CREALITY_LCD)
  #include "../lcd/dwin/e3v2/dwin.h"
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@ -94,7 +94,7 @@
 #endif
 #if HAS_LCD_MENU
-  #include "../lcd/ultralcd.h"
+  #include "../lcd/marlinui.h"
 #endif
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@ -29,7 +29,7 @@
 #include "cardreader.h"
 #include "../MarlinCore.h"
-#include "../lcd/ultralcd.h"
+#include "../lcd/marlinui.h"
 #if ENABLED(DWIN_CREALITY_LCD)
  #include "../lcd/dwin/e3v2/dwin.h"
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@ -94,7 +94,7 @@ static_assert(USB_INTR_PIN != -1, "USB_INTR_PIN must be defined");
 #include "Sd2Card_FlashDrive.h"
-#include "../../lcd/ultralcd.h"
+#include "../../lcd/marlinui.h"
 static enum {
  UNINITIALIZED,