Move ExtUI subfolders up a level

Marlin/src/MarlinCore.cpp

@@ -68,9 +68,9 @@
 #endif
 
 #if HAS_TFT_LVGL_UI
-  #include "lcd/extui/lib/mks_ui/tft_lvgl_configuration.h"
-  #include "lcd/extui/lib/mks_ui/draw_ui.h"
-  #include "lcd/extui/lib/mks_ui/mks_hardware_test.h"
+  #include "lcd/extui/mks_ui/tft_lvgl_configuration.h"
+  #include "lcd/extui/mks_ui/draw_ui.h"
+  #include "lcd/extui/mks_ui/mks_hardware_test.h"
   #include <lvgl.h>
 #endif
 
@@ -229,7 +229,7 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "lcd/extui/lib/dgus/DGUSScreenHandler.h"
+  #include "lcd/extui/dgus/DGUSScreenHandler.h"
 #endif
 
 #if HAS_DRIVER_SAFE_POWER_PROTECT

Marlin/src/gcode/lcd/M995.cpp

@@ -27,7 +27,7 @@
 #include "../gcode.h"
 
 #if ENABLED(TFT_LVGL_UI)
-  #include "../../lcd/extui/lib/mks_ui/draw_touch_calibration.h"
+  #include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
 #else
   #include "../../lcd/menu/menu.h"
 #endif

Marlin/src/gcode/sd/M24_M25.cpp

@@ -42,7 +42,7 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "../../lcd/extui/lib/dgus/DGUSDisplayDef.h"
+  #include "../../lcd/extui/dgus/DGUSDisplayDef.h"
 #endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob

Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp → Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/FileNavigator.cpp
+ * lcd/extui/anycubic_chiron/FileNavigator.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -46,7 +46,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 #include "FileNavigator.h"
@@ -55,7 +55,7 @@
 using namespace ExtUI;
 
 #define DEBUG_OUT ACDEBUG(AC_FILE)
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 namespace Anycubic {
 

Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.h → Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.h

@@ -22,15 +22,15 @@
 #pragma once
 
 /**
- * lcd/extui/lib/FileNavigator.h
+ * lcd/extui/anycubic_chiron/FileNavigator.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
 #include "chiron_tft_defs.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 using namespace ExtUI;
 

Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.cpp → Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/Tunes.cpp
+ * lcd/extui/anycubic_chiron/Tunes.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -33,12 +33,12 @@
  * See Tunes.h for note and tune definitions.                          *
  ***********************************************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
 #include "Tunes.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 namespace Anycubic {
 

Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.h → Marlin/src/lcd/extui/anycubic_chiron/Tunes.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/Tunes.h
+ * lcd/extui/anycubic_chiron/Tunes.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]

Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp → Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp

@@ -21,17 +21,17 @@
  */
 
 /**
- * lcd/extui/anycubic_chiron_lcd.cpp
+ * lcd/extui/anycubic_chiron/chiron_extui.cpp
  *
  * Anycubic Chiron TFT support for Marlin
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
-#include "ui_api.h"
-#include "lib/anycubic_chiron/chiron_tft.h"
+#include "../ui_api.h"
+#include "chiron_tft.h"
 
 using namespace Anycubic;
 

Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp → Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp

@@ -21,25 +21,25 @@
  */
 
 /**
- * lcd/extui/lib/chiron_tft.cpp
+ * lcd/extui/anycubic_chiron/chiron_tft.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
 #include "chiron_tft.h"
 #include "Tunes.h"
 #include "FileNavigator.h"
 
-#include "../../../../gcode/queue.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../libs/numtostr.h"
-#include "../../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
+#include "../../../sd/cardreader.h"
+#include "../../../libs/numtostr.h"
+#include "../../../MarlinCore.h"
 
 namespace Anycubic {
 

Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.h → Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h

@@ -22,16 +22,16 @@
 #pragma once
 
 /**
- * lcd/extui/lib/chiron_tft.h
+ * lcd/extui/anycubic_chiron/chiron_tft.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
 #include "chiron_tft_defs.h"
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../ui_api.h"
+#include "../../../inc/MarlinConfigPre.h"
+#include "../ui_api.h"
 
 #if NONE(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
   #define AUTO_DETECT_CHIRON_TFT 1

Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft_defs.h → Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h

@@ -21,15 +21,15 @@
  */
 
 /**
- * lcd/extui/lib/chiron_defs.h
+ * lcd/extui/anycubic_chiron/chiron_defs.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
 #pragma once
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 //#define ACDEBUGLEVEL 4
 
 #if ACDEBUGLEVEL

Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp → Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp

@@ -21,15 +21,15 @@
  */
 
 /**
- * anycubic_i3mega_lcd.cpp
+ * lcd/extui/anycubic_i3mega/anycubic_extui.cpp
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
 
-#include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
-#include "ui_api.h"
+#include "anycubic_i3mega_lcd.h"
+#include "../ui_api.h"
 
 #include <Arduino.h>    // for the ::tone() call
 

Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp → Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp

@@ -19,17 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
 
 #include "anycubic_i3mega_lcd.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
-#include "../../../../libs/numtostr.h"
-#include "../../../../module/motion.h"  // for quickstop_stepper, A20 read printing speed, feedrate_percentage
-#include "../../../../MarlinCore.h"     // for disable_steppers
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../libs/numtostr.h"
+#include "../../../module/motion.h"  // for quickstop_stepper, A20 read printing speed, feedrate_percentage
+#include "../../../MarlinCore.h"     // for disable_steppers
+#include "../../../inc/MarlinConfig.h"
 
 // command sending macro's with debugging capability
 #define SEND_PGM(x)       send_P(PSTR(x))

Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h → Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h

@@ -20,8 +20,8 @@
  */
 #pragma once
 
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../../../sd/SdFatConfig.h"   // for the FILENAME_LENGTH macro
+#include "../../../inc/MarlinConfigPre.h"
+#include "../../../sd/SdFatConfig.h"   // for the FILENAME_LENGTH macro
 
 #define TFTBUFSIZE 4
 #define TFT_MAX_CMD_SIZE 96

Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp → Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp

@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
 #if HOTENDS > 2
   #warning "More than 2 hotends not implemented on DGUS Display UI."
 #endif
 
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/motion.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../module/planner.h"
-#include "../../../../libs/duration_t.h"
-#include "../../../../module/printcounter.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/motion.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/planner.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/printcounter.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #include "DGUSDisplay.h"

Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h → Marlin/src/lcd/extui/dgus/DGUSDisplay.h

@@ -22,23 +22,23 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSDisplay.h
+ * lcd/extui/dgus/DGUSDisplay.h
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #include <stdlib.h>    // size_t
 
 #if HAS_BED_PROBE
-  #include "../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 #include "DGUSVPVariable.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
 //#define DEBUG_DGUSLCD
 #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 typedef enum : uint8_t {
   DGUS_IDLE,           //< waiting for DGUS_HEADER1.

Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h → Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSDisplayDef.h
+ * lcd/extui/dgus/DGUSDisplayDef.h
  * Defines the interaction between Marlin and the display firmware
  */
 
@@ -44,7 +44,7 @@ extern const struct VPMapping VPMap[];
 // List of VPs handled by Marlin / The Display.
 extern const struct DGUS_VP_Variable ListOfVP[];
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
   #include "origin/DGUSDisplayDef.h"

Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp → Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp

@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
 #include "DGUSScreenHandler.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../libs/duration_t.h"
-#include "../../../../module/settings.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
-#include "../../../../module/printcounter.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/settings.h"
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../module/printcounter.h"
+#include "../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 DGUSScreenHandler ScreenHandler;

Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.h → Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h

@@ -22,12 +22,12 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSScreenHandler.h
+ * lcd/extui/dgus/DGUSScreenHandler.h
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)