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

Andy-Big · Jul 19, 2023 · b700910 · b700910
1 parent 8684a6d
commit b700910
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
@@ -36,7 +36,9 @@ build_flags                 = ${stm32_variant.build_flags}
                               -D HAL_SRAM_MODULE_ENABLED
                               -D MOTHERBOARD=BOARD_MKS_ROBIN_NANO_V1_3_F4
 build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
+                              -D USBCON
+                              -D USBD_USE_CDC
+                              -D USBD_VID=0x0483
 debug_tool                  = jlink
 upload_protocol             = jlink
 upload.maximum_size         = 0x78000

diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
@@ -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
 
@@ -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
 

diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
@@ -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
@@ -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
@@ -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