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

Rename ultralcd => marlinui

Browse Source
This commit is contained in:
Scott Lahteine
2020-10-16 19:36:25 -05:00
parent 0f6fc48f85
commit eaf6777a66
93 changed files with 105 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
View File

@@ -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

2
Marlin/src/MarlinCore.cpp
View File

@@ -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

2
Marlin/src/feature/bedlevel/bedlevel.cpp
View File

@@ -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)

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@@ -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"

2
Marlin/src/feature/cancel_object.cpp
View File

@@ -25,7 +25,7 @@
#include "cancel_object.h"
#include "../gcode/gcode.h"
#include "../lcd/ultralcd.h"
#include "../lcd/marlinui.h"
CancelObject cancelable;

2
Marlin/src/feature/hotend_idle.cpp
View File

@@ -34,7 +34,7 @@
#include "../module/temperature.h"
#include "../module/motion.h"
#include "../lcd/ultralcd.h"
#include "../lcd/marlinui.h"
extern HotendIdleProtection hotend_idle;

2
Marlin/src/feature/mmu2/mmu2.cpp
View File

@@ -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"

2
Marlin/src/feature/password/password.h
View File

@@ -21,7 +21,7 @@
*/
#pragma once
#include "../../lcd/ultralcd.h"
#include "../../lcd/marlinui.h"
class Password {
public:

2
Marlin/src/feature/pause.cpp
View File

@@ -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"

2
Marlin/src/feature/power_monitor.cpp
View File

@@ -26,7 +26,7 @@
#include "power_monitor.h"
#include "../lcd/ultralcd.h"
#include "../lcd/marlinui.h"
#include "../lcd/lcdprint.h"
#include "../libs/numtostr.h"

2
Marlin/src/feature/powerloss.cpp
View File

@@ -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"

2
Marlin/src/feature/tmc_util.h
View File

@@ -22,7 +22,7 @@
#pragma once
#include "../inc/MarlinConfig.h"
#include "../lcd/ultralcd.h"
#include "../lcd/marlinui.h"
#if HAS_TRINAMIC_CONFIG

2
Marlin/src/gcode/bedlevel/G26.cpp
View File

@@ -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

2
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@@ -42,7 +42,7 @@
#endif
#if HAS_DISPLAY
#include "../../../lcd/ultralcd.h"
#include "../../../lcd/marlinui.h"
#endif
#if ENABLED(AUTO_BED_LEVELING_LINEAR)

2
Marlin/src/gcode/bedlevel/mbl/G29.cpp
View File

@@ -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"

2
Marlin/src/gcode/calibrate/G28.cpp
View File

@@ -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

2
Marlin/src/gcode/calibrate/G33.cpp
View File

@@ -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"

2
Marlin/src/gcode/calibrate/G425.cpp
View File

@@ -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"

2
Marlin/src/gcode/calibrate/G76_M192_M871.cpp
View File

@@ -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)

2
Marlin/src/gcode/calibrate/M48.cpp
View File

@@ -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"

2
Marlin/src/gcode/config/M43.cpp
View File

@@ -47,7 +47,7 @@
#endif
#if HAS_RESUME_CONTINUE
#include "../../lcd/ultralcd.h"
#include "../../lcd/marlinui.h"
#endif
#ifndef GET_PIN_MAP_PIN_M43

2
Marlin/src/gcode/control/M17_M18_M84.cpp
View File

@@ -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)

2
Marlin/src/gcode/control/M80_M81.cpp
View File

@@ -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"

2
Marlin/src/gcode/control/M999.cpp
View File

@@ -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

2
Marlin/src/gcode/feature/pause/M125.cpp
View File

@@ -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)

2
Marlin/src/gcode/feature/pause/M600.cpp
View File

@@ -34,7 +34,7 @@
#endif
#if HAS_LCD_MENU
#include "../../../lcd/ultralcd.h"
#include "../../../lcd/marlinui.h"
#endif
#if ENABLED(MMU2_MENUS)

2
Marlin/src/gcode/feature/pause/M701_M702.cpp
View File

@@ -35,7 +35,7 @@
#endif
#if HAS_LCD_MENU
#include "../../../lcd/ultralcd.h"
#include "../../../lcd/marlinui.h"
#endif
#if ENABLED(PRUSA_MMU2)

2
Marlin/src/gcode/feature/powerloss/M1000.cpp
View File

@@ -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

2
Marlin/src/gcode/feature/powerloss/M413.cpp
View File

@@ -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

2
Marlin/src/gcode/geometry/M206_M428.cpp
View File

@@ -26,7 +26,7 @@
#include "../gcode.h"
#include "../../module/motion.h"
#include "../../lcd/ultralcd.h"
#include "../../lcd/marlinui.h"
#include "../../libs/buzzer.h"
/**

2
Marlin/src/gcode/lcd/M0_M1.cpp
View File

@@ -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

2
Marlin/src/gcode/lcd/M117.cpp
View File

@@ -21,7 +21,7 @@
*/
#include "../gcode.h"
#include "../../lcd/ultralcd.h"
#include "../../lcd/marlinui.h"
/**
* M117: Set LCD Status Message

2
Marlin/src/gcode/lcd/M145.cpp
View File

@@ -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

2
Marlin/src/gcode/lcd/M250.cpp
View File

@@ -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

2
Marlin/src/gcode/lcd/M300.cpp
View File

@@ -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
/**

2
Marlin/src/gcode/lcd/M73.cpp
View File

@@ -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"
/**

2
Marlin/src/gcode/motion/G4.cpp
View File

@@ -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>

2
Marlin/src/gcode/queue.cpp
View File

@@ -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"

2
Marlin/src/gcode/sd/M1001.cpp
View File

@@ -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)

2
Marlin/src/gcode/sd/M23.cpp
View File

@@ -26,7 +26,7 @@
#include "../gcode.h"
#include "../../sd/cardreader.h"
#include "../../lcd/ultralcd.h"
#include "../../lcd/marlinui.h"
/**
* M23: Open a file

2
Marlin/src/gcode/sd/M24_M25.cpp
View File

@@ -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"

2
Marlin/src/gcode/stats/M31.cpp
View File

@@ -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)

2
Marlin/src/gcode/stats/M75-M78.cpp
View File

@@ -22,7 +22,7 @@
#include "../gcode.h"
#include "../../module/printcounter.h"
#include "../../lcd/ultralcd.h"
#include "../../lcd/marlinui.h"
#include "../../MarlinCore.h" // for startOrResumeJob

2
Marlin/src/gcode/temp/M104_M109.cpp
View File

@@ -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.

2
Marlin/src/gcode/temp/M106_M107.cpp
View File

@@ -29,7 +29,7 @@
#include "../../module/temperature.h"
#if PREHEAT_COUNT
#include "../../lcd/ultralcd.h"
#include "../../lcd/marlinui.h"
#endif
#if ENABLED(SINGLENOZZLE)

2
Marlin/src/gcode/temp/M140_M190.cpp
View File

@@ -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"

2
Marlin/src/gcode/temp/M141_M191.cpp
View File

@@ -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"

2
Marlin/src/gcode/temp/M303.cpp
View File

@@ -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)

4
Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
View File

@@ -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>

6
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp → Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View File

@@ -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 "../ultralcd.h"
#include "marlinui_HD44780.h"
#include "../marlinui.h"
#include "../../libs/numtostr.h"
#include "../../sd/cardreader.h"

0
Marlin/src/lcd/HD44780/ultralcd_HD44780.h → Marlin/src/lcd/HD44780/marlinui_HD44780.h
View File

4
Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
View File

@@ -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>

6
Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.cpp → Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View File

@@ -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 "../ultralcd.h"
#include "marlinui_TFTGLCD.h"
#include "../marlinui.h"
#include "../../libs/numtostr.h"
#include "../../sd/cardreader.h"

0
Marlin/src/lcd/TFTGLCD/ultralcd_TFTGLCD.h → Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.h
View File

2
Marlin/src/lcd/dogm/dogm_Statusscreen.h
View File

@@ -29,7 +29,7 @@
*/
#include "../../inc/MarlinConfig.h"
#include "ultralcd_DOGM.h"
#include "marlinui_DOGM.h"
#define BW(N) ((N + 7) / 8)

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

@@ -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"

6
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp → Marlin/src/lcd/dogm/marlinui_DOGM.cpp
View File

@@ -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"

2
Marlin/src/lcd/dogm/ultralcd_DOGM.h → Marlin/src/lcd/dogm/marlinui_DOGM.h
View File

@@ -22,7 +22,7 @@
#pragma once
/**
* lcd/dogm/ultralcd_DOGM.h
* lcd/dogm/marlinui_DOGM.h
*/
#include "../../inc/MarlinConfigPre.h"

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

@@ -30,8 +30,8 @@
#if HAS_MARLINUI_U8GLIB && DISABLED(LIGHTWEIGHT_UI)
#include "dogm_Statusscreen.h"
#include "ultralcd_DOGM.h"
#include "../ultralcd.h"
#include "marlinui_DOGM.h"
#include "../marlinui.h"
#include "../lcdprint.h"
#include "../../libs/numtostr.h"

2
Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
View File

@@ -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"

2
Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
View File

@@ -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>

2
Marlin/src/lcd/dwin/e3v2/dwin.cpp
View File

@@ -47,7 +47,7 @@
#include <string.h>
#include "../../fontutils.h"
#include "../../ultralcd.h"
#include "../../marlinui.h"
#include "../../../sd/cardreader.h"

2
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
View File

@@ -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;

2
Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
View File

@@ -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;

2
Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
View File

@@ -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)

2
Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
View File

@@ -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;

2
Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
View File

@@ -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)

2
Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp
View File

@@ -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)

2
Marlin/src/lcd/extui/malyan_lcd.cpp
View File

@@ -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"

8
Marlin/src/lcd/extui/ui_api.cpp
View File

@@ -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() {
ExtUI::onStartup();
}
void MarlinUI::init() { ExtUI::onStartup(); }
void MarlinUI::update() { ExtUI::onIdle(); }

2
Marlin/src/lcd/fontutils.cpp
View File

@@ -10,7 +10,7 @@
#include "../inc/MarlinConfig.h"
#if HAS_WIRED_LCD
#include "ultralcd.h"
#include "marlinui.h"
#include "../MarlinCore.h"
#endif

4
Marlin/src/lcd/ultralcd.cpp → Marlin/src/lcd/marlinui.cpp
View File

@@ -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"

0
Marlin/src/lcd/ultralcd.h → Marlin/src/lcd/marlinui.h
View File

4
Marlin/src/lcd/menu/game/game.h
View File

@@ -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

2
Marlin/src/lcd/menu/menu.h
View File

@@ -21,7 +21,7 @@
*/
#pragma once
#include "../ultralcd.h"
#include "../marlinui.h"
#include "../../libs/numtostr.h"
#include "../../inc/MarlinConfig.h"

2
Marlin/src/lcd/menu/menu_item.h
View File

@@ -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"

2
Marlin/src/lcd/menu/menu_touch_screen.cpp
View File

@@ -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() {

2
Marlin/src/lcd/menu/menu_tune.cpp
View File

@@ -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) {

2
Marlin/src/lcd/tft/touch.cpp
View File

@@ -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"

2
Marlin/src/lcd/tft/ui_320x240.cpp
View File

@@ -26,7 +26,7 @@
#include "ui_320x240.h"
#include "../ultralcd.h"
#include "../marlinui.h"
#include "../menu/menu.h"
#include "../../libs/numtostr.h"

2
Marlin/src/lcd/tft/ui_480x320.cpp
View File

@@ -26,7 +26,7 @@
#include "ui_480x320.h"
#include "../ultralcd.h"
#include "../marlinui.h"
#include "../menu/menu.h"
#include "../../libs/numtostr.h"

2
Marlin/src/lcd/touch/touch_buttons.cpp
View File

@@ -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

2
Marlin/src/module/delta.cpp
View File

@@ -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

2
Marlin/src/module/endstops.cpp
View File

@@ -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)

4
Marlin/src/module/motion.cpp
View File

@@ -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

2
Marlin/src/module/planner.cpp
View File

@@ -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"

2
Marlin/src/module/probe.cpp
View File

@@ -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

2
Marlin/src/module/settings.cpp
View File

@@ -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"

2
Marlin/src/module/stepper.cpp
View File

@@ -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"

2
Marlin/src/module/temperature.cpp
View File

@@ -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"

2
Marlin/src/module/tool_change.cpp
View File

@@ -94,7 +94,7 @@
#endif
#if HAS_LCD_MENU
#include "../lcd/ultralcd.h"
#include "../lcd/marlinui.h"
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE)

2
Marlin/src/sd/cardreader.cpp
View File

@@ -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"

2
Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
View File

@@ -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,