🔨 Fix, clean up STM32F1 envs (MarlinFirmware#25697)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

Author: 2 people

ini/stm32f1.ini

@@ -134,16 +134,6 @@ monitor_speed               = 115200
 debug_tool                  = jlink
 upload_protocol             = jlink
 
-#
-# Trigorilla V0.0.6 (GD32F103)
-#  modified version of env:STM32F103RE_creality
-#
-[env:trigorilla_v006]
-extends                     = STM32F103Rx_creality
-board                       = genericSTM32F103RE
-board_build.offset          = 0x8000
-board_upload.offset_address = 0x08008000
-
 #
 # Creality (STM32F103Rx)
 # With custom upload to SD via Marlin with binary protocol.
@@ -176,10 +166,19 @@ board   = genericSTM32F103RE
 # Creality 512K (STM32F103RE) for new 64KiB bootloader (CR-10 Smart Pro printer)
 #
 [env:STM32F103RE_creality_smartPro]
-extends                     = STM32F103Rx_creality
+extends                     = env:STM32F103RE_creality
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
 
+#
+# Trigorilla V0.0.6 (GD32F103)
+#  modified version of env:STM32F103RE_creality
+#
+[env:trigorilla_v006]
+extends                     = env:STM32F103RE_creality
+board_build.offset          = 0x8000
+board_upload.offset_address = 0x08008000
+
 #
 # Creality 256K (STM32F103RC)
 #
@@ -230,54 +229,7 @@ platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${env:STM32F103RE_btt.build_flags}
                     -DUSE_USB_FS -DUSBD_IRQ_PRIO=5
                     -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC
-build_unflags     = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
-
-#
-# FLSUN QQS Pro (STM32F103VET6)
-# board Hispeedv1
-#
-[env:flsun_hispeedv1]
-extends                     = stm32_variant
-board                       = genericSTM32F103VE
-board_build.variant         = MARLIN_F103Vx
-board_build.encrypt_mks     = Robin_mini.bin
-board_build.offset          = 0x7000
-board_upload.offset_address = 0x08007000
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
-
-[mks_robin_nano_v1v2_common]
-extends                     = stm32_variant
-board                       = genericSTM32F103VE
-board_build.variant         = MARLIN_F103Vx
-board_build.encrypt_mks     = Robin_nano35.bin
-board_build.offset          = 0x7000
-board_upload.offset_address = 0x08007000
-debug_tool                  = stlink
-upload_protocol             = stlink
-
-#
-# MKS Robin Nano V1.2 and V2
-#
-[env:mks_robin_nano_v1v2]
-extends                     = mks_robin_nano_v1v2_common
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
-
-#
-# MKS/ZNP Robin Nano V1.2 and V2 with native USB modification
-#
-[env:mks_robin_nano_v1v2_usbmod]
-extends                     = mks_robin_nano_v1v2_common
-build_flags                 = ${common_stm32.build_flags}
-                              -DMCU_STM32F103VE -DSS_TIMER=4
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+build_unflags     = ${env:STM32F103RE_btt.build_unflags} -DUSBD_USE_CDC
 
 #
 # Mingda MPX_ARM_MINI
@@ -315,17 +267,63 @@ board_upload.offset_address = 0x08005000
 build_flags                 = ${stm32_variant.build_flags} -DSS_TIMER=4
 
 #
-# MKS Robin Mini (STM32F103VET6)
+# (STM32F103VE_robin)
 #
-[env:mks_robin_mini]
+[STM32F103VE_robin]
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
-board_build.encrypt_mks     = Robin_mini.bin
 board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F103VE -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2 -DSS_TIMER=4
+
+[mks_robin_nano_v1v2_common]
+extends                     = STM32F103VE_robin
+board_build.encrypt_mks     = Robin_nano35.bin
+debug_tool                  = stlink
+upload_protocol             = stlink
+
+#
+# MKS/ZNP Robin Nano V1.2 and V2 with native USB modification
+#
+[env:mks_robin_nano_v1v2_usbmod]
+extends                     = mks_robin_nano_v1v2_common
+
+#
+# MKS Robin Nano V1.2 and V2
+#
+[env:mks_robin_nano_v1v2]
+extends                     = mks_robin_nano_v1v2_common
+build_flags                 = ${mks_robin_nano_v1v2_common.build_flags} -DENABLE_HWSERIAL3
+build_unflags               = ${mks_robin_nano_v1v2_common.build_unflags} -DUSBCON -DUSBD_USE_CDC
+
+#
+# MKS Robin Mini (STM32F103VET6)
+#
+[env:mks_robin_mini]
+extends                     = STM32F103VE_robin
+board_build.encrypt_mks     = Robin_mini.bin
+build_unflags               = ${STM32F103VE_robin.build_unflags} -DSS_TIMER=4
+
+#
+# MKS Robin E3p (STM32F103VET6)
+#  - LVGL UI
+#
+[env:mks_robin_e3p]
+extends                     = STM32F103VE_robin
+board_build.encrypt_mks     = Robin_e3p.bin
+debug_tool                  = jlink
+upload_protocol             = jlink
+
+#
+# FLSUN QQS Pro (STM32F103VET6)
+# Hispeedv1 Robin mini variant
+#
+[env:flsun_hispeedv1]
+extends                     = STM32F103VE_robin
+board_build.encrypt_mks     = Robin_mini.bin
+build_flags                 = ${STM32F103VE_robin.build_flags} -DENABLE_HWSERIAL3
+build_unflags               = ${STM32F103VE_robin.build_unflags} -DUSBCON -DUSBD_USE_CDC
 
 #
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
@@ -352,23 +350,6 @@ board_build.encrypt_mks     = mksLite3.bin
 extends                 = env:mks_robin
 board_build.encrypt_mks = Robin_pro.bin
 
-#
-# MKS Robin E3p (STM32F103VET6)
-#  - LVGL UI
-#
-[env:mks_robin_e3p]
-extends                     = stm32_variant
-board                       = genericSTM32F103VE
-board_build.variant         = MARLIN_F103Vx
-board_build.encrypt_mks     = Robin_e3p.bin
-board_build.offset          = 0x7000
-board_upload.offset_address = 0x08007000
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F103VE -DSS_TIMER=4
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-debug_tool                  = jlink
-upload_protocol             = jlink
-
 #
 # JGAurora A5S A1 (STM32F103ZET6)
 #