🎨 e3v2 -> dwin (#28211)

Marlin/src/MarlinCore.cpp

@@ -74,11 +74,11 @@
 #endif
 
 #if HAS_DWIN_E3V2
-  #include "lcd/e3v2/common/encoder.h"
+  #include "lcd/dwin/common/encoder.h"
   #if ENABLED(DWIN_CREALITY_LCD)
-    #include "lcd/e3v2/creality/dwin.h"
+    #include "lcd/dwin/creality/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    #include "lcd/e3v2/jyersui/dwin.h"
+    #include "lcd/dwin/jyersui/dwin.h"
   #elif ENABLED(SOVOL_SV06_RTS)
     #include "lcd/sovol_rts/sovol_rts.h"
   #endif

Marlin/src/gcode/bedlevel/abl/G29.cpp

@@ -51,7 +51,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../../lcd/e3v2/creality/dwin.h"
+  #include "../../../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../../../lcd/sovol_rts/sovol_rts.h"
 #endif

Marlin/src/gcode/calibrate/G28.cpp

@@ -61,7 +61,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../lcd/e3v2/creality/dwin.h"
+  #include "../../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../../lcd/sovol_rts/sovol_rts.h"
 #endif

Marlin/src/gcode/feature/powerloss/M1000.cpp

@@ -36,9 +36,9 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../../lcd/e3v2/creality/dwin.h"
+  #include "../../../lcd/dwin/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
+  #include "../../../lcd/dwin/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)

Marlin/src/gcode/stats/M75-M78.cpp

@@ -30,7 +30,7 @@
 #include "../../MarlinCore.h" // for startOrResumeJob
 
 #if ENABLED(DWIN_LCD_PROUI)
-  #include "../../lcd/e3v2/proui/dwin.h"
+  #include "../../lcd/dwin/proui/dwin.h"
 #endif
 
 /**

Marlin/src/inc/Conditionals-2-LCD.h

@@ -570,7 +570,7 @@
   #define EXTENSIBLE_UI
 #endif
 
-// E3V2 extras
+// DWIN extras
 #if ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, SOVOL_SV06_RTS)
   #define SERIAL_CATCHALL 0
   #define HAS_LCD_BRIGHTNESS 1

Marlin/src/lcd/dwin/common/dwin_api.h

@@ -24,9 +24,9 @@
 #include "../../../inc/MarlinConfig.h"
 
 //
-// e3v2/common/dwin_api.h
+// dwin/common/dwin_api.h
 //
-// Included by: e3v2/*/dwin_lcd.h
+// Included by: dwin/*/dwin_lcd.h
 //
 
 #if ENABLED(DWIN_MARLINUI_LANDSCAPE)

Marlin/src/lcd/dwin/common/encoder.cpp

@@ -21,7 +21,7 @@
  */
 
 /*****************************************************************************
- * @file     lcd/e3v2/common/encoder.cpp
+ * @file     lcd/dwin/common/encoder.cpp
  * @brief    Rotary encoder functions
  *****************************************************************************/
 

Marlin/src/lcd/dwin/common/encoder.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /*****************************************************************************
-  * @file     lcd/e3v2/common/encoder.h
+  * @file     lcd/dwin/common/encoder.h
   * @brief    Rotary encoder functions
   ****************************************************************************/
 

Marlin/src/lcd/dwin/common/limits.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /*****************************************************************************
- * @file     lcd/e3v2/common/limits.h
+ * @file     lcd/dwin/common/limits.h
  * @brief    Limits for UI values
  ****************************************************************************/
 

Marlin/src/lcd/dwin/creality/dwin_lcd.cpp

@@ -21,7 +21,7 @@
  */
 
 /********************************************************************************
- * @file     lcd/e3v2/creality/dwin_lcd.cpp
+ * @file     lcd/dwin/creality/dwin_lcd.cpp
  * @author   LEO / Creality3D
  * @date     2019/07/18
  * @version  2.0.1

Marlin/src/lcd/dwin/jyersui/dwin.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/e3v2/jyersui/dwin.cpp
+ * lcd/dwin/jyersui/dwin.cpp
  */
 
 #include "../../../inc/MarlinConfigPre.h"

Marlin/src/lcd/dwin/jyersui/dwin.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/e3v2/jyersui/dwin.h
+ * lcd/dwin/jyersui/dwin.h
  */
 
 #include "dwin_lcd.h"

Marlin/src/lcd/dwin/jyersui/dwin_lcd.cpp

@@ -21,7 +21,7 @@
  */
 
 /********************************************************************************
- * @file     lcd/e3v2/jyersui/dwin_lcd.cpp
+ * @file     lcd/dwin/jyersui/dwin_lcd.cpp
  * @brief    DWIN screen control functions
  ********************************************************************************/
 

Marlin/src/lcd/dwin/jyersui/dwin_lcd.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /********************************************************************************
- * @file     lcd/e3v2/jyersui/dwin_lcd.h
+ * @file     lcd/dwin/jyersui/dwin_lcd.h
  * @brief    DWIN screen control functions
  ********************************************************************************/
 

Marlin/src/lcd/dwin/marlinui/dwin_lcd.cpp

@@ -21,7 +21,7 @@
  */
 
 /********************************************************************************
- * @file     lcd/e3v2/marlinui/dwin_lcd.cpp
+ * @file     lcd/dwin/marlinui/dwin_lcd.cpp
  * @brief    DWIN screen control functions
  ********************************************************************************/
 

Marlin/src/lcd/dwin/marlinui/dwin_lcd.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /********************************************************************************
- * @file     lcd/e3v2/marlinui/dwin_lcd.h
+ * @file     lcd/dwin/marlinui/dwin_lcd.h
  * @brief    DWIN screen control functions
  ********************************************************************************/
 

Marlin/src/lcd/dwin/marlinui/game.cpp

@@ -26,7 +26,7 @@
 // Enable performance counters (draw call count, frame timing) for debugging
 //#define GAME_PERFORMANCE_COUNTERS
 
-#include "../../menu/game/types.h" // includes e3v2/marlinui/game.h
+#include "../../menu/game/types.h" // includes dwin/marlinui/game.h
 #include "../../lcdprint.h"
 #include "lcdprint_dwin.h"
 #include "marlinui_dwin.h"

Marlin/src/lcd/dwin/marlinui/lcdprint_dwin.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/e3v2/marlinui/lcdprint_dwin.cpp
+ * lcd/dwin/marlinui/lcdprint_dwin.cpp
  *
  * Due to DWIN hardware limitations simplified characters are used
  */

Marlin/src/lcd/dwin/marlinui/marlinui_dwin.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/e3v2/marlinui/lcdprint_dwin.h
+ * lcd/dwin/marlinui/lcdprint_dwin.h
  */
 
 #include "../../../inc/MarlinConfigPre.h"

Marlin/src/lcd/lcdprint.h

@@ -36,7 +36,7 @@
 
 #if IS_DWIN_MARLINUI
 
-  #include "e3v2/marlinui/marlinui_dwin.h"
+  #include "dwin/marlinui/marlinui_dwin.h"
 
   // The DWIN lcd_moveto function uses row / column, not pixels
   #define LCD_COL_X(col)    (col)

Marlin/src/lcd/marlinui.cpp

@@ -46,9 +46,9 @@ MarlinUI ui;
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "e3v2/creality/dwin.h"
+  #include "dwin/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "e3v2/jyersui/dwin.h"
+  #include "dwin/jyersui/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "sovol_rts/sovol_rts.h"
 #endif

Marlin/src/lcd/marlinui.h

@@ -48,13 +48,13 @@
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "e3v2/creality/dwin.h"
+  #include "dwin/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
-  #include "e3v2/proui/dwin.h"
+  #include "dwin/proui/dwin.h"
 #endif
 
 #if ALL(HAS_STATUS_MESSAGE, IS_DWIN_MARLINUI)
-  #include "e3v2/marlinui/marlinui_dwin.h" // for LCD_WIDTH
+  #include "dwin/marlinui/marlinui_dwin.h" // for LCD_WIDTH
 #endif
 
 typedef bool (*statusResetFunc_t)();

Marlin/src/lcd/menu/game/types.h

@@ -27,7 +27,7 @@
 #if HAS_MARLINUI_U8GLIB
   #include "../../dogm/game.h"
 #elif IS_DWIN_MARLINUI
-  #include "../../e3v2/marlinui/game.h"
+  #include "../../dwin/marlinui/game.h"
 #endif
 
 typedef struct { int8_t x, y; } pos_t;

Marlin/src/module/motion.h

@@ -31,7 +31,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING)
-  #include "../lcd/e3v2/proui/dwin.h" // for Z_POST_CLEARANCE
+  #include "../lcd/dwin/proui/dwin.h" // for Z_POST_CLEARANCE
 #endif
 
 #if IS_SCARA

Marlin/src/module/settings.cpp

@@ -79,14 +79,14 @@
 #endif
 
 #if ENABLED(DWIN_LCD_PROUI)
-  #include "../lcd/e3v2/proui/dwin.h"
-  #include "../lcd/e3v2/proui/bedlevel_tools.h"
+  #include "../lcd/dwin/proui/dwin.h"
+  #include "../lcd/dwin/proui/bedlevel_tools.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../lcd/e3v2/jyersui/dwin.h"
+  #include "../lcd/dwin/jyersui/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)

Marlin/src/module/temperature.cpp

@@ -51,7 +51,7 @@
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../lcd/e3v2/creality/dwin.h"
+  #include "../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../lcd/sovol_rts/sovol_rts.h"
 #endif

Marlin/src/sd/cardreader.cpp

@@ -36,7 +36,7 @@
 #include "../lcd/marlinui.h"
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../lcd/e3v2/creality/dwin.h"
+  #include "../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../lcd/sovol_rts/sovol_rts.h"
 #endif

ini/features.ini

@@ -47,11 +47,11 @@ HAS_(FSMC|SPI|LTDC)_TFT                = build_src_filter=+<src/lcd/tft_io>
 I2C_EEPROM                             = build_src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
 SOFT_I2C_EEPROM|U8G_USES_SW_I2C        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
 SPI_EEPROM                             = build_src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
-HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = build_src_filter=+<src/lcd/e3v2/common>
-DWIN_CREALITY_LCD                      = build_src_filter=+<src/lcd/e3v2/creality>
-DWIN_LCD_PROUI                         = build_src_filter=+<src/lcd/e3v2/proui>
-DWIN_CREALITY_LCD_JYERSUI              = build_src_filter=+<src/lcd/e3v2/jyersui>
-IS_DWIN_MARLINUI                       = build_src_filter=+<src/lcd/e3v2/marlinui>
+HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = build_src_filter=+<src/lcd/dwin/common>
+DWIN_CREALITY_LCD                      = build_src_filter=+<src/lcd/dwin/creality>
+DWIN_LCD_PROUI                         = build_src_filter=+<src/lcd/dwin/proui>
+DWIN_CREALITY_LCD_JYERSUI              = build_src_filter=+<src/lcd/dwin/jyersui>
+IS_DWIN_MARLINUI                       = build_src_filter=+<src/lcd/dwin/marlinui>
 SOVOL_SV06_RTS                         = build_src_filter=+<src/lcd/sovol_rts>
 HAS_GRAPHICAL_TFT                      = build_src_filter=+<src/lcd/tft> -<src/lcd/tft/fontdata> -<src/lcd/tft/ui_move_axis_screen_*.cpp>
 HAS_UI_320X.+                          = build_src_filter=+<src/lcd/tft/ui_move_axis_screen_320.cpp>

platformio.ini

@@ -58,7 +58,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/tests>
   ; LCDs and Controllers
   -<src/lcd/HD44780> -<src/lcd/dogm> -<src/lcd/TFTGLCD> -<src/lcd/tft> -<src/lcd/tft_io>
-  -<src/lcd/e3v2> -<src/lcd/sovol_rts> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
+  -<src/lcd/dwin> -<src/lcd/sovol_rts> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
   -<src/lcd/lcdprint.cpp>
   ; Marlin HAL
   -<src/HAL>