Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More reliable toolchain for ststm32@~14.1.0 ? #25846

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ini/stm32f4.ini
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,7 @@ upload_protocol = stlink
extends = stm32_variant
platform = ststm32@~14.1.0
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
[email protected]
board = marlin_STM32F401RC
board_build.offset = 0x4000
board_upload.offset_address = 0x08004000
Expand Down
20 changes: 11 additions & 9 deletions ini/stm32g0.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ upload_command = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
extends = stm32_variant
platform = ststm32@~14.1.0
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
[email protected]
board = marlin_STM32G0B1RE
board_build.offset = 0x2000
board_upload.offset_address = 0x08002000
build_flags = ${stm32_variant.build_flags}
-DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
-DSTEP_TIMER_IRQ_PRIO=0
-DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
-DSTEP_TIMER_IRQ_PRIO=0
upload_protocol = stlink
debug_tool = stlink

Expand Down Expand Up @@ -103,15 +104,16 @@ upload_protocol = custom
extends = stm32_variant
platform = ststm32@~14.1.0
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
[email protected]
board = marlin_STM32G0B1VE
board_build.offset = 0x2000
board_upload.offset_address = 0x08002000
build_flags = ${stm32_variant.build_flags}
-DPIN_SERIAL4_RX=PE_9 -DPIN_SERIAL4_TX=PE_8
-DPIN_SERIAL5_RX=PE_11 -DPIN_SERIAL5_TX=PE_10
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
-DSTEP_TIMER_IRQ_PRIO=0
-DPIN_SERIAL4_RX=PE_9 -DPIN_SERIAL4_TX=PE_8
-DPIN_SERIAL5_RX=PE_11 -DPIN_SERIAL5_TX=PE_10
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
-DSTEP_TIMER_IRQ_PRIO=0
upload_protocol = stlink
debug_tool = stlink

Expand Down
26 changes: 13 additions & 13 deletions ini/stm32h7.ini
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ board = marlin_STM32H743Vx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
build_flags = ${stm32_variant.build_flags}
-DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-DPIN_SERIAL1_TX=PA_9 -DPIN_SERIAL1_RX=PA_10
-DPIN_SERIAL3_TX=PD_8 -DPIN_SERIAL3_RX=PD_9
-DPIN_SERIAL4_TX=PA_0 -DPIN_SERIAL4_RX=PA_1
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
-DSTEP_TIMER_IRQ_PRIO=0
Expand All @@ -72,11 +72,11 @@ board = marlin_STM32H723Vx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
build_flags = ${stm32_variant.build_flags}
-DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-DPIN_SERIAL2_RX=PD_6 -DPIN_SERIAL2_TX=PD_5
-DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-DPIN_SERIAL7_RX=PE_7 -DPIN_SERIAL7_TX=PE_8
-DPIN_SERIAL1_TX=PA_9 -DPIN_SERIAL1_RX=PA_10
-DPIN_SERIAL2_TX=PD_5 -DPIN_SERIAL2_RX=PD_6
-DPIN_SERIAL3_TX=PD_8 -DPIN_SERIAL3_RX=PD_9
-DPIN_SERIAL4_TX=PA_0 -DPIN_SERIAL4_RX=PA_1
-DPIN_SERIAL7_TX=PE_8 -DPIN_SERIAL7_RX=PE_7
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
-DSTEP_TIMER_IRQ_PRIO=0
Expand All @@ -98,11 +98,11 @@ board = marlin_STM32H723Zx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
build_flags = ${stm32_variant.build_flags}
-DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-DPIN_SERIAL2_RX=PD_6 -DPIN_SERIAL2_TX=PD_5
-DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-DPIN_SERIAL7_RX=PE_7 -DPIN_SERIAL7_TX=PE_8
-DPIN_SERIAL1_TX=PA_9 -DPIN_SERIAL1_RX=PA_10
-DPIN_SERIAL2_TX=PD_5 -DPIN_SERIAL2_RX=PD_6
-DPIN_SERIAL3_TX=PD_8 -DPIN_SERIAL3_RX=PD_9
-DPIN_SERIAL4_TX=PA_0 -DPIN_SERIAL4_RX=PA_1
-DPIN_SERIAL7_TX=PE_8 -DPIN_SERIAL7_RX=PE_7
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
-DSTEP_TIMER_IRQ_PRIO=0
Expand Down