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

114
ini/stm32f1-maple.ini
View File

@@ -61,7 +61,7 @@ monitor_speed = 115200
[env:STM32F103RC_meeb_maple]
extends = env:STM32F103RC_maple
board = marlin_maple_MEEB_3DP
build_flags = ${STM32F1_maple.build_flags}
build_flags = ${env:STM32F103RC_maple.build_flags}
-DDEBUG_LEVEL=0
-DSS_TIMER=4
-DSTM32_FLASH_SIZE=512
@@ -70,10 +70,10 @@ build_flags = ${STM32F1_maple.build_flags}
-DVECT_TAB_OFFSET=0x2000
-DGENERIC_BOOTLOADER
board_build.ldscript = STM32F103RC_MEEB_3DP.ld
extra_scripts = ${STM32F1_maple.extra_scripts}
extra_scripts = ${env:STM32F103RC_maple.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
lib_deps = ${STM32F1_maple.lib_deps}
lib_deps = ${env:STM32F103RC_maple.lib_deps}
USBComposite for STM32F1@0.91
custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
debug_tool = stlink
@@ -84,9 +84,9 @@ upload_protocol = dfu
#
[env:STM32F103RC_fysetc_maple]
extends = env:STM32F103RC_maple
extra_scripts = ${STM32F1_maple.extra_scripts}
extra_scripts = ${env:STM32F103RC_maple.extra_scripts}
buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
build_flags = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0
build_flags = ${env:STM32F103RC_maple.build_flags} -DDEBUG_LEVEL=0
lib_ldf_mode = chain
debug_tool = stlink
upload_protocol = serial
@@ -101,7 +101,7 @@ upload_protocol = serial
extends = env:STM32F103RC_maple
board_build.address = 0x08007000
board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld
build_flags = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
build_flags = ${env:STM32F103RC_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
monitor_speed = 115200
[env:STM32F103RC_btt_USB_maple]
@@ -115,10 +115,10 @@ lib_deps = ${env:STM32F103RC_btt_maple.lib_deps}
#
[env:STM32F103RE_creality_maple]
extends = env:STM32F103RE_maple
build_flags = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
build_flags = ${env:STM32F103RE_maple.build_flags} -DTEMP_TIMER_CHAN=4
board_build.address = 0x08007000
board_build.ldscript = creality.ld
extra_scripts = ${STM32F1_maple.extra_scripts}
extra_scripts = ${env:STM32F103RE_maple.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
debug_tool = jlink
upload_protocol = jlink
@@ -128,16 +128,16 @@ upload_protocol = jlink
#
[env:STM32F103RC_creality_maple]
extends = env:STM32F103RC_maple
build_flags = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
build_flags = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4
board_build.address = 0x08007000
board_build.ldscript = creality.ld
extra_scripts = ${STM32F1_maple.extra_scripts}
extra_scripts = ${env:STM32F103RC_maple.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
debug_tool = jlink
upload_protocol = jlink
#
# Creality (STM32F103RET6)
# Creality 512K (STM32F103RE) for new 64KiB bootloader (CR-10 Smart Pro printer)
#
[env:STM32F103RE_creality_smartPro_maple]
extends = env:STM32F103RE_creality_maple
@@ -154,14 +154,14 @@ board_build.ldscript = crealityPro.ld
extends = env:STM32F103RE_maple
board_build.address = 0x08007000
board_build.ldscript = STM32F103RE_SKR_MINI_512K.ld
build_flags = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
build_flags = ${env:STM32F103RE_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
debug_tool = stlink
upload_protocol = stlink
[env:STM32F103RE_btt_USB_maple]
extends = env:STM32F103RE_btt_maple
build_flags = ${env:STM32F103RE_btt_maple.build_flags} -DUSE_USB_COMPOSITE
lib_deps = ${STM32F1_maple.lib_deps}
lib_deps = ${env:STM32F103RE_btt_maple.lib_deps}
USBComposite for STM32F1@0.91
#
@@ -195,23 +195,23 @@ build_unflags = ${STM32F1_maple.build_unflags}
# MKS Robin Mini (STM32F103VET6)
#
[env:mks_robin_mini_maple]
extends = STM32F1_maple
board = genericSTM32F103VE
board_build.address = 0x08007000
board_build.rename = Robin_mini.bin
board_build.ldscript = mks_robin_mini.ld
build_flags = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE
extends = STM32F1_maple
board = genericSTM32F103VE
board_build.address = 0x08007000
board_build.encrypt_mks = Robin_mini.bin
board_build.ldscript = mks_robin_mini.ld
build_flags = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE
#
# MKS Robin Nano v1.x and v2 (STM32F103VET6)
#
[env:mks_robin_nano_v1v2_maple]
extends = STM32F1_maple
board = genericSTM32F103VE
board_build.address = 0x08007000
board_build.rename = Robin_nano35.bin
board_build.ldscript = mks_robin_nano.ld
build_flags = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
extends = STM32F1_maple
board = genericSTM32F103VE
board_build.address = 0x08007000
board_build.encrypt_mks = Robin_nano35.bin
board_build.ldscript = mks_robin_nano.ld
build_flags = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
#
# MKS Robin (STM32F103ZET6)
@@ -238,53 +238,52 @@ board_build.ldscript = mks_robin_pro.ld
#
[env:trigorilla_pro_maple]
extends = env:mks_robin_maple
extra_scripts = ${STM32F1_maple.extra_scripts}
#
# MKS Robin E3D (STM32F103RCT6) and
# MKS Robin E3 with TMC2209
#
[env:mks_robin_e3_maple]
extends = STM32F1_maple
board = genericSTM32F103RC
board_build.address = 0x08005000
board_build.rename = Robin_e3.bin
board_build.ldscript = mks_robin_e3.ld
build_flags = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
extends = STM32F1_maple
board = genericSTM32F103RC
board_build.address = 0x08005000
board_build.encrypt_mks = Robin_e3.bin
board_build.ldscript = mks_robin_e3.ld
build_flags = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
#
# MKS Robin E3p (STM32F103VET6)
# - LVGL UI
#
[env:mks_robin_e3p_maple]
extends = STM32F1_maple
board = genericSTM32F103VE
board_build.address = 0x08007000
board_build.rename = Robin_e3p.bin
board_build.ldscript = mks_robin_e3p.ld
build_flags = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
debug_tool = jlink
upload_protocol = jlink
extends = STM32F1_maple
board = genericSTM32F103VE
board_build.address = 0x08007000
board_build.encrypt_mks = Robin_e3p.bin
board_build.ldscript = mks_robin_e3p.ld
build_flags = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
debug_tool = jlink
upload_protocol = jlink
#
# MKS Robin Lite/Lite2 (STM32F103RCT6)
#
[env:mks_robin_lite_maple]
extends = STM32F1_maple
board = genericSTM32F103RC
board_build.address = 0x08005000
board_build.rename = mksLite.bin
board_build.ldscript = mks_robin_lite.ld
extends = STM32F1_maple
board = genericSTM32F103RC
board_build.address = 0x08005000
board_build.encrypt_mks = mksLite.bin
board_build.ldscript = mks_robin_lite.ld
#
# MKS ROBIN LITE3 (STM32F103RCT6)
#
[env:mks_robin_lite3_maple]
extends = STM32F1_maple
board = genericSTM32F103RC
board_build.address = 0x08005000
board_build.rename = mksLite3.bin
board_build.ldscript = mks_robin_lite.ld
extends = STM32F1_maple
board = genericSTM32F103RC
board_build.address = 0x08005000
board_build.encrypt_mks = mksLite3.bin
board_build.ldscript = mks_robin_lite.ld
#
# JGAurora A5S A1 (STM32F103ZET6)
@@ -352,7 +351,6 @@ build_flags = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
extends = STM32F1_maple
platform_packages = tool-stm32duino
board_build.address = 0x08005000
board_build.offset = 0x5000
board_upload.maximum_size = 237568
build_flags = ${STM32F1_maple.build_flags}
-D__STM32F1__=1 -DDEBUG_LEVEL=0 -DSS_TIMER=4 -DSERIAL_USB
@@ -393,3 +391,17 @@ board_build.variant = MARLIN_F103Vx
board_build.ldscript = eryone_ery32_mini.ld
board_build.address = 0x08004000
build_unflags = ${STM32F1_maple.build_unflags}
#
# Sovol (GD32F103RET6)
#
[env:GD32F103RET6_sovol_maple]
extends = env:STM32F103RE_maple
build_flags = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
board_build.address = 0x08007000
board_build.ldscript = sovol.ld
extra_scripts = ${STM32F1_maple.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
buildroot/share/PlatformIO/scripts/custom_board.py
debug_tool = jlink
upload_protocol = jlink