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

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(); }