thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Define Z_MIN_PROBE_PIN always, allowing override

Scott Lahteine 7 years ago
parent
cebeb48005
commit
9cb596e88c
6 changed files with 35 additions and 41 deletions
Split View Show Diff Stats
  1. 2
    6
      Marlin/pins_AZTEEG_X3_PRO.h
  2. 7
    4
      Marlin/pins_BRAINWAVE_PRO.h
  3. 10
    6
      Marlin/pins_RAMBO.h
  4. 11
    12
      Marlin/pins_RAMPS.h
  5. 4
    11
      Marlin/pins_RIGIDBOARD.h
  6. 1
    2
      Marlin/pins_RUMBA.h

+ 2
- 6
Marlin/pins_AZTEEG_X3_PRO.h View File 

@@ -60,14 +60,10 @@
60 60 
   #define Z_MAX_PIN        18
61 61 
 #endif
62 62
63 
-
64 
-#if ENABLED(Z_MIN_PROBE_ENDSTOP)
65 
-  //#undef Z_MIN_PIN
66 
-  //#define Z_MIN_PIN        15
67 
-  // Define a pin to use as the signal pin on Arduino for the Z probe endstop.
63 
+#ifndef Z_MIN_PROBE_PIN
68 64 
   #define Z_MIN_PROBE_PIN  19
69 65 
 #endif
70 
-//
66 
+
71 67 
 #define E2_STEP_PIN        23
72 68 
 #define E2_DIR_PIN         25
73 69 
 #define E2_ENABLE_PIN      40

+ 7
- 4
Marlin/pins_BRAINWAVE_PRO.h View File 

@@ -41,21 +41,24 @@
41 41
42 42 
 #define LARGE_FLASH        true
43 43
44 
+#define X_STOP_PIN         47
45 
+#define Y_STOP_PIN         18
46 
+#define Z_MAX_PIN          36
47 
+#ifndef Z_MIN_PROBE_PIN
48 
+  #define Z_MIN_PROBE_PIN  17
49 
+#endif
50 
+
44 51 
 #define X_STEP_PIN         33
45 52 
 #define X_DIR_PIN          32
46 53 
 #define X_ENABLE_PIN       11
47 
-#define X_STOP_PIN         47
48 54
49 55 
 #define Y_STEP_PIN         31
50 56 
 #define Y_DIR_PIN          30
51 57 
 #define Y_ENABLE_PIN        8
52 
-#define Y_STOP_PIN         18
53 58
54 59 
 #define Z_STEP_PIN         29
55 60 
 #define Z_DIR_PIN          28
56 61 
 #define Z_ENABLE_PIN       37
57 
-#define Z_MAX_PIN          36
58 
-#define Z_MIN_PROBE_PIN    17  // Bed Z probe
59 62
60 63 
 #define E0_STEP_PIN        35
61 64 
 #define E0_DIR_PIN         34

+ 10
- 6
Marlin/pins_RAMBO.h View File 

@@ -42,26 +42,30 @@
42 42 
   #define SLED_PIN         -1
43 43 
 #endif
44 44
45 
-#define X_STEP_PIN 37
46 
-#define X_DIR_PIN 48
47 45 
 #define X_MIN_PIN 12
48 46 
 #define X_MAX_PIN 24
47 
+#define Y_MIN_PIN 11
48 
+#define Y_MAX_PIN 23
49 
+#define Z_MIN_PIN 10
50 
+#define Z_MAX_PIN 30
51 
+#ifndef Z_MIN_PROBE_PIN
52 
+  #define Z_MIN_PROBE_PIN 10
53 
+#endif
54 
+
55 
+#define X_STEP_PIN 37
56 
+#define X_DIR_PIN 48
49 57 
 #define X_ENABLE_PIN 29
50 58 
 #define X_MS1_PIN 40
51 59 
 #define X_MS2_PIN 41
52 60
53 61 
 #define Y_STEP_PIN 36
54 62 
 #define Y_DIR_PIN 49
55 
-#define Y_MIN_PIN 11
56 
-#define Y_MAX_PIN 23
57 63 
 #define Y_ENABLE_PIN 28
58 64 
 #define Y_MS1_PIN 69
59 65 
 #define Y_MS2_PIN 39
60 66
61 67 
 #define Z_STEP_PIN 35
62 68 
 #define Z_DIR_PIN 47
63 
-#define Z_MIN_PIN 10
64 
-#define Z_MAX_PIN 30
65 69 
 #define Z_ENABLE_PIN 27
66 70 
 #define Z_MS1_PIN 68
67 71 
 #define Z_MS2_PIN 67

+ 11
- 12
Marlin/pins_RAMPS.h View File 

@@ -63,25 +63,29 @@
63 63 
 #define SERVO2_PIN          5
64 64 
 #define SERVO3_PIN          4
65 65
66 
-#define X_STEP_PIN         54
67 
-#define X_DIR_PIN          55
68 
-#define X_ENABLE_PIN       38
69 66 
 #define X_MIN_PIN           3
70 67 
 #ifndef X_MAX_PIN
71 68 
   #define X_MAX_PIN         2
72 69 
 #endif
70 
+#define Y_MIN_PIN          14
71 
+#define Y_MAX_PIN          15
72 
+#define Z_MIN_PIN          18
73 
+#define Z_MAX_PIN          19
74 
+#ifndef Z_MIN_PROBE_PIN
75 
+  #define Z_MIN_PROBE_PIN  32
76 
+#endif
77 
+
78 
+#define X_STEP_PIN         54
79 
+#define X_DIR_PIN          55
80 
+#define X_ENABLE_PIN       38
73 81
74 82 
 #define Y_STEP_PIN         60
75 83 
 #define Y_DIR_PIN          61
76 84 
 #define Y_ENABLE_PIN       56
77 
-#define Y_MIN_PIN          14
78 
-#define Y_MAX_PIN          15
79 85
80 86 
 #define Z_STEP_PIN         46
81 87 
 #define Z_DIR_PIN          48
82 88 
 #define Z_ENABLE_PIN       62
83 
-#define Z_MIN_PIN          18
84 
-#define Z_MAX_PIN          19
85 89
86 90 
 #define E0_STEP_PIN        26
87 91 
 #define E0_DIR_PIN         28
 
@@ -97,11 +101,6 @@
97 101 
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
98 102 
 #define FILWIDTH_PIN        5 // ANALOG NUMBERING
99 103
100 
-#if ENABLED(Z_MIN_PROBE_ENDSTOP)
101 
-  // Define a pin to use as the signal pin on Arduino for the Z_PROBE endstop.
102 
-  #define Z_MIN_PROBE_PIN  32
103 
-#endif
104 
-
105 104 
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
106 105 
 #define FIL_RUNOUT_PIN      4
107 106

+ 4
- 11
Marlin/pins_RIGIDBOARD.h View File 

@@ -24,22 +24,15 @@
24 24 
  * RIGIDBOARD Arduino Mega with RAMPS v1.4 pin assignments
25 25 
  */
26 26
27 
-#include "pins_RAMPS.h"
28 
-
29 
-#undef BOARD_NAME
30 27 
 #define BOARD_NAME "RigidBoard"
31 28
32 
-#if ENABLED(Z_MIN_PROBE_ENDSTOP)
33 
-  #undef Z_MAX_PIN
34 
-  #define Z_MAX_PIN -1
35 
-  #undef Z_MIN_PROBE_PIN
29 
+#define RAMPS_D10_PIN       9    // EXTRUDER 1
30 
+#define MOSFET_D_PIN       12    // EXTRUDER 2 or FAN
31 
+#ifndef Z_MIN_PROBE_PIN
36 32 
   #define Z_MIN_PROBE_PIN  19    // Z-MAX pin J14 End Stops
37 33 
 #endif
38 34
39 
-#undef HEATER_0_PIN
40 
-#undef HEATER_1_PIN
41 
-#define HEATER_0_PIN        9    // EXTRUDER 1
42 
-#define HEATER_1_PIN       12    // EXTRUDER 2 (FAN On Sprinter)
35 
+#include "pins_RAMPS.h"
43 36
44 37 
 #undef TEMP_0_PIN
45 38 
 #undef TEMP_1_PIN

+ 1
- 2
Marlin/pins_RUMBA.h View File 

@@ -53,8 +53,7 @@
53 53 
 #define Z_MIN_PIN          33
54 54 
 #define Z_MAX_PIN          32
55 55
56 
-#if ENABLED(Z_MIN_PROBE_ENDSTOP)
57 
-  // Define a pin to use as the signal pin on Arduino for the Z probe endstop.
56 
+#ifndef Z_MIN_PROBE_PIN
58 57 
   #define Z_MIN_PROBE_PIN  33
59 58 
 #endif
60 59

Write Preview
Loading…
Cancel
Save