浏览代码

Board IDs for G2560 Rev B, G2560 v4, GTM32 VD (#21499)

Vert 4 年前
父节点
当前提交
05b39623b0
没有帐户链接到提交者的电子邮件

+ 14
- 11
Marlin/src/core/boards.h 查看文件

146
 #define BOARD_ELEFU_3                 1311  // Elefu Ra Board (v3)
146
 #define BOARD_ELEFU_3                 1311  // Elefu Ra Board (v3)
147
 #define BOARD_LEAPFROG                1312  // Leapfrog
147
 #define BOARD_LEAPFROG                1312  // Leapfrog
148
 #define BOARD_MEGACONTROLLER          1313  // Mega controller
148
 #define BOARD_MEGACONTROLLER          1313  // Mega controller
149
-#define BOARD_GT2560_REV_A            1314  // Geeetech GT2560 Rev. A
150
-#define BOARD_GT2560_REV_A_PLUS       1315  // Geeetech GT2560 Rev. A+ (with auto level probe)
151
-#define BOARD_GT2560_V3               1316  // Geeetech GT2560 Rev B for A10(M/D)
152
-#define BOARD_GT2560_V3_MC2           1317  // Geeetech GT2560 Rev B for Mecreator2
153
-#define BOARD_GT2560_V3_A20           1318  // Geeetech GT2560 Rev B for A20(M/D)
154
-#define BOARD_EINSTART_S              1319  // Einstart retrofit
155
-#define BOARD_WANHAO_ONEPLUS          1320  // Wanhao 0ne+ i3 Mini
156
-#define BOARD_LEAPFROG_XEED2015       1321  // Leapfrog Xeed 2015
157
-#define BOARD_PICA_REVB               1322  // PICA Shield (original version)
158
-#define BOARD_PICA                    1323  // PICA Shield (rev C or later)
159
-#define BOARD_INTAMSYS40              1324  // Intamsys 4.0 (Funmat HT)
149
+#define BOARD_GT2560_REV_A            1314  // Geeetech GT2560 Rev A
150
+#define BOARD_GT2560_REV_A_PLUS       1315  // Geeetech GT2560 Rev A+ (with auto level probe)
151
+#define BOARD_GT2560_REV_B            1316  // Geeetech GT2560 Rev B
152
+#define BOARD_GT2560_V3               1317  // Geeetech GT2560 Rev B for A10(M/D)
153
+#define BOARD_GT2560_V4               1318  // Geeetech GT2560 Rev B for A10(M/D)
154
+#define BOARD_GT2560_V3_MC2           1319  // Geeetech GT2560 Rev B for Mecreator2
155
+#define BOARD_GT2560_V3_A20           1320  // Geeetech GT2560 Rev B for A20(M/D)
156
+#define BOARD_EINSTART_S              1321  // Einstart retrofit
157
+#define BOARD_WANHAO_ONEPLUS          1322  // Wanhao 0ne+ i3 Mini
158
+#define BOARD_LEAPFROG_XEED2015       1323  // Leapfrog Xeed 2015
159
+#define BOARD_PICA_REVB               1324  // PICA Shield (original version)
160
+#define BOARD_PICA                    1325  // PICA Shield (rev C or later)
161
+#define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
160
 
162
 
161
 //
163
 //
162
 // ATmega1281, ATmega2561
164
 // ATmega1281, ATmega2561
341
 #define BOARD_FLSUN_HISPEED           4046  // FLSUN HiSpeedV1 (STM32F103VET6)
343
 #define BOARD_FLSUN_HISPEED           4046  // FLSUN HiSpeedV1 (STM32F103VET6)
342
 #define BOARD_BEAST                   4047  // STM32F103RET6 Libmaple-based controller
344
 #define BOARD_BEAST                   4047  // STM32F103RET6 Libmaple-based controller
343
 #define BOARD_MINGDA_MPX_ARM_MINI     4048  // STM32F103ZET6 Mingda MD-16
345
 #define BOARD_MINGDA_MPX_ARM_MINI     4048  // STM32F103ZET6 Mingda MD-16
346
+#define BOARD_GTM32_PRO_VD            4049  // STM32F103VET6 controller
344
 
347
 
345
 //
348
 //
346
 // ARM Cortex-M4F
349
 // ARM Cortex-M4F

+ 30
- 0
Marlin/src/pins/mega/pins_GT2560_REV_B.h 查看文件

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2021 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
+#pragma once
23
+
24
+/**
25
+ * Geeetech GT2560 Rev B Pins
26
+ */
27
+
28
+#define BOARD_INFO_NAME "GT2560 Rev B"
29
+
30
+#include "pins_GT2560_V3.h"

+ 4
- 2
Marlin/src/pins/mega/pins_GT2560_V3.h 查看文件

22
 #pragma once
22
 #pragma once
23
 
23
 
24
 /**
24
 /**
25
- * Geeetech GT2560 RevB + GT2560 3.0/3.1 + GT2560 4.0/4.1 pin assignments
25
+ * Geeetech GT2560 3.0/3.1 pin assignments
26
+ *
27
+ * Also GT2560 RevB and GT2560 4.0/4.1
26
  */
28
  */
27
 
29
 
28
 #define ALLOW_MEGA1280
30
 #define ALLOW_MEGA1280
29
 #include "env_validate.h"
31
 #include "env_validate.h"
30
 
32
 
31
 #ifndef BOARD_INFO_NAME
33
 #ifndef BOARD_INFO_NAME
32
-  #define BOARD_INFO_NAME "GT2560 RevB/3.x/4.x"
34
+  #define BOARD_INFO_NAME "GT2560 3.x"
33
 #endif
35
 #endif
34
 
36
 
35
 //
37
 //

+ 30
- 0
Marlin/src/pins/mega/pins_GT2560_V4.h 查看文件

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2021 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
+#pragma once
23
+
24
+/**
25
+ * Geeetech GT2560 V4.X Pins
26
+ */
27
+
28
+#define BOARD_INFO_NAME "GT2560 4.x"
29
+
30
+#include "pins_GT2560_V3.h"

+ 6
- 0
Marlin/src/pins/pins.h 查看文件

244
   #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
244
   #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
245
 #elif MB(GT2560_V3)
245
 #elif MB(GT2560_V3)
246
   #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:mega2560
246
   #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:mega2560
247
+#elif MB(GT2560_REV_B)
248
+  #include "mega/pins_GT2560_REV_B.h"           // ATmega2560                             env:mega2560
249
+#elif MB(GT2560_V4)
250
+  #include "mega/pins_GT2560_V4.h"              // ATmega2560                             env:mega2560
247
 #elif MB(GT2560_V3_MC2)
251
 #elif MB(GT2560_V3_MC2)
248
   #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:mega2560
252
   #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:mega2560
249
 #elif MB(GT2560_V3_A20)
253
 #elif MB(GT2560_V3_A20)
470
   #include "stm32f1/pins_STM3R_MINI.h"          // STM32F1                                env:STM32F103RE
474
   #include "stm32f1/pins_STM3R_MINI.h"          // STM32F1                                env:STM32F103RE
471
 #elif MB(GTM32_PRO_VB)
475
 #elif MB(GTM32_PRO_VB)
472
   #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F1                                env:STM32F103RE
476
   #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F1                                env:STM32F103RE
477
+#elif MB(GTM32_PRO_VD)
478
+  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F1                                env:STM32F103RE
473
 #elif MB(GTM32_MINI)
479
 #elif MB(GTM32_MINI)
474
   #include "stm32f1/pins_GTM32_MINI.h"          // STM32F1                                env:STM32F103RE
480
   #include "stm32f1/pins_GTM32_MINI.h"          // STM32F1                                env:STM32F103RE
475
 #elif MB(GTM32_MINI_A30)
481
 #elif MB(GTM32_MINI_A30)

+ 6
- 2
Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h 查看文件

22
 #pragma once
22
 #pragma once
23
 
23
 
24
 /**
24
 /**
25
- * Geeetech GTM32 Pro VB/VD board pin assignments
25
+ * Geeetech GTM32 Pro VB board pin assignments
26
  * http://www.geeetech.com/wiki/index.php/File:Hardware_GTM32_PRO_VB.pdf
26
  * http://www.geeetech.com/wiki/index.php/File:Hardware_GTM32_PRO_VB.pdf
27
+ *
28
+ * Also applies to GTM32 Pro VD
27
  */
29
  */
28
 
30
 
29
 #include "env_validate.h"
31
 #include "env_validate.h"
30
 
32
 
31
-#define BOARD_INFO_NAME      "GTM32 Pro VB/VD"
33
+#ifndef BOARD_INFO_NAME
34
+  #define BOARD_INFO_NAME    "GTM32 Pro VB"
35
+#endif
32
 #define DEFAULT_MACHINE_NAME "STM32F103VET6"
36
 #define DEFAULT_MACHINE_NAME "STM32F103VET6"
33
 
37
 
34
 #define BOARD_NO_NATIVE_USB
38
 #define BOARD_NO_NATIVE_USB

+ 30
- 0
Marlin/src/pins/stm32f1/pins_GTM32_PRO_VD.h 查看文件

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2021 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
+#pragma once
23
+
24
+/**
25
+ * Geeetech GTM32 Pro VD board pin assignments
26
+ */
27
+
28
+#define BOARD_INFO_NAME "GTM32 Pro VD"
29
+
30
+#include "pins_GTM32_PRO_VB.h"

正在加载...
取消
保存