Skip to content

Commit 1068963

Browse files
thisiskeithbthisiskeithb
authored
🔨 Fix env STM32G0B1RE_btt, add …_manta_btt (#25431)
1 parent 445181f commit 1068963

File tree

8 files changed

+33
-23
lines changed

8 files changed

+33
-23
lines changed

‎Marlin/src/pins/pins.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,11 +546,11 @@
546546
#elif MB(BTT_SKR_MINI_E3_V3_0)
547547
#include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
548548
#elif MB(BTT_MANTA_M4P_V1_0)
549-
#include "stm32g0/pins_BTT_MANTA_M4P_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
549+
#include "stm32g0/pins_BTT_MANTA_M4P_V1_0.h" // STM32G0 env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
550550
#elif MB(BTT_MANTA_M5P_V1_0)
551-
#include "stm32g0/pins_BTT_MANTA_M5P_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
551+
#include "stm32g0/pins_BTT_MANTA_M5P_V1_0.h" // STM32G0 env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
552552
#elif MB(BTT_MANTA_E3_EZ_V1_0)
553-
#include "stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
553+
#include "stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h" // STM32G0 env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
554554
#elif MB(BTT_MANTA_M8P_V1_0)
555555
#include "stm32g0/pins_BTT_MANTA_M8P_V1_0.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer
556556
#elif MB(BTT_MANTA_M8P_V1_1)

‎buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ extern "C" {
280280
#define PIN_SERIAL_TX PA9
281281

282282
// Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
283-
// Used when user instantiate a hardware Serial using its peripheral name.
283+
// Used when the user instantiates a hardware Serial using its peripheral name.
284284
// Example: HardwareSerial mySerial(USART3);
285285
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
286286
#define PIN_SERIAL1_RX PA10

‎buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ extern "C" {
280280
#define PIN_SERIAL_TX PA9
281281

282282
// Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
283-
// Used when user instantiate a hardware Serial using its peripheral name.
283+
// Used when the user instantiates a hardware Serial using its peripheral name.
284284
// Example: HardwareSerial mySerial(USART3);
285285
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
286286
#define PIN_SERIAL1_RX PA10

‎buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ extern "C" {
112112
#define PIN_SERIAL_RX PA10
113113
#define PIN_SERIAL_TX PA9
114114

115-
// Used when user instanciate a hardware Serial using its peripheral name.
115+
// Used when the user instantiates a hardware Serial using its peripheral name.
116116
// Example: HardwareSerial mySerial(USART3);
117117
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
118118
#define PIN_SERIAL1_RX PA10
@@ -148,4 +148,4 @@ extern "C" {
148148
#define SERIAL_PORT_HARDWARE_OPEN Serial2
149149
#endif
150150

151-
#endif /* _VARIANT_ARDUINO_STM32_ */
151+
#endif /* _VARIANT_ARDUINO_STM32_ */

‎buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ extern "C" {
110110
#define PIN_SERIAL_RX PA10
111111
#define PIN_SERIAL_TX PA9
112112

113-
// Used when user instantiate a hardware Serial using its peripheral name.
113+
// Used when the user instantiates a hardware Serial using its peripheral name.
114114
// Example: HardwareSerial mySerial(USART3);
115115
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
116116
#define PIN_SERIAL1_RX PA10

‎buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ extern "C" {
196196
#define PIN_SERIAL_TX PA9
197197

198198
// Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
199-
// Used when user instantiate a hardware Serial using its peripheral name.
199+
// Used when the user instantiates a hardware Serial using its peripheral name.
200200
// Example: HardwareSerial mySerial(USART3);
201201
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
202202
#define PIN_SERIAL1_RX PA10

‎buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@
158158
#endif
159159

160160
// UART Definitions
161-
//#define ENABLE_HWSERIAL1 done automatically by the #define SERIAL_UART_INSTANCE below
162-
#define ENABLE_HWSERIAL3
163-
164161
#ifndef SERIAL_UART_INSTANCE
165162
#define SERIAL_UART_INSTANCE 2
166163
#endif
@@ -174,15 +171,6 @@
174171
#define PIN_SERIAL_TX PA2
175172
#endif
176173

177-
// Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
178-
// Used when user instantiate a hardware Serial using its peripheral name.
179-
// Example: HardwareSerial mySerial(USART3);
180-
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
181-
#define PIN_SERIAL1_RX PA3
182-
#define PIN_SERIAL1_TX PA2
183-
#define PIN_SERIAL3_RX PD9
184-
#define PIN_SERIAL3_TX PD8
185-
186174
/*----------------------------------------------------------------------------
187175
* Arduino objects - C++ only
188176
*----------------------------------------------------------------------------*/

‎ini/stm32g0.ini

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ upload_protocol = stlink
4141
debug_tool = stlink
4242

4343
#
44-
# BigTreeTech SKR Mini E3 V3.0 / Manta E3 EZ V1.0 / Manta M4P V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
44+
# BigTreeTech SKR Mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
4545
#
4646
[env:STM32G0B1RE_btt]
4747
extends = stm32_variant
@@ -59,7 +59,7 @@ upload_protocol = stlink
5959
debug_tool = stlink
6060

6161
#
62-
# BigTreeTech SKR Mini E3 V3.0 / Manta E3 EZ V1.0 / Manta M4P V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
62+
# BigTreeTech SKR Mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
6363
# Custom upload to SD via Marlin with Binary Protocol
6464
# Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board.
6565
# If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware.
@@ -72,6 +72,28 @@ extra_scripts = ${env:STM32G0B1RE_btt.extra_scripts}
7272
pre:buildroot/share/scripts/upload.py
7373
upload_protocol = custom
7474

75+
#
76+
# BigTreeTech Manta E3 EZ V1.0 / Manta M4P V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
77+
#
78+
[env:STM32G0B1RE_manta_btt]
79+
extends = env:STM32G0B1RE_btt
80+
build_flags = ${env:STM32G0B1RE_btt.build_flags}
81+
-DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8 -DENABLE_HWSERIAL3
82+
83+
#
84+
# BigTreeTech Manta E3 EZ V1.0 / Manta M4P V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
85+
# Custom upload to SD via Marlin with Binary Protocol
86+
# Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board.
87+
# If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware.
88+
# Currently CUSTOM_FIRMWARE_UPLOAD must also be enabled to use 'xfer' build envs.
89+
#
90+
[env:STM32G0B1RE_manta_btt_xfer]
91+
extends = env:STM32G0B1RE_manta_btt
92+
build_flags = ${env:STM32G0B1RE_manta_btt.build_flags} -DXFER_BUILD
93+
extra_scripts = ${env:STM32G0B1RE_manta_btt.extra_scripts}
94+
pre:buildroot/share/scripts/upload.py
95+
upload_protocol = custom
96+
7597
#
7698
# BigTreeTech Manta M8P V1.x (STM32G0B1VET6 ARM Cortex-M0+)
7799
#

0 commit comments

Comments
 (0)