wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Merge upstream changes from Marlin 2.1.2.1

Browse Source
This commit is contained in:
Stefan Kalscheuer
2023-05-26 18:48:34 +02:00
parent 22dedaeb81
commit f92a587638
620 changed files with 41015 additions and 28889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ini/stm32f4.ini
View File

@@ -269,7 +269,7 @@ build_unflags = ${env:BIGTREE_SKR_2_F429_USB.build_unflags} -Os -NDEBUG
#
# BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4)
#
[env:BIGTREE_OCTOPUS_V1]
[env:STM32F446ZE_btt]
extends = stm32_variant
board = marlin_BigTree_Octopus_v1
board_build.offset = 0x8000
@@ -282,8 +282,8 @@ build_flags = ${stm32_variant.build_flags}
#
# BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
#
[env:BIGTREE_OCTOPUS_V1_USB]
extends = env:BIGTREE_OCTOPUS_V1
[env:STM32F446ZE_btt_USB]
extends = env:STM32F446ZE_btt
platform_packages = ${stm_flash_drive.platform_packages}
build_unflags = -DUSBD_USE_CDC
build_flags = ${stm_flash_drive.build_flags}
@@ -293,9 +293,9 @@ build_flags = ${stm_flash_drive.build_flags}
-DUSBD_USE_CDC_MSC
#
# BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4)
# BigTreeTech Octopus V1.1 / Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4)
#
[env:BIGTREE_OCTOPUS_PRO_V1_F429]
[env:STM32F429ZG_btt]
extends = stm32_variant
board = marlin_BigTree_Octopus_Pro_v1_F429
board_build.offset = 0x8000
@@ -306,10 +306,10 @@ build_flags = ${stm32_variant.build_flags}
-DUSE_USB_HS_IN_FS
#
# BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) with USB Flash Drive Support
# BigTreeTech Octopus V1.1 / Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) with USB Flash Drive Support
#
[env:BIGTREE_OCTOPUS_PRO_V1_F429_USB]
extends = env:BIGTREE_OCTOPUS_PRO_V1_F429
[env:STM32F429ZG_btt_USB]
extends = env:STM32F429ZG_btt
platform_packages = ${stm_flash_drive.platform_packages}
build_unflags = -DUSBD_USE_CDC
build_flags = ${stm_flash_drive.build_flags}
@@ -320,7 +320,7 @@ build_flags = ${stm_flash_drive.build_flags}
#
# BigTreeTech Octopus / Octopus Pro (STM32F407ZET6 ARM Cortex-M4)
#
[env:BIGTREE_OCTOPUS_V1_F407]
[env:STM32F407ZE_btt]
extends = stm32_variant
board = marlin_STM32F407ZE
board_build.offset = 0x8000
@@ -330,8 +330,8 @@ build_flags = ${stm32_variant.build_flags}
#
# BigTreeTech Octopus / Octopus Pro (STM32F407ZET6 ARM Cortex-M4) with USB Flash Drive Support
#
[env:BIGTREE_OCTOPUS_V1_F407_USB]
extends = env:BIGTREE_OCTOPUS_V1_F407
[env:STM32F407ZE_btt_USB]
extends = env:STM32F407ZE_btt
platform_packages = ${stm_flash_drive.platform_packages}
build_unflags = -DUSBD_USE_CDC
build_flags = ${stm_flash_drive.build_flags}
@@ -418,7 +418,20 @@ monitor_speed = 500000
upload_protocol = dfu
#
# MKS Robin Pro V2
# STM32F407ZET6 ARM Cortex-M4
#
[env:mks_robin2]
extends = stm32_variant
board = marlin_MKS_ROBIN2
board_build.offset = 0xC000
board_upload.offset_address = 0x0800C000
board_build.encrypt_mks = Robin2.bin
build_flags = ${stm32_variant.build_flags}
-DTARGET_STM32F4 -DSTM32F407_5ZX
-DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSBD_PID=0x3748 -DUSB_PRODUCT=\"MKS_Robin2\"
#
# MKS Robin Pro V2 (No bootloader!)
#
[env:mks_robin_pro2]
extends = stm32_variant
@@ -726,12 +739,10 @@ upload_command = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
# STM32F446ZET6 ARM Cortex-M4
#
[env:STM32F446_tronxy]
platform = ${common_stm32.platform}
extends = stm32_variant
board = marlin_STM32F446ZET_tronxy
board_build.offset = 0x10000
board_build.rename = fmw_tronxy.bin
build_src_filter = ${common_stm32.build_src_filter}
build_flags = ${stm32_variant.build_flags}
-DSTM32F4xx
build_unflags = ${stm32_variant.build_unflags} -fno-rtti