Skip to content

Commit 9f7fac7

Browse files
ellenspNight69
authored andcommitted
✨ BOARD_RUMBA32_BTT (MarlinFirmware#22607)
1 parent 1d5a997 commit 9f7fac7

6 files changed

Lines changed: 117 additions & 43 deletions

File tree

Marlin/src/core/boards.h

Lines changed: 47 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
#define BOARD_PICA_REVB 1324 // PICA Shield (original version)
160160
#define BOARD_PICA 1325 // PICA Shield (rev C or later)
161161
#define BOARD_INTAMSYS40 1326 // Intamsys 4.0 (Funmat HT)
162+
#define BOARD_MALYAN_M180 1327 // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
162163

163164
//
164165
// ATmega1281, ATmega2561
@@ -248,7 +249,7 @@
248249
#define BOARD_BTT_SKR_V1_4_TURBO 2508 // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
249250
#define BOARD_MKS_SGEN_L_V2 2509 // MKS SGEN_L V2 (Power outputs: Hotend0, Hotend1, Bed, Fan)
250251
#define BOARD_BTT_SKR_E3_TURBO 2510 // BigTreeTech SKR E3 Turbo (Power outputs: Hotend0, Hotend1, Bed, Fan0, Fan1)
251-
#define BOARD_FLY_CDY 2511 // FLY_CDY (Power outputs: Hotend0, Hotend1, Hotend2, Bed, Fan0, Fan1, Fan2)
252+
#define BOARD_FLY_CDY 2511 // FLYmaker FLY CDY (Power outputs: Hotend0, Hotend1, Hotend2, Bed, Fan0, Fan1, Fan2)
252253

253254
//
254255
// SAM3X8E ARM Cortex M3
@@ -320,7 +321,7 @@
320321
#define BOARD_BTT_SKR_MINI_V1_1 4023 // BigTreeTech SKR Mini v1.1 (STM32F103RC)
321322
#define BOARD_BTT_SKR_MINI_E3_V1_0 4024 // BigTreeTech SKR Mini E3 (STM32F103RC)
322323
#define BOARD_BTT_SKR_MINI_E3_V1_2 4025 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
323-
#define BOARD_BTT_SKR_MINI_E3_V2_0 4026 // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC)
324+
#define BOARD_BTT_SKR_MINI_E3_V2_0 4026 // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
324325
#define BOARD_BTT_SKR_MINI_MZ_V1_0 4027 // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
325326
#define BOARD_BTT_SKR_E3_DIP 4028 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
326327
#define BOARD_BTT_SKR_CR6 4029 // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
@@ -332,18 +333,22 @@
332333
#define BOARD_CCROBOT_MEEB_3DP 4035 // ccrobot-online.com MEEB_3DP (STM32F103RC)
333334
#define BOARD_CHITU3D_V5 4036 // Chitu3D TronXY X5SA V5 Board
334335
#define BOARD_CHITU3D_V6 4037 // Chitu3D TronXY X5SA V6 Board
335-
#define BOARD_CREALITY_V4 4038 // Creality v4.x (STM32F103RE)
336-
#define BOARD_CREALITY_V427 4039 // Creality v4.2.7 (STM32F103RE)
337-
#define BOARD_CREALITY_V4210 4040 // Creality v4.2.10 (STM32F103RE) as found in the CR-30
338-
#define BOARD_CREALITY_V431 4041 // Creality v4.3.1 (STM32F103RE)
339-
#define BOARD_CREALITY_V452 4042 // Creality v4.5.2 (STM32F103RE)
340-
#define BOARD_CREALITY_V453 4043 // Creality v4.5.3 (STM32F103RE)
341-
#define BOARD_TRIGORILLA_PRO 4044 // Trigorilla Pro (STM32F103ZET6)
342-
#define BOARD_FLY_MINI 4045 // FLY MINI (STM32F103RCT6)
343-
#define BOARD_FLSUN_HISPEED 4046 // FLSUN HiSpeedV1 (STM32F103VET6)
344-
#define BOARD_BEAST 4047 // STM32F103RET6 Libmaple-based controller
345-
#define BOARD_MINGDA_MPX_ARM_MINI 4048 // STM32F103ZET6 Mingda MD-16
346-
#define BOARD_GTM32_PRO_VD 4049 // STM32F103VET6 controller
336+
#define BOARD_CHITU3D_V9 4038 // Chitu3D TronXY X5SA V9 Board
337+
#define BOARD_CREALITY_V4 4039 // Creality v4.x (STM32F103RE)
338+
#define BOARD_CREALITY_V427 4040 // Creality v4.2.7 (STM32F103RE)
339+
#define BOARD_CREALITY_V4210 4041 // Creality v4.2.10 (STM32F103RE) as found in the CR-30
340+
#define BOARD_CREALITY_V431 4042 // Creality v4.3.1 (STM32F103RE)
341+
#define BOARD_CREALITY_V452 4043 // Creality v4.5.2 (STM32F103RE)
342+
#define BOARD_CREALITY_V453 4044 // Creality v4.5.3 (STM32F103RE)
343+
#define BOARD_TRIGORILLA_PRO 4045 // Trigorilla Pro (STM32F103ZET6)
344+
#define BOARD_FLY_MINI 4046 // FLYmaker FLY MINI (STM32F103RCT6)
345+
#define BOARD_FLSUN_HISPEED 4047 // FLSUN HiSpeedV1 (STM32F103VET6)
346+
#define BOARD_BEAST 4048 // STM32F103RET6 Libmaple-based controller
347+
#define BOARD_MINGDA_MPX_ARM_MINI 4049 // STM32F103ZET6 Mingda MD-16
348+
#define BOARD_GTM32_PRO_VD 4050 // STM32F103VET6 controller
349+
#define BOARD_ZONESTAR_ZM3E2 4051 // Zonestar ZM3E2 (STM32F103RCT6)
350+
#define BOARD_ZONESTAR_ZM3E4 4052 // Zonestar ZM3E4 V1 (STM32F103VCT6)
351+
#define BOARD_ZONESTAR_ZM3E4V2 4053 // Zonestar ZM3E4 V2 (STM32F103VCT6)
347352

348353
//
349354
// ARM Cortex-M4F
@@ -360,32 +365,34 @@
360365
#define BOARD_RUMBA32_V1_0 4201 // RUMBA32 STM32F446VET6 based controller from Aus3D
361366
#define BOARD_RUMBA32_V1_1 4202 // RUMBA32 STM32F446VET6 based controller from Aus3D
362367
#define BOARD_RUMBA32_MKS 4203 // RUMBA32 STM32F446VET6 based controller from Makerbase
363-
#define BOARD_BLACK_STM32F407VE 4204 // BLACK_STM32F407VE
364-
#define BOARD_BLACK_STM32F407ZE 4205 // BLACK_STM32F407ZE
365-
#define BOARD_STEVAL_3DP001V1 4206 // STEVAL-3DP001V1 3D PRINTER BOARD
366-
#define BOARD_BTT_SKR_PRO_V1_1 4207 // BigTreeTech SKR Pro v1.1 (STM32F407ZGT6)
367-
#define BOARD_BTT_SKR_PRO_V1_2 4208 // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
368-
#define BOARD_BTT_BTT002_V1_0 4209 // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
369-
#define BOARD_BTT_E3_RRF 4210 // BigTreeTech E3 RRF (STM32F407VGT6)
370-
#define BOARD_BTT_SKR_V2_0_REV_A 4211 // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
371-
#define BOARD_BTT_SKR_V2_0_REV_B 4212 // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
372-
#define BOARD_BTT_GTR_V1_0 4213 // BigTreeTech GTR v1.0 (STM32F407IGT)
373-
#define BOARD_BTT_OCTOPUS_V1_0 4214 // BigTreeTech Octopus v1.0 (STM32F446ZET6)
374-
#define BOARD_LERDGE_K 4215 // Lerdge K (STM32F407ZG)
375-
#define BOARD_LERDGE_S 4216 // Lerdge S (STM32F407VE)
376-
#define BOARD_LERDGE_X 4217 // Lerdge X (STM32F407VE)
377-
#define BOARD_VAKE403D 4218 // VAkE 403D (STM32F446VET6)
378-
#define BOARD_FYSETC_S6 4219 // FYSETC S6 (STM32F446VET6)
379-
#define BOARD_FYSETC_S6_V2_0 4220 // FYSETC S6 v2.0 (STM32F446VET6)
380-
#define BOARD_FYSETC_SPIDER 4221 // FYSETC Spider (STM32F446VET6)
381-
#define BOARD_FLYF407ZG 4222 // FLYF407ZG (STM32F407ZG)
382-
#define BOARD_MKS_ROBIN2 4223 // MKS_ROBIN2 (STM32F407ZE)
383-
#define BOARD_MKS_ROBIN_PRO_V2 4224 // MKS Robin Pro V2 (STM32F407VE)
384-
#define BOARD_MKS_ROBIN_NANO_V3 4225 // MKS Robin Nano V3 (STM32F407VG)
385-
#define BOARD_ANET_ET4 4226 // ANET ET4 V1.x (STM32F407VGT6)
386-
#define BOARD_ANET_ET4P 4227 // ANET ET4P V1.x (STM32F407VGT6)
387-
#define BOARD_FYSETC_CHEETAH_V20 4228 // FYSETC Cheetah V2.0
388-
368+
#define BOARD_RUMBA32_BTT 4204 // RUMBA32 STM32F446VET6 based controller from BIGTREETECH
369+
#define BOARD_BLACK_STM32F407VE 4205 // BLACK_STM32F407VE
370+
#define BOARD_BLACK_STM32F407ZE 4206 // BLACK_STM32F407ZE
371+
#define BOARD_STEVAL_3DP001V1 4207 // STEVAL-3DP001V1 3D PRINTER BOARD
372+
#define BOARD_BTT_SKR_PRO_V1_1 4208 // BigTreeTech SKR Pro v1.1 (STM32F407ZGT6)
373+
#define BOARD_BTT_SKR_PRO_V1_2 4209 // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
374+
#define BOARD_BTT_BTT002_V1_0 4210 // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
375+
#define BOARD_BTT_E3_RRF 4211 // BigTreeTech E3 RRF (STM32F407VGT6)
376+
#define BOARD_BTT_SKR_V2_0_REV_A 4212 // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
377+
#define BOARD_BTT_SKR_V2_0_REV_B 4213 // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
378+
#define BOARD_BTT_GTR_V1_0 4214 // BigTreeTech GTR v1.0 (STM32F407IGT)
379+
#define BOARD_BTT_OCTOPUS_V1_0 4215 // BigTreeTech Octopus v1.0 (STM32F446ZET6)
380+
#define BOARD_BTT_OCTOPUS_V1_1 4216 // BigTreeTech Octopus v1.1 (STM32F446ZET6)
381+
#define BOARD_LERDGE_K 4217 // Lerdge K (STM32F407ZG)
382+
#define BOARD_LERDGE_S 4218 // Lerdge S (STM32F407VE)
383+
#define BOARD_LERDGE_X 4219 // Lerdge X (STM32F407VE)
384+
#define BOARD_VAKE403D 4220 // VAkE 403D (STM32F446VET6)
385+
#define BOARD_FYSETC_S6 4221 // FYSETC S6 (STM32F446VET6)
386+
#define BOARD_FYSETC_S6_V2_0 4222 // FYSETC S6 v2.0 (STM32F446VET6)
387+
#define BOARD_FYSETC_SPIDER 4223 // FYSETC Spider (STM32F446VET6)
388+
#define BOARD_FLYF407ZG 4224 // FLYmaker FLYF407ZG (STM32F407ZG)
389+
#define BOARD_MKS_ROBIN2 4225 // MKS_ROBIN2 (STM32F407ZE)
390+
#define BOARD_MKS_ROBIN_PRO_V2 4226 // MKS Robin Pro V2 (STM32F407VE)
391+
#define BOARD_MKS_ROBIN_NANO_V3 4227 // MKS Robin Nano V3 (STM32F407VG)
392+
#define BOARD_MKS_MONSTER8 4228 // MKS Monster8 (STM32F407VGT6)
393+
#define BOARD_ANET_ET4 4229 // ANET ET4 V1.x (STM32F407VGT6)
394+
#define BOARD_ANET_ET4P 4230 // ANET ET4P V1.x (STM32F407VGT6)
395+
#define BOARD_FYSETC_CHEETAH_V20 4231 // FYSETC Cheetah V2.0
389396

390397
//
391398
// ARM Cortex M7

Marlin/src/pins/pins.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,8 @@
582582
#include "stm32f4/pins_RUMBA32_AUS3D.h" // STM32F4 env:rumba32
583583
#elif MB(RUMBA32_MKS)
584584
#include "stm32f4/pins_RUMBA32_MKS.h" // STM32F4 env:rumba32
585+
#elif MB(RUMBA32_BTT)
586+
#include "stm32f4/pins_RUMBA32_BTT.h" // STM32F4 env:rumba32
585587
#elif MB(BLACK_STM32F407VE)
586588
#include "stm32f4/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black
587589
#elif MB(STEVAL_3DP001V1)

Marlin/src/pins/stm32f4/pins_FYSETC_S6.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
// Misc. Functions
196196
//
197197
//#define LED_PIN PB14
198-
//#define BTN_PIN PC10
199198
//#define PS_ON_PIN PE11
200199
//#define KILL_PIN PC5
201200

Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#if MB(RUMBA32_V1_1)
5252

5353
#define SERVO0_PIN PA15
54-
#undef BTN_PIN
5554

5655
#if HAS_TMC_UART
5756
//
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
23+
/**
24+
* No offical schematics have been found.
25+
* But these differences where noted in https://github.com/bigtreetech/Rumba32/issues/1
26+
*/
27+
28+
#pragma once
29+
30+
#define BOARD_INFO_NAME "RUMBA32 (BTT)"
31+
32+
#if NO_EEPROM_SELECTED
33+
#define I2C_EEPROM
34+
#define MARLIN_EEPROM_SIZE 0x2000 // 8KB (24LC64T-I/OT)
35+
#endif
36+
37+
#if ENABLED(FLASH_EEPROM_EMULATION)
38+
// Decrease delays and flash wear by spreading writes across the
39+
// 128 kB sector allocated for EEPROM emulation.
40+
#define FLASH_EEPROM_LEVELING
41+
#endif
42+
43+
#include "pins_RUMBA32_common.h"
44+
45+
#define SERVO0_PIN PA15 // Pin is not broken out, is a test point only.
46+
47+
#if HAS_TMC_UART
48+
//
49+
// TMC2208/TMC2209 Software Serial
50+
//
51+
#define X_SERIAL_TX_PIN PC14 // BTT Rumba32 only uses 1 pin for UART
52+
#define X_SERIAL_RX_PIN X_SERIAL_TX_PIN
53+
54+
#define Y_SERIAL_TX_PIN PE4
55+
#define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN
56+
57+
#define Z_SERIAL_TX_PIN PE0
58+
#define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN
59+
60+
#define E0_SERIAL_TX_PIN PC13
61+
#define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN
62+
63+
#define E1_SERIAL_TX_PIN PD5
64+
#define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN
65+
66+
#define E2_SERIAL_TX_PIN PD1
67+
#define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN
68+
#endif

Marlin/src/pins/stm32f4/pins_RUMBA32_common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
// Misc. Functions
135135
//
136136
#define LED_PIN PB14
137-
#define BTN_PIN PC10
138137
#define PS_ON_PIN PE11
139138
#define KILL_PIN PC5
140139

0 commit comments

Comments
 (0)