Просмотр исходного кода

🧑‍💻 Updated toolchain for ststm32@~14.1.0 (#25846)

Scott Lahteine 1 год назад
Родитель
Сommit
317450af32
3 измененных файлов с 25 добавлено и 22 удалено
  1. 1 0
      ini/stm32f4.ini
  2. 11 9
      ini/stm32g0.ini
  3. 13 13
      ini/stm32h7.ini

+ 1 - 0
ini/stm32f4.ini

@@ -733,6 +733,7 @@ upload_protocol = stlink
 extends                     = stm32_variant
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
 platform                    = ststm32@~14.1.0
 platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
 platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+                              toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_STM32F401RC
 board                       = marlin_STM32F401RC
 board_build.offset          = 0x4000
 board_build.offset          = 0x4000
 board_upload.offset_address = 0x08004000
 board_upload.offset_address = 0x08004000

+ 11 - 9
ini/stm32g0.ini

@@ -49,14 +49,15 @@ upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
 extends                     = stm32_variant
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
 platform                    = ststm32@~14.1.0
 platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
 platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+                              toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_STM32G0B1RE
 board                       = marlin_STM32G0B1RE
 board_build.offset          = 0x2000
 board_build.offset          = 0x2000
 board_upload.offset_address = 0x08002000
 board_upload.offset_address = 0x08002000
 build_flags                 = ${stm32_variant.build_flags}
 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
 upload_protocol             = stlink
 debug_tool                  = stlink
 debug_tool                  = stlink
 
 
@@ -103,15 +104,16 @@ upload_protocol = custom
 extends                     = stm32_variant
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
 platform                    = ststm32@~14.1.0
 platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
 platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+                              toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_STM32G0B1VE
 board                       = marlin_STM32G0B1VE
 board_build.offset          = 0x2000
 board_build.offset          = 0x2000
 board_upload.offset_address = 0x08002000
 board_upload.offset_address = 0x08002000
 build_flags                 = ${stm32_variant.build_flags}
 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
 upload_protocol             = stlink
 debug_tool                  = stlink
 debug_tool                  = stlink
 
 

+ 13 - 13
ini/stm32h7.ini

@@ -50,9 +50,9 @@ board                       = marlin_STM32H743Vx
 board_build.offset          = 0x20000
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
 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
                               -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
                               -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                               -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                               -DSTEP_TIMER_IRQ_PRIO=0
                               -DSTEP_TIMER_IRQ_PRIO=0
@@ -72,11 +72,11 @@ board                       = marlin_STM32H723Vx
 board_build.offset          = 0x20000
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
 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
                               -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
                               -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                               -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                               -DSTEP_TIMER_IRQ_PRIO=0
                               -DSTEP_TIMER_IRQ_PRIO=0
@@ -98,11 +98,11 @@ board                       = marlin_STM32H723Zx
 board_build.offset          = 0x20000
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
 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
                               -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
                               -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                               -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                               -DSTEP_TIMER_IRQ_PRIO=0
                               -DSTEP_TIMER_IRQ_PRIO=0