From 01ef9afdd0171d5b091fb5679d1583c63ee88428 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 8 May 2022 14:41:54 -0400
Subject: [PATCH] CR10Smart Pro Configs

---
 Marlin/Configuration.h                          | 10 ++++++----
 Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp |  2 +-
 platformio.ini                                  |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9293a3061c..92fff7a4eb 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -691,11 +691,11 @@
   #define LCD_SERIAL_PORT 3
   #define LCD_BAUDRATE 115200
   #define SERIAL_CATCHALL 1
-#elif ANY(MachineCR10Smart, MachineCR10SmartPro)
+#elif ENABLED(MachineCR10Smart)
   #define LCD_SERIAL_PORT 3
   #define LCD_BAUDRATE 115200
   #define SERIAL_CATCHALL 1
-#elif ENABLED(MachineEnder7)
+#elif ANY(MachineEnder7, MachineCR10SmartPro)
   #define LCD_SERIAL_PORT 2
   #define LCD_BAUDRATE 115200
   #define SERIAL_CATCHALL 1
@@ -773,7 +773,9 @@
     #define MOTHERBOARD BOARD_CREALITY_V452
   #elif ENABLED(MachineCR30)
     #define MOTHERBOARD BOARD_CREALITY_V4210
-  #elif ANY(MachineCR6, MachineCR6Max, MachineCR10Smart, MachineCR10SmartPro)
+  #elif ENABLED(MachineCR10SmartPro)
+    #define MOTHERBOARD BOARD_CREALITY_V25S1
+  #elif ANY(MachineCR6, MachineCR6Max, MachineCR10Smart)
     #define MOTHERBOARD BOARD_CREALITY_V453
   #elif ENABLED(MachineEnder2Pro)
     #define MOTHERBOARD BOARD_CREALITY_V423
@@ -2105,7 +2107,7 @@
  * The probe replaces the Z-MIN endstop and is used for Z homing.
  * (Automatically enables USE_PROBE_FOR_Z_HOMING.)
  */
-#if NONE(Creality422, Creality427, MachineEnder6, MachineEnder7, MachineCR5, MachineEnder2Pro, MachineEnder3S1) && DISABLED(Creality42XUseZMin) || DISABLED(ABL_BLTOUCH)
+#if NONE(Creality422, Creality427, MachineEnder6, MachineEnder7, MachineCR5, MachineEnder2Pro, MachineEnder3S1, MachineCR10SmartPro) && DISABLED(Creality42XUseZMin) || DISABLED(ABL_BLTOUCH)
   #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
 #endif
 // Force the use of the probe for Z-axis homing
diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
index 59ca8012cb..d070404b8e 100644
--- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
+++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
@@ -2100,7 +2100,7 @@ void SetTouchScreenConfiguration() {
   if (Settings.display_sound) cfg_bits |= 1UL << 3; // 3: audio
   if (Settings.display_standby) cfg_bits |= 1UL << 2; // 2: backlight on standby
   if(Settings.screen_rotation==10) cfg_bits |= 1UL << 1; // 1 & 0: Inversion
-  #if ENABLED(MachineCR10Smart)
+  #if ANY(MachineCR10Smart, MachineCR10SmartPro )
     cfg_bits |= 1UL << 0; // Portrait Mode or 800x480 display has 0 point rotated 90deg from 480x272 display
   #endif
 
diff --git a/platformio.ini b/platformio.ini
index 26e4744c68..4b037f40a3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -3907,8 +3907,8 @@ build_flags                 = ${stm32_variant.build_flags}
 [env:CR10SmartPro]
 extends                     = stm32_variant
 board_build.variant         = MARLIN_F103Rx
-board_build.offset          = 0x7000
-board_upload.offset_address = 0x08007000
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
 build_unflags               = ${stm32_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC
 extra_scripts               = ${stm32_variant.extra_scripts}