Browse Source

[2.0.x] Add BOARD_MKS_BASE_15 with digital micro-stepping (#10454)

* Add BOARD_MKS_BASE_15 with digital micro-stepping
* Rename MKS_13 to MKS_GEN_13
Scott Lahteine 7 years ago
parent
commit
4f184ba5da
No account linked to committer's email address

+ 1
- 1
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h View File

@@ -138,7 +138,7 @@
138 138
 // The following define selects which electronics board you have.
139 139
 // Please choose the name from boards.h that matches your setup
140 140
 #ifndef MOTHERBOARD
141
-  #define MOTHERBOARD BOARD_MKS_13
141
+  #define MOTHERBOARD BOARD_MKS_GEN_13
142 142
 #endif
143 143
 
144 144
 // Optional custom name for your RepStrap or other custom machine

+ 3
- 2
Marlin/src/core/boards.h View File

@@ -58,9 +58,10 @@
58 58
 #define BOARD_K8400             79    // Velleman K8400 Controller (derived from 3Drag Controller)
59 59
 #define BOARD_BAM_DICE          401   // 2PrintBeta BAM&DICE with STK drivers
60 60
 #define BOARD_BAM_DICE_DUE      402   // 2PrintBeta BAM&DICE Due with STK drivers
61
-#define BOARD_MKS_BASE          40    // MKS BASE 1.0
61
+#define BOARD_MKS_BASE          40    // MKS BASE v1.0
62
+#define BOARD_MKS_BASE_15       405   // MKS v1.5 with Allegro A4982 stepper drivers
62 63
 #define BOARD_MKS_BASE_HEROIC   41    // MKS BASE 1.0 with Heroic HR4982 stepper drivers
63
-#define BOARD_MKS_13            47    // MKS v1.3 or 1.4 (maybe higher)
64
+#define BOARD_MKS_GEN_13        47    // MKS v1.3 or 1.4
64 65
 #define BOARD_MKS_GEN_L         53    // MKS GEN L
65 66
 #define BOARD_ZRIB_V20          504   // zrib V2.0 control board (Chinese knock off RAMPS replica)
66 67
 #define BOARD_FELIX2            37    // Felix 2.0+ Electronics Board (RAMPS like)

+ 5
- 0
Marlin/src/inc/SanityCheck.h View File

@@ -272,6 +272,11 @@
272 272
   #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration."
273 273
 #endif
274 274
 
275
+#define BOARD_MKS_13 -47
276
+#if MB(MKS_13)
277
+  #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
278
+#endif
279
+
275 280
 /**
276 281
  * Marlin release, version and default string
277 282
  */

+ 5
- 3
Marlin/src/pins/pins.h View File

@@ -102,14 +102,16 @@
102 102
   #include "pins_BAM_DICE_DUE.h"      // ATmega1280, ATmega2560
103 103
 #elif MB(MKS_BASE)
104 104
   #include "pins_MKS_BASE.h"          // ATmega1280, ATmega2560
105
+#elif MB(MKS_BASE_15)
106
+  #include "pins_MKS_BASE_15.h"       // ATmega1280, ATmega2560
105 107
 #elif MB(MKS_BASE_HEROIC)
106 108
   #include "pins_MKS_BASE_HEROIC.h"   // ATmega1280, ATmega2560
107
-#elif MB(MKS_13)
108
-  #include "pins_MKS_13.h"            // ATmega1280, ATmega2560
109
+#elif MB(MKS_GEN_13)
110
+  #include "pins_MKS_GEN_13.h"        // ATmega1280, ATmega2560
109 111
 #elif MB(MKS_GEN_L)
110 112
   #include "pins_MKS_GEN_L.h"         // ATmega1280, ATmega2560
111 113
 #elif MB(ZRIB_V20)
112
-  #include "pins_ZRIB_V20.h"          // ATmega1280, ATmega2560 (MKS_13)
114
+  #include "pins_ZRIB_V20.h"          // ATmega1280, ATmega2560 (MKS_GEN_13)
113 115
 #elif MB(FELIX2)
114 116
   #include "pins_FELIX2.h"            // ATmega1280, ATmega2560
115 117
 #elif MB(RIGIDBOARD)

+ 41
- 0
Marlin/src/pins/pins_MKS_BASE_15.h View File

@@ -0,0 +1,41 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 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
+
23
+/**
24
+ * MKS BASE v1.5 with A4982 stepper drivers and digital micro-stepping
25
+ */
26
+
27
+#include "pins_MKS_BASE.h"
28
+
29
+/**
30
+ * Microstepping pins
31
+ */
32
+#define X_MS1_PIN            5   // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
33
+#define X_MS2_PIN            6   // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
34
+#define Y_MS1_PIN           59   // Analog 5   / Pin 92  / PF5
35
+#define Y_MS2_PIN           58   // Analog 4   / Pin 93  / PF4
36
+#define Z_MS1_PIN           22   // Digital 22 / Pin 78  / PA0
37
+#define Z_MS2_PIN           39   // Digital 39 / Pin 70  / PG2
38
+#define E0_MS1_PIN          63   // Analog 9   / Pin 86  / PK1
39
+#define E0_MS2_PIN          64   // Analog 10  / Pin 87  / PK2
40
+#define E1_MS1_PIN          57   // Analog 3   / Pin 93  / PF3
41
+#define E1_MS2_PIN           4   // Digital 4  / Pin 1   / PG5  / SERVO3_PIN

+ 4
- 15
Marlin/src/pins/pins_MKS_BASE_HEROIC.h View File

@@ -24,23 +24,12 @@
24 24
  * MKS BASE with Heroic HR4982 stepper drivers
25 25
  */
26 26
 
27
-#include "pins_MKS_BASE.h"
27
+#include "pins_MKS_BASE_15.h"
28 28
 
29 29
 /**
30
- * Microstepping pins (reverse engineered at V1.4 - due to closed source schematics).
31 30
  * Some new boards use HR4982 (Heroic) instead of the A4982 (Allegro) stepper drivers.
32
- * While most of the functionality is similar, the HR variant obviously doesn't work
33
- * with diode smoothers (no fast decay). And the Heroic has a 128 µStepping mode where
34
- * the A4982 is doing quarter steps (MS1=L / MS2=H).
31
+ * Most the functionality is similar, the HR variant obviously doesn't work with diode
32
+ * smoothers (no fast decay). And the Heroic has a 128 µStepping mode where the A4982
33
+ * is doing quarter steps (MS1=0, MS2=1).
35 34
  */
36 35
 #define HEROIC_STEPPER_DRIVERS
37
-#define X_MS1_PIN            5   // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
38
-#define X_MS2_PIN            6   // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
39
-#define Y_MS1_PIN           59   // Analog 5   / Pin 92  / PF5
40
-#define Y_MS2_PIN           58   // Analog 4   / Pin 93  / PF4
41
-#define Z_MS1_PIN           22   // Digital 22 / Pin 78  / PA0
42
-#define Z_MS2_PIN           39   // Digital 39 / Pin 70  / PG2
43
-#define E0_MS1_PIN          63   // Analog 9   / Pin 86  / PK1
44
-#define E0_MS2_PIN          64   // Analog 10  / Pin 87  / PK2
45
-#define E1_MS1_PIN          57   // Analog 3   / Pin 93  / PF3
46
-#define E1_MS2_PIN           4   // Digital 4  / Pin 1   / PG5  / SERVO3_PIN

Marlin/src/pins/pins_MKS_13.h → Marlin/src/pins/pins_MKS_GEN_13.h View File

@@ -23,17 +23,17 @@
23 23
 /**
24 24
  * Arduino Mega with RAMPS v1.4 adjusted pin assignments
25 25
  *
26
- *  MKS v1.3  (Extruder, Fan, Bed)
27
- *  MKS v1.3  (Extruder, Extruder, Fan, Bed)
28
- *  MKS v1.4  (Extruder, Fan, Bed)
29
- *  MKS v1.4  (Extruder, Extruder, Fan, Bed)
26
+ *  MKS GEN v1.3  (Extruder, Fan, Bed)
27
+ *  MKS GEN v1.3  (Extruder, Extruder, Fan, Bed)
28
+ *  MKS GEN v1.4  (Extruder, Fan, Bed)
29
+ *  MKS GEN v1.4  (Extruder, Extruder, Fan, Bed)
30 30
  */
31 31
 
32 32
 #if HOTENDS > 2 || E_STEPPERS > 2
33
-  #error "MKS 1.3/1.4 supports up to 2 hotends / E-steppers. Comment out this line to continue."
33
+  #error "MKS GEN 1.3/1.4 supports up to 2 hotends / E-steppers. Comment out this line to continue."
34 34
 #endif
35 35
 
36
-#define BOARD_NAME "MKS > v1.3"
36
+#define BOARD_NAME "MKS GEN >= v1.3"
37 37
 
38 38
 //
39 39
 // Heaters / Fans

+ 1
- 1
Marlin/src/pins/pins_ZRIB_V20.h View File

@@ -36,4 +36,4 @@
36 36
   #define FILWIDTH_PIN 11   // Analog Input
37 37
 #endif
38 38
 
39
-#include "pins_MKS_13.h"
39
+#include "pins_MKS_GEN_13.h"

Loading…
Cancel
Save