From d1aed522803db945841472087df3040f3dc897d4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 20 Aug 2020 01:38:22 -0500
Subject: [PATCH] Move ExtUI displays to sub-folder (#19070)

---
 .../anycubic_chiron_lcd.cpp}                  |  6 ++---
 .../anycubic_i3mega_lcd.cpp}                  |  8 +++----
 .../dgus_lcd.cpp}                             | 12 +++++-----
 .../{extui_example.cpp => extui/example.cpp}  |  6 ++---
 .../malyan_lcd.cpp}                           | 24 +++++++++----------
 platformio.ini                                | 16 ++++++-------
 6 files changed, 36 insertions(+), 36 deletions(-)
 rename Marlin/src/lcd/{extui_anycubic_chiron_lcd.cpp => extui/anycubic_chiron_lcd.cpp} (99%)
 rename Marlin/src/lcd/{extui_anycubic_i3mega_lcd.cpp => extui/anycubic_i3mega_lcd.cpp} (95%)
 rename Marlin/src/lcd/{extui_dgus_lcd.cpp => extui/dgus_lcd.cpp} (95%)
 rename Marlin/src/lcd/{extui_example.cpp => extui/example.cpp} (97%)
 rename Marlin/src/lcd/{extui_malyan_lcd.cpp => extui/malyan_lcd.cpp} (97%)

diff --git a/Marlin/src/lcd/extui_anycubic_chiron_lcd.cpp b/Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
similarity index 99%
rename from Marlin/src/lcd/extui_anycubic_chiron_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
index 15cc96711..889a25b85 100644
--- a/Marlin/src/lcd/extui_anycubic_chiron_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
@@ -21,16 +21,16 @@
  */
 
 /**
- * extui_anycubic_chiron_lcd.cpp
+ * anycubic_chiron_lcd.cpp
  *
  * Anycubic Chiron TFT support for Marlin
  */
 
-#include "../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
-#include "extui/ui_api.h"
+#include "ui_api.h"
 
 #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
   #if GRID_MAX_POINTS_X != 5 || GRID_MAX_POINTS_Y != 5
diff --git a/Marlin/src/lcd/extui_anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
similarity index 95%
rename from Marlin/src/lcd/extui_anycubic_i3mega_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
index 360ea75de..15526d16f 100644
--- a/Marlin/src/lcd/extui_anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
@@ -21,15 +21,15 @@
  */
 
 /**
- * extui_anycubic_i3mega_lcd.cpp
+ * anycubic_i3mega_lcd.cpp
  */
 
-#include "../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
 
-#include "extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
-#include "extui/ui_api.h"
+#include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
+#include "ui_api.h"
 
 #include <Arduino.h>    // for the ::tone() call
 
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui/dgus_lcd.cpp
similarity index 95%
rename from Marlin/src/lcd/extui_dgus_lcd.cpp
rename to Marlin/src/lcd/extui/dgus_lcd.cpp
index c3978eb7e..d175b5aca 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui/dgus_lcd.cpp
@@ -21,19 +21,19 @@
  */
 
 /**
- * extui_dgus_lcd.cpp
+ * dgus_lcd.cpp
  *
  * DGUS implementation for Marlin by coldtobi, Feb-May 2019
  */
 
-#include "../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
-#include "extui/ui_api.h"
-#include "extui/lib/dgus/DGUSDisplay.h"
-#include "extui/lib/dgus/DGUSDisplayDef.h"
-#include "extui/lib/dgus/DGUSScreenHandler.h"
+#include "ui_api.h"
+#include "lib/dgus/DGUSDisplay.h"
+#include "lib/dgus/DGUSDisplayDef.h"
+#include "lib/dgus/DGUSScreenHandler.h"
 
 extern const char NUL_STR[];
 
diff --git a/Marlin/src/lcd/extui_example.cpp b/Marlin/src/lcd/extui/example.cpp
similarity index 97%
rename from Marlin/src/lcd/extui_example.cpp
rename to Marlin/src/lcd/extui/example.cpp
index 5258a5b6a..a5ef5652b 100644
--- a/Marlin/src/lcd/extui_example.cpp
+++ b/Marlin/src/lcd/extui/example.cpp
@@ -1,5 +1,5 @@
 /*********************
- * extui_example.cpp *
+ * example.cpp *
  *********************/
 
 /****************************************************************************
@@ -19,11 +19,11 @@
  *   location: <https://www.gnu.org/licenses/>.                              *
  ****************************************************************************/
 
-#include "../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
 
-#include "extui/ui_api.h"
+#include "ui_api.h"
 
 // To implement a new UI, complete the functions below and
 // read or update Marlin's state using the methods in the
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui/malyan_lcd.cpp
similarity index 97%
rename from Marlin/src/lcd/extui_malyan_lcd.cpp
rename to Marlin/src/lcd/extui/malyan_lcd.cpp
index 38a8fbc0f..b5148065c 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui/malyan_lcd.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * extui_malyan_lcd.cpp
+ * malyan_lcd.cpp
  *
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
  * on Serial1 for the M200 board. This module outputs a pseudo-gcode
@@ -41,25 +41,25 @@
  * Copyright (c) 2017 Jason Nelson (xC0000005)
  */
 
-#include "../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if ENABLED(MALYAN_LCD)
 
 #define DEBUG_MALYAN_LCD
 
-#include "extui/ui_api.h"
+#include "ui_api.h"
 
-#include "ultralcd.h"
-#include "../sd/cardreader.h"
-#include "../module/temperature.h"
-#include "../module/stepper.h"
-#include "../module/motion.h"
-#include "../libs/duration_t.h"
-#include "../module/printcounter.h"
-#include "../gcode/queue.h"
+#include "../ultralcd.h"
+#include "../../sd/cardreader.h"
+#include "../../module/temperature.h"
+#include "../../module/stepper.h"
+#include "../../module/motion.h"
+#include "../../libs/duration_t.h"
+#include "../../module/printcounter.h"
+#include "../../gcode/queue.h"
 
 #define DEBUG_OUT ENABLED(DEBUG_MALYAN_LCD)
-#include "../core/debug_out.h"
+#include "../../core/debug_out.h"
 
 // On the Malyan M200, this will be Serial1. On a RAMPS board,
 // it might not be.
diff --git a/platformio.ini b/platformio.ini
index 27b11b2aa..e3ff6c152 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -49,12 +49,12 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/menu/menu_touch_screen.cpp>
   -<src/lcd/menu/menu_ubl.cpp>
   -<src/lcd/extui/lib/mks_ui>
-  -<src/lcd/extui/lib/dgus> -<src/lcd/extui_dgus_lcd.cpp>
-  -<src/lcd/extui_example.cpp>
-  -<src/lcd/extui_malyan_lcd.cpp>
+  -<src/lcd/extui/lib/dgus> -<src/lcd/extui/dgus_lcd.cpp>
+  -<src/lcd/extui/example.cpp>
+  -<src/lcd/extui/malyan_lcd.cpp>
   -<src/lcd/extui/lib/ftdi_eve_touch_ui>
   -<src/lcd/extui/lib/anycubic_i3mega>
-  -<src/lcd/extui_anycubic_tft.cpp>
+  -<src/lcd/extui/anycubic_tft.cpp>
   -<src/lcd/lcdprint.cpp>
   -<src/sd/usb_flashdrive>
   -<src/feature/backlash.cpp>
@@ -241,11 +241,11 @@ HAS_MENU_TMC            = src_filter=+<src/lcd/menu/menu_tmc.cpp>
 HAS_MENU_TOUCH_SCREEN   = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
 HAS_MENU_UBL            = src_filter=+<src/lcd/menu/menu_ubl.cpp>
 ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/lib/anycubic_i3mega>
-HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui_dgus_lcd.cpp>
+HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp>
 TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
-HAS_ANYCUBIC_TFT_EXTUI  = src_filter=+<src/lcd/extui_anycubic_tft.cpp>
-EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui_example.cpp>
-MALYAN_LCD              = src_filter=+<src/lcd/extui_malyan_lcd.cpp>
+HAS_ANYCUBIC_TFT_EXTUI  = src_filter=+<src/lcd/extui/anycubic_tft.cpp>
+EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example.cpp>
+MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
 HAS_SPI_LCD             = src_filter=+<src/lcd/lcdprint.cpp>
 USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive>
 AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>