ellensp 2 роки тому
джерело
коміт
34e6940aab

+ 28
- 27
Marlin/src/core/boards.h Переглянути файл

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

+ 2
- 0
Marlin/src/pins/pins.h Переглянути файл

@@ -587,6 +587,8 @@
587 587
   #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32
588 588
 #elif MB(RUMBA32_MKS)
589 589
   #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32
590
+#elif MB(RUMBA32_BTT)
591
+  #include "stm32f4/pins_RUMBA32_BTT.h"         // STM32F4                                env:rumba32
590 592
 #elif MB(BLACK_STM32F407VE)
591 593
   #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
592 594
 #elif MB(STEVAL_3DP001V1)

+ 0
- 1
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h Переглянути файл

@@ -195,7 +195,6 @@
195 195
 // Misc. Functions
196 196
 //
197 197
 //#define LED_PIN                           PB14
198
-//#define BTN_PIN                           PC10
199 198
 //#define PS_ON_PIN                         PE11
200 199
 //#define KILL_PIN                          PC5
201 200
 

+ 0
- 1
Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h Переглянути файл

@@ -51,7 +51,6 @@
51 51
 #if MB(RUMBA32_V1_1)
52 52
 
53 53
   #define SERVO0_PIN                        PA15
54
-  #undef BTN_PIN
55 54
 
56 55
   #if HAS_TMC_UART
57 56
     //

+ 68
- 0
Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h Переглянути файл

@@ -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

+ 0
- 1
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h Переглянути файл

@@ -134,7 +134,6 @@
134 134
 // Misc. Functions
135 135
 //
136 136
 #define LED_PIN                             PB14
137
-#define BTN_PIN                             PC10
138 137
 #define PS_ON_PIN                           PE11
139 138
 #define KILL_PIN                            PC5
140 139
 

Завантаження…
Відмінити
Зберегти