From 74435b0dcb2a1a157811631ae79fe8064443d8a6 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 2 Oct 2022 05:25:00 +1300
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Creality=20v5.2.1=20board=20(#24815?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24760
---
 Marlin/src/core/boards.h |  2 +-
 Marlin/src/pins/pins.h   |  4 ++--
 ini/stm32f1.ini          | 31 ++++++++++---------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 17051b484cc9..51d419da0460 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -355,7 +355,7 @@
 #define BOARD_CREALITY_V431_D         4051  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V452           4052  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V453           4053  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V521           4054  // SV04 Board
+#define BOARD_CREALITY_V521           4054  // Creality v5.2.1 (STM32F103VE) as found in the SV04
 #define BOARD_CREALITY_V24S1          4055  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
 #define BOARD_CREALITY_V24S1_301      4056  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
 #define BOARD_CREALITY_V25S1          4057  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1e7f5ec3981a..9efafe9af566 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -591,6 +591,8 @@
   #include "stm32f1/pins_CREALITY_V24S1_301.h"  // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V25S1)
   #include "stm32f1/pins_CREALITY_V25S1.h"      // STM32F1                                env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
+#elif MB(CREALITY_V521)
+  #include "stm32f1/pins_CREALITY_V521.h"       // STM32F103VE                            env:STM32F103VE_creality
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple env:trigorilla_pro_disk
 #elif MB(FLY_MINI)
@@ -611,8 +613,6 @@
   #include "stm32f1/pins_ERYONE_ERY32_MINI.h"   // STM32F103VET6                          env:ERYONE_ERY32_MINI_maple
 #elif MB(PANDA_PI_V29)
   #include "stm32f1/pins_PANDA_PI_V29.h"        // STM32F103RCT6                          env:PANDA_PI_V29
-#elif MB(CREALITY_V521)
-  #include "stm32f1/pins_CREALITY_V521.h"       // STM32F103RET6                          env:STM32F103RET6_creality
 
 //
 // ARM Cortex-M4F
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index ecdf554328e4..d8db3628c307 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -171,6 +171,16 @@ board   = genericSTM32F103RC
 extends = STM32F103Rx_creality_xfer
 board   = genericSTM32F103RC
 
+#
+# Creality 512K (STM32F103VE)
+#
+[env:STM32F103VE_creality]
+extends             = STM32F103Rx_creality
+board               = genericSTM32F103VE
+board_build.variant = MARLIN_F103Vx
+build_flags         = ${stm32_variant.build_flags}
+                      -DSS_TIMER=4 -DTIMER_SERVO=TIM5
+                      -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
 #
 # BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
@@ -467,24 +477,3 @@ board                = genericSTM32F103VE
 board_build.variant  = MARLIN_F103Vx
 build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 board_upload.maximum_size = 499712
-
-#
-# Creality (STM32F103RET6)
-#
-[env:STM32F103RET6_creality]
-platform                    = ${common_stm32f1.platform}
-extends                     = stm32_variant
-board                       = genericSTM32F103VE
-board_build.variant         = MARLIN_F103Vx
-board_build.offset          = 0x7000
-board_upload.offset_address = 0x08007000
-build_flags                 = ${stm32_variant.build_flags}
-                              -DSS_TIMER=4 -DTIMER_SERVO=TIM5
-                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin.py
-monitor_speed               = 115200
-debug_tool                  = jlink
-upload_protocol             = jlink