Merge upstream changes from Marlin 2.1.2
This commit is contained in:
@@ -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)
|
||||
#
|
||||
@@ -216,23 +226,35 @@ build_flags = ${stm32_variant.build_flags}
|
||||
build_unflags = ${stm32_variant.build_unflags}
|
||||
-DUSBCON -DUSBD_USE_CDC
|
||||
|
||||
#
|
||||
# MKS Robin Nano V1.2 and V2
|
||||
#
|
||||
[env:mks_robin_nano35]
|
||||
[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
|
||||
debug_tool = jlink
|
||||
upload_protocol = jlink
|
||||
|
||||
#
|
||||
# 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
|
||||
|
||||
#
|
||||
# Mingda MPX_ARM_MINI
|
||||
|
Reference in New Issue
Block a user