Rebase fixes

Marlin/Version.h

@@ -43,6 +43,8 @@
 #define VerChar1 "E3"
 #elif ENABLED(MachineEnder3V2)
   #define VerChar1 "E3V2"
+#elif ENABLED(MachineEnder3Max)
+  #define VerChar1 "E3M"
 #elif(ENABLED(MachineEnder4))
 #define VerChar1 "E4"
 #elif(ENABLED(MachineEnder5))

Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp

@@ -36,7 +36,7 @@
 #include <HardwareSerial.h>
 #include <WString.h>
 #include <stdio.h>
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 #if ENABLED(EXTENSIBLE_UI)
 namespace ExtUI

Marlin/src/lcd/extui/Creality/Creality_DWIN.h

@@ -34,7 +34,7 @@
 
 #include "string.h"
 #include <Arduino.h>
-#include "../../ui_api.h"
+#include "../ui_api.h"
 #if ENABLED(EXTENSIBLE_UI)
 namespace ExtUI {
 /*********************************/

Marlin/src/lcd/extui/Creality/FileNavigator.cpp

@@ -29,7 +29,7 @@
  * Written by Insanity Automation
  * ***************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 #if ENABLED(EXTENSIBLE_UI)
 
 

Marlin/src/lcd/extui/Creality/FileNavigator.h

@@ -30,7 +30,7 @@
  * Written by Insanity Automation
  * ***************************************/
 
-#include "../../ui_api.h"
+#include "../ui_api.h"
 #include "Creality_DWIN.h"
 
 #define MAX_FOLDER_DEPTH                4    // Limit folder depth TFT has a limit for the file path

ini/features.ini

@@ -85,7 +85,7 @@ EXTUI_EXAMPLE                          = src_filter=+<src/lcd/extui/example>
 TOUCH_UI_FTDI_EVE                      = src_filter=+<src/lcd/extui/ftdi_eve_touch_ui>
 MALYAN_LCD                             = src_filter=+<src/lcd/extui/malyan>
 NEXTION_TFT                            = src_filter=+<src/lcd/extui/nextion>
-EXTENSIBLE_UI                          = src_filter=+<src/lcd/extui/lib/Creality>
+EXTENSIBLE_UI                          = src_filter=+<src/lcd/extui/Creality>
 USE_UHS2_USB                           = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
 USE_UHS3_USB                           = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
 USB_FLASH_DRIVE_SUPPORT                = src_filter=+<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>

platformio.ini

@@ -2580,45 +2580,25 @@ build_flags = ${common.build_flags} -DMachineS5 -DBedAC  -DABL_BLTOUCH -DMeshExt
 
 
 [env:Ender3V2]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3V2
 
 [env:Ender3V2_BLT]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DABL_BLTOUCH
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3V2 -DABL_BLTOUCH
 
 
 [env:Ender3V2_427]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DCreality427
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3V2 -DCreality427
 
 [env:Ender3V2_427_BLT]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags}  -DMachineEnder3V2 -DABL_BLTOUCH -DCreality427
 
 [env:Ender3V2_SKRT]
 platform = ${common_LPC.platform}
@@ -2634,84 +2614,45 @@ build_flags     = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/
 
 
 [env:Ender3_422]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro422
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags}  -DMachineEnder3Pro422
 
 [env:Ender3_422_BLT]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro422 -DABL_BLTOUCH
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Pro422 -DABL_BLTOUCH
 
 [env:Ender3_427]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro427
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Pro427
 
 [env:Ender3_427_BLT]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Pro427 -DABL_BLTOUCH
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Pro427 -DABL_BLTOUCH
 
 [env:Ender3Max_422]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Max
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags} -DMachineEnder3Max
 
 [env:Ender3Max_422_BLT]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Max -DABL_BLTOUCH
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags}  -DMachineEnder3Max -DABL_BLTOUCH
 
 [env:Ender3Max_427]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Max -DCreality427
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags}  -DMachineEnder3Max -DCreality427
+
 
 [env:Ender3Max_427_BLT]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4 -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/STM32F103RET6_creality.py
-debug_tool      = jlink
-upload_protocol = jlink
+platform        = ${common_stm32.platform}
+extends         = env:STM32F103RET6_creality
+build_flags     = ${env:STM32F103RET6_creality.build_flags}  -DMachineEnder3Max -DCreality427 -DABL_BLTOUCH
 
 #
 # ATmega1280