From fe7203ee5533ecb0436a301aea46bedeff311624 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 7 Dec 2023 20:35:34 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Use=20PIO=20versioning=20(includ?=
 =?UTF-8?q?ing=20HC32)=20(#26512)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/hc32f4/env_validate.h | 5 ++++-
 ini/hc32.ini                          | 2 +-
 ini/stm32f4.ini                       | 2 +-
 ini/stm32g0.ini                       | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/pins/hc32f4/env_validate.h b/Marlin/src/pins/hc32f4/env_validate.h
index 7883bc03c7..9bbc999fd6 100644
--- a/Marlin/src/pins/hc32f4/env_validate.h
+++ b/Marlin/src/pins/hc32f4/env_validate.h
@@ -19,8 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#pragma once
+#ifndef ENV_VALIDATE_H
+#define ENV_VALIDATE_H
 
 #ifndef ARDUINO_ARCH_HC32
   #error "Oops! Select an HC32F460 board in 'Tools > Board.'"
 #endif
+
+#endif
diff --git a/ini/hc32.ini b/ini/hc32.ini
index 56c6b3f2e5..d25ef4e7be 100644
--- a/ini/hc32.ini
+++ b/ini/hc32.ini
@@ -27,7 +27,7 @@
 # Base Environment for all HC32F460 variants
 #
 [HC32F460_base]
-platform         = https://github.com/shadow578/platform-hc32f46x/archive/main.zip
+platform         = https://github.com/shadow578/platform-hc32f46x/archive/1.0.0.zip
 board            = generic_hc32f460
 build_src_filter = ${common.default_src_filter} +<src/HAL/HC32> +<src/HAL/shared/backtrace>
 build_type       = release
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 0ba6b66c3f..60ccee94d8 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -743,7 +743,7 @@ upload_protocol = stlink
 [env:STM32F401RC_btt]
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.6.0.zip
+platform_packages           = framework-arduinoststm32@~4.20600.231001
                               toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_STM32F401RC
 board_build.offset          = 0x4000
diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
index 109200bb0c..cf36541f3f 100644
--- a/ini/stm32g0.ini
+++ b/ini/stm32g0.ini
@@ -32,7 +32,7 @@ build_flags = -DPIN_WIRE_SCL=PB3 -DPIN_WIRE_SDA=PB4
 [env:BTT_EBB42_V1_1_filament_extruder]
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.6.0.zip
+platform_packages           = framework-arduinoststm32@~4.20600.231001
                               toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_BTT_EBB42_V1_1
 board_build.offset          = 0x0000
@@ -48,7 +48,7 @@ upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
 [env:STM32G0B1RE_btt]
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.6.0.zip
+platform_packages           = framework-arduinoststm32@~4.20600.231001
                               toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_STM32G0B1RE
 board_build.offset          = 0x2000
@@ -105,7 +105,7 @@ upload_protocol = custom
 [env:STM32G0B1VE_btt]
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.6.0.zip
+platform_packages           = framework-arduinoststm32@~4.20600.231001
                               toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_STM32G0B1VE
 board_build.offset          = 0x2000