Simplification - level 2

MarlinFirmware · Aug 4, 2021 · bb8a75e · bb8a75e
1 parent 4fa42e7
commit bb8a75e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 52 deletions.
diff --git a/buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E2.py b/buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E2.py
diff --git a/buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E4.py b/buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E4.py
diff --git a/buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E4V2.py b/buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E4V2.py
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
@@ -360,48 +360,38 @@ build_flags       = ${common_stm32f1.build_flags}
 #
 # ZONESTAR ZM3E2 V1.0 / ZM3E4 V1.0 / ZM3E4 V2.0
 #
-#   STM32F103RC_ZM3E2_USB ......... RCT6 with 256K
-#   STM32F103VC_ZM3E4_USB ......... VCT6 with 256K
-#   STM32F103VE_ZM3E4V2_USB ......... VET6 with 512K
-#
+#  STM32F103RC_ZM3E2_USB ........... RCT6 with 256K
+#  STM32F103VC_ZM3E4_USB ........... VCT6 with 256K
+#  STM32F103VE_ZM3E4V2_USB ......... VET6 with 512K
+#
+[ZONESTAR_ZM3E]
+platform                  = ${common_stm32f1.platform}
+extends                   = common_stm32f1
+platform_packages         = tool-stm32duino
+board_build.address       = 0x08005000
+board_upload.maximum_size = 237568
+extra_scripts             = ${common.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+build_flags               = ${common_stm32f1.build_flags}
+  -D__STM32F1__=1 -DDEBUG_LEVEL=0 -DSS_TIMER=4 -DSERIAL_USB
+lib_deps                  = USBComposite for [email protected]
+lib_ignore                = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
+
 [env:STM32F103RC_ZM3E2_USB]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = genericSTM32F103RC
-platform_packages = tool-stm32duino
-board_upload.maximum_size=237568
-extra_scripts     = ${common.extra_scripts}
-  buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E2.py
-build_flags       = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4 -D__STM32F1__=1 -DSERIAL_USB
-lib_deps          = USBComposite for [email protected]
-lib_ignore        = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
+platform             = ${ZONESTAR_ZM3E.platform}
+extends              = ZONESTAR_ZM3E
+board                = genericSTM32F103RC
+board_build.ldscript = ZONESTAR_ZM3E4V2.ld
 
 [env:STM32F103VC_ZM3E4_USB]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = genericSTM32F103VC
-platform_packages = tool-stm32duino
-board_upload.maximum_size=237568
-extra_scripts     = ${common.extra_scripts}
-  buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E4.py
-build_flags       = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4 -D__STM32F1__=1
-  -DSERIAL_USB
-lib_deps          = USBComposite for [email protected]
-lib_ignore        = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
+platform             = ${ZONESTAR_ZM3E.platform}
+extends              = ZONESTAR_ZM3E
+board                = genericSTM32F103VC
+board_build.ldscript = ZONESTAR_ZM3E4.ld
 
 [env:STM32F103VE_ZM3E4V2_USB]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = genericSTM32F103VE
-platform_packages = tool-stm32duino
-board_upload.maximum_size=499712
-extra_scripts     = ${common.extra_scripts}
-  buildroot/share/PlatformIO/scripts/ZONESTAR_ZM3E4V2.py
-build_flags       = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -D__STM32F1__=1
-  -DSERIAL_USB
-  -DSS_TIMER=4
-lib_deps          = USBComposite for [email protected]
-lib_ignore        = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
+platform             = ${ZONESTAR_ZM3E.platform}
+extends              = ZONESTAR_ZM3E
+board                = genericSTM32F103VE
+board_build.ldscript = ZONESTAR_ZM3E4V2.ld
+board_upload.maximum_size = 499712