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 fff5649b6a
commit 141f6825ce
93 changed files with 105 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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