Browse Source

Merge branch 'Development' into issue_1499

Merging latest upstream changes
Scott Lahteine 10 years ago
parent
commit
efb0491d40
2 changed files with 16 additions and 0 deletions
  1. 2
    0
      Marlin/pins_3DRAG.h
  2. 14
    0
      Marlin/pins_MEGATRONICS_3.h

+ 2
- 0
Marlin/pins_3DRAG.h View File

4
 
4
 
5
 #include "pins_RAMPS_13.h"
5
 #include "pins_RAMPS_13.h"
6
 
6
 
7
+#define Z_ENABLE_PIN       63
8
+
7
 #define X_MAX_PIN          2
9
 #define X_MAX_PIN          2
8
 #define Y_MAX_PIN          15
10
 #define Y_MAX_PIN          15
9
 #define Z_MAX_PIN          -1
11
 #define Z_MAX_PIN          -1

+ 14
- 0
Marlin/pins_MEGATRONICS_3.h View File

8
 
8
 
9
 #define LARGE_FLASH        true
9
 #define LARGE_FLASH        true
10
 
10
 
11
+// Servo support
12
+#ifdef NUM_SERVOS
13
+  #define SERVO0_PIN       46 //AUX3-6
14
+  #if NUM_SERVOS > 1
15
+    #define SERVO1_PIN     47 //AUX3-5
16
+    #if NUM_SERVOS > 2
17
+      #define SERVO2_PIN   48 //AUX3-4
18
+      #if NUM_SERVOS > 3
19
+        #define SERVO2_PIN 49 //AUX3-3
20
+      #endif
21
+    #endif
22
+  #endif
23
+#endif
24
+
11
 #define X_STEP_PIN         58
25
 #define X_STEP_PIN         58
12
 #define X_DIR_PIN          57
26
 #define X_DIR_PIN          57
13
 #define X_ENABLE_PIN       59
27
 #define X_ENABLE_PIN       59

Loading…
Cancel
Save