Przeglądaj źródła

Add MKS Base 1.6 board (#16783)

thisiskeithb 4 lat temu
rodzic
commit
9b4192cdd0
No account linked to committer's email address

+ 45
- 40
Marlin/Makefile Wyświetl plik

@@ -180,88 +180,93 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1105)
180 180
 else ifeq ($(HARDWARE_MOTHERBOARD),1106)
181 181
 # MKS v1.5 with Allegro A4982 stepper drivers
182 182
 else ifeq ($(HARDWARE_MOTHERBOARD),1107)
183
-# MKS BASE 1.0 with Heroic HR4982 stepper drivers
183
+# MKS v1.6 with Allegro A4982 stepper drivers
184 184
 else ifeq ($(HARDWARE_MOTHERBOARD),1108)
185
-# MKS GEN v1.3 or 1.4
185
+
186
+# MKS BASE 1.0 with Heroic HR4982 stepper drivers
186 187
 else ifeq ($(HARDWARE_MOTHERBOARD),1109)
187
-# MKS GEN L
188
+# MKS GEN v1.3 or 1.4
188 189
 else ifeq ($(HARDWARE_MOTHERBOARD),1110)
189
-# zrib V2.0 control board (Chinese knock off RAMPS replica)
190
+# MKS GEN L
190 191
 else ifeq ($(HARDWARE_MOTHERBOARD),1111)
191
-# BigTreeTech or BIQU KFB2.0
192
+# zrib V2.0 control board (Chinese knock off RAMPS replica)
192 193
 else ifeq ($(HARDWARE_MOTHERBOARD),1112)
193
-# Felix 2.0+ Electronics Board (RAMPS like)
194
+# BigTreeTech or BIQU KFB2.0
194 195
 else ifeq ($(HARDWARE_MOTHERBOARD),1113)
195
-# Invent-A-Part RigidBoard
196
+# Felix 2.0+ Electronics Board (RAMPS like)
196 197
 else ifeq ($(HARDWARE_MOTHERBOARD),1114)
197
-# Invent-A-Part RigidBoard V2
198
+# Invent-A-Part RigidBoard
198 199
 else ifeq ($(HARDWARE_MOTHERBOARD),1115)
199
-# Sainsmart 2-in-1 board
200
+# Invent-A-Part RigidBoard V2
200 201
 else ifeq ($(HARDWARE_MOTHERBOARD),1116)
201
-# Ultimaker
202
+# Sainsmart 2-in-1 board
202 203
 else ifeq ($(HARDWARE_MOTHERBOARD),1117)
203
-# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
204
+# Ultimaker
204 205
 else ifeq ($(HARDWARE_MOTHERBOARD),1118)
206
+# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
207
+else ifeq ($(HARDWARE_MOTHERBOARD),1119)
205 208
   MCU ?= atmega1280
206 209
 
207 210
 # Azteeg X3
208
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
209
-# Azteeg X3 Pro
210 211
 else ifeq ($(HARDWARE_MOTHERBOARD),1120)
211
-# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
212
+# Azteeg X3 Pro
212 213
 else ifeq ($(HARDWARE_MOTHERBOARD),1121)
213
-# Rumba
214
+# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
214 215
 else ifeq ($(HARDWARE_MOTHERBOARD),1122)
215
-# Raise3D Rumba
216
+# Rumba
216 217
 else ifeq ($(HARDWARE_MOTHERBOARD),1123)
217
-# Rapide Lite RL200 Rumba
218
+# Raise3D Rumba
218 219
 else ifeq ($(HARDWARE_MOTHERBOARD),1124)
219
-# Formbot T-Rex 2 Plus
220
+# Rapide Lite RL200 Rumba
220 221
 else ifeq ($(HARDWARE_MOTHERBOARD),1125)
221
-# Formbot T-Rex 3
222
+# Formbot T-Rex 2 Plus
222 223
 else ifeq ($(HARDWARE_MOTHERBOARD),1126)
223
-# Formbot Raptor
224
+# Formbot T-Rex 3
224 225
 else ifeq ($(HARDWARE_MOTHERBOARD),1127)
225
-# Formbot Raptor 2
226
+# Formbot Raptor
226 227
 else ifeq ($(HARDWARE_MOTHERBOARD),1128)
227
-# bq ZUM Mega 3D
228
+# Formbot Raptor 2
228 229
 else ifeq ($(HARDWARE_MOTHERBOARD),1129)
229
-# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
230
+# bq ZUM Mega 3D
230 231
 else ifeq ($(HARDWARE_MOTHERBOARD),1130)
231
-# TriGorilla Anycubic version 1.3 based on RAMPS EFB
232
+# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
232 233
 else ifeq ($(HARDWARE_MOTHERBOARD),1131)
233
-# TriGorilla Anycubic version 1.4 based on RAMPS EFB
234
+# TriGorilla Anycubic version 1.3 based on RAMPS EFB
234 235
 else ifeq ($(HARDWARE_MOTHERBOARD),1132)
235
-# TriGorilla Anycubic version 1.4 Rev 1.1
236
+# TriGorilla Anycubic version 1.4 based on RAMPS EFB
236 237
 else ifeq ($(HARDWARE_MOTHERBOARD),1133)
237
-# Creality: Ender-4, CR-8
238
+# TriGorilla Anycubic version 1.4 Rev 1.1
238 239
 else ifeq ($(HARDWARE_MOTHERBOARD),1134)
239
-# Creality: CR10S, CR20, CR-X
240
+# Creality: Ender-4, CR-8
240 241
 else ifeq ($(HARDWARE_MOTHERBOARD),1135)
241
-# Dagoma F5
242
+# Creality: CR10S, CR20, CR-X
242 243
 else ifeq ($(HARDWARE_MOTHERBOARD),1136)
243
-# FYSETC F6
244
+# Dagoma F5
244 245
 else ifeq ($(HARDWARE_MOTHERBOARD),1137)
245
-# Duplicator i3 Plus
246
+# FYSETC F6 1.3
246 247
 else ifeq ($(HARDWARE_MOTHERBOARD),1138)
247
-# VORON
248
+# FYSETC F6 1.5
248 249
 else ifeq ($(HARDWARE_MOTHERBOARD),1139)
249
-# TRONXY V3 1.0
250
+# Duplicator i3 Plus
250 251
 else ifeq ($(HARDWARE_MOTHERBOARD),1140)
251
-# Z-Bolt X Series
252
+# VORON
252 253
 else ifeq ($(HARDWARE_MOTHERBOARD),1141)
253
-# TT OSCAR
254
+# TRONXY V3 1.0
254 255
 else ifeq ($(HARDWARE_MOTHERBOARD),1142)
255
-# Overlord/Overlord Pro
256
+# Z-Bolt X Series
256 257
 else ifeq ($(HARDWARE_MOTHERBOARD),1143)
257
-# ADIMLab Gantry v1
258
+# TT OSCAR
258 259
 else ifeq ($(HARDWARE_MOTHERBOARD),1144)
259
-# ADIMLab Gantry v2
260
+# Overlord/Overlord Pro
260 261
 else ifeq ($(HARDWARE_MOTHERBOARD),1145)
261
-# BIQU Tango V1
262
+# ADIMLab Gantry v1
262 263
 else ifeq ($(HARDWARE_MOTHERBOARD),1146)
263
-# MKS GEN L V2
264
+# ADIMLab Gantry v2
264 265
 else ifeq ($(HARDWARE_MOTHERBOARD),1147)
266
+# BIQU Tango V1
267
+else ifeq ($(HARDWARE_MOTHERBOARD),1148)
268
+# MKS GEN L V2
269
+else ifeq ($(HARDWARE_MOTHERBOARD),1149)
265 270
 
266 271
 #
267 272
 # RAMBo and derivatives

+ 44
- 43
Marlin/src/core/boards.h Wyświetl plik

@@ -59,49 +59,50 @@
59 59
 #define BOARD_BAM_DICE                1103  // 2PrintBeta BAM&DICE with STK drivers
60 60
 #define BOARD_BAM_DICE_DUE            1104  // 2PrintBeta BAM&DICE Due with STK drivers
61 61
 #define BOARD_MKS_BASE                1105  // MKS BASE v1.0
62
-#define BOARD_MKS_BASE_14             1106  // MKS v1.4 with A4982 stepper drivers
63
-#define BOARD_MKS_BASE_15             1107  // MKS v1.5 with Allegro A4982 stepper drivers
64
-#define BOARD_MKS_BASE_HEROIC         1108  // MKS BASE 1.0 with Heroic HR4982 stepper drivers
65
-#define BOARD_MKS_GEN_13              1109  // MKS GEN v1.3 or 1.4
66
-#define BOARD_MKS_GEN_L               1110  // MKS GEN L
67
-#define BOARD_KFB_2                   1111  // BigTreeTech or BIQU KFB2.0
68
-#define BOARD_ZRIB_V20                1112  // zrib V2.0 control board (Chinese knock off RAMPS replica)
69
-#define BOARD_FELIX2                  1113  // Felix 2.0+ Electronics Board (RAMPS like)
70
-#define BOARD_RIGIDBOARD              1114  // Invent-A-Part RigidBoard
71
-#define BOARD_RIGIDBOARD_V2           1115  // Invent-A-Part RigidBoard V2
72
-#define BOARD_SAINSMART_2IN1          1116  // Sainsmart 2-in-1 board
73
-#define BOARD_ULTIMAKER               1117  // Ultimaker
74
-#define BOARD_ULTIMAKER_OLD           1118  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
75
-#define BOARD_AZTEEG_X3               1119  // Azteeg X3
76
-#define BOARD_AZTEEG_X3_PRO           1120  // Azteeg X3 Pro
77
-#define BOARD_ULTIMAIN_2              1121  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
78
-#define BOARD_RUMBA                   1122  // Rumba
79
-#define BOARD_RUMBA_RAISE3D           1123  // Raise3D N series Rumba derivative
80
-#define BOARD_RL200                   1124  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
81
-#define BOARD_FORMBOT_TREX2PLUS       1125  // Formbot T-Rex 2 Plus
82
-#define BOARD_FORMBOT_TREX3           1126  // Formbot T-Rex 3
83
-#define BOARD_FORMBOT_RAPTOR          1127  // Formbot Raptor
84
-#define BOARD_FORMBOT_RAPTOR2         1128  // Formbot Raptor 2
85
-#define BOARD_BQ_ZUM_MEGA_3D          1129  // bq ZUM Mega 3D
86
-#define BOARD_MAKEBOARD_MINI          1130  // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
87
-#define BOARD_TRIGORILLA_13           1131  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
88
-#define BOARD_TRIGORILLA_14           1132  //   ... Ver 1.4
89
-#define BOARD_TRIGORILLA_14_11        1133  //   ... Rev 1.1 (new servo pin order)
90
-#define BOARD_RAMPS_ENDER_4           1134  // Creality: Ender-4, CR-8
91
-#define BOARD_RAMPS_CREALITY          1135  // Creality: CR10S, CR20, CR-X
92
-#define BOARD_RAMPS_DAGOMA            1136  // Dagoma F5
93
-#define BOARD_FYSETC_F6_13            1137  // FYSETC F6 1.3
94
-#define BOARD_FYSETC_F6_14            1138  // FYSETC F6 1.4
95
-#define BOARD_DUPLICATOR_I3_PLUS      1139  // Wanhao Duplicator i3 Plus
96
-#define BOARD_VORON                   1140  // VORON Design
97
-#define BOARD_TRONXY_V3_1_0           1141  // Tronxy TRONXY-V3-1.0
98
-#define BOARD_Z_BOLT_X_SERIES         1142  // Z-Bolt X Series
99
-#define BOARD_TT_OSCAR                1143  // TT OSCAR
100
-#define BOARD_OVERLORD                1144  // Overlord/Overlord Pro
101
-#define BOARD_HJC2560C_REV1           1145  // ADIMLab Gantry v1
102
-#define BOARD_HJC2560C_REV2           1146  // ADIMLab Gantry v2
103
-#define BOARD_TANGO                   1147  // BIQU Tango V1
104
-#define BOARD_MKS_GEN_L_V2            1148  // MKS GEN L V2
62
+#define BOARD_MKS_BASE_14             1106  // MKS BASE v1.4 with Allegro A4982 stepper drivers
63
+#define BOARD_MKS_BASE_15             1107  // MKS BASE v1.5 with Allegro A4982 stepper drivers
64
+#define BOARD_MKS_BASE_16             1108  // MKS BASE v1.6 with Allegro A4982 stepper drivers
65
+#define BOARD_MKS_BASE_HEROIC         1109  // MKS BASE 1.0 with Heroic HR4982 stepper drivers
66
+#define BOARD_MKS_GEN_13              1110  // MKS GEN v1.3 or 1.4
67
+#define BOARD_MKS_GEN_L               1111  // MKS GEN L
68
+#define BOARD_KFB_2                   1112  // BigTreeTech or BIQU KFB2.0
69
+#define BOARD_ZRIB_V20                1113  // zrib V2.0 control board (Chinese knock off RAMPS replica)
70
+#define BOARD_FELIX2                  1114  // Felix 2.0+ Electronics Board (RAMPS like)
71
+#define BOARD_RIGIDBOARD              1115  // Invent-A-Part RigidBoard
72
+#define BOARD_RIGIDBOARD_V2           1116  // Invent-A-Part RigidBoard V2
73
+#define BOARD_SAINSMART_2IN1          1117  // Sainsmart 2-in-1 board
74
+#define BOARD_ULTIMAKER               1118  // Ultimaker
75
+#define BOARD_ULTIMAKER_OLD           1119  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
76
+#define BOARD_AZTEEG_X3               1120  // Azteeg X3
77
+#define BOARD_AZTEEG_X3_PRO           1121  // Azteeg X3 Pro
78
+#define BOARD_ULTIMAIN_2              1122  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
79
+#define BOARD_RUMBA                   1123  // Rumba
80
+#define BOARD_RUMBA_RAISE3D           1124  // Raise3D N series Rumba derivative
81
+#define BOARD_RL200                   1125  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
82
+#define BOARD_FORMBOT_TREX2PLUS       1126  // Formbot T-Rex 2 Plus
83
+#define BOARD_FORMBOT_TREX3           1127  // Formbot T-Rex 3
84
+#define BOARD_FORMBOT_RAPTOR          1128  // Formbot Raptor
85
+#define BOARD_FORMBOT_RAPTOR2         1129  // Formbot Raptor 2
86
+#define BOARD_BQ_ZUM_MEGA_3D          1130  // bq ZUM Mega 3D
87
+#define BOARD_MAKEBOARD_MINI          1131  // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
88
+#define BOARD_TRIGORILLA_13           1132  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
89
+#define BOARD_TRIGORILLA_14           1133  //   ... Ver 1.4
90
+#define BOARD_TRIGORILLA_14_11        1134  //   ... Rev 1.1 (new servo pin order)
91
+#define BOARD_RAMPS_ENDER_4           1135  // Creality: Ender-4, CR-8
92
+#define BOARD_RAMPS_CREALITY          1136  // Creality: CR10S, CR20, CR-X
93
+#define BOARD_RAMPS_DAGOMA            1137  // Dagoma F5
94
+#define BOARD_FYSETC_F6_13            1138  // FYSETC F6 1.3
95
+#define BOARD_FYSETC_F6_14            1139  // FYSETC F6 1.4
96
+#define BOARD_DUPLICATOR_I3_PLUS      1140  // Wanhao Duplicator i3 Plus
97
+#define BOARD_VORON                   1141  // VORON Design
98
+#define BOARD_TRONXY_V3_1_0           1142  // Tronxy TRONXY-V3-1.0
99
+#define BOARD_Z_BOLT_X_SERIES         1143  // Z-Bolt X Series
100
+#define BOARD_TT_OSCAR                1144  // TT OSCAR
101
+#define BOARD_OVERLORD                1145  // Overlord/Overlord Pro
102
+#define BOARD_HJC2560C_REV1           1146  // ADIMLab Gantry v1
103
+#define BOARD_HJC2560C_REV2           1147  // ADIMLab Gantry v2
104
+#define BOARD_TANGO                   1148  // BIQU Tango V1
105
+#define BOARD_MKS_GEN_L_V2            1149  // MKS GEN L V2
105 106
 
106 107
 //
107 108
 // RAMBo and derivatives

+ 2
- 0
Marlin/src/pins/pins.h Wyświetl plik

@@ -110,6 +110,8 @@
110 110
   #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
111 111
 #elif MB(MKS_BASE_15)
112 112
   #include "ramps/pins_MKS_BASE_15.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
113
+#elif MB(MKS_BASE_16)
114
+  #include "ramps/pins_MKS_BASE_16.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
113 115
 #elif MB(MKS_BASE_HEROIC)
114 116
   #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
115 117
 #elif MB(MKS_GEN_13)

+ 3
- 1
Marlin/src/pins/ramps/pins_MKS_BASE.h Wyświetl plik

@@ -31,7 +31,9 @@
31 31
   #error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
32 32
 #endif
33 33
 
34
-#define BOARD_INFO_NAME "MKS BASE 1.0"
34
+#ifndef BOARD_INFO_NAME
35
+  #define BOARD_INFO_NAME "MKS BASE 1.0"
36
+#endif
35 37
 
36 38
 //
37 39
 // Heaters / Fans

+ 1
- 1
Marlin/src/pins/ramps/pins_MKS_BASE_14.h Wyświetl plik

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * MKS BASE v1.4
25
+ * MKS BASE v1.4 with A4982 stepper drivers and digital micro-stepping
26 26
  */
27 27
 
28 28
 #if HOTENDS > 2 || E_STEPPERS > 2

+ 6
- 0
Marlin/src/pins/ramps/pins_MKS_BASE_15.h Wyświetl plik

@@ -25,6 +25,12 @@
25 25
  * MKS BASE v1.5 with A4982 stepper drivers and digital micro-stepping
26 26
  */
27 27
 
28
+#if HOTENDS > 2 || E_STEPPERS > 2
29
+  #error "MKS BASE 1.5 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
30
+#endif
31
+
32
+#define BOARD_INFO_NAME "MKS BASE 1.5"
33
+
28 34
 #include "pins_MKS_BASE.h"
29 35
 
30 36
 /**

+ 48
- 0
Marlin/src/pins/ramps/pins_MKS_BASE_16.h Wyświetl plik

@@ -0,0 +1,48 @@
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 <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+/**
25
+ * MKS BASE v1.6 with A4982 stepper drivers and digital micro-stepping
26
+ */
27
+
28
+#if HOTENDS > 2 || E_STEPPERS > 2
29
+  #error "MKS BASE 1.6 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
30
+#endif
31
+
32
+#define BOARD_INFO_NAME "MKS BASE 1.6"
33
+
34
+#include "pins_MKS_BASE.h"
35
+
36
+/**
37
+ * Microstepping pins
38
+ */
39
+#define X_MS1_PIN            5   // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
40
+#define X_MS2_PIN            6   // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
41
+#define Y_MS1_PIN           59   // Analog 5   / Pin 92  / PF5
42
+#define Y_MS2_PIN           58   // Analog 4   / Pin 93  / PF4
43
+#define Z_MS1_PIN           22   // Digital 22 / Pin 78  / PA0
44
+#define Z_MS2_PIN           39   // Digital 39 / Pin 70  / PG2
45
+#define E0_MS1_PIN          63   // Analog 9   / Pin 86  / PK1
46
+#define E0_MS2_PIN          64   // Analog 10  / Pin 87  / PK2
47
+#define E1_MS1_PIN          57   // Analog 3   / Pin 93  / PF3
48
+#define E1_MS2_PIN           4   // Digital 4  / Pin 1   / PG5  / SERVO3_PIN

Ładowanie…
Anuluj
Zapisz