Browse Source

make the dual z-endstop optional (PR#2277)

it's disabled by default
wurstnase 9 years ago
parent
commit
c85a486445

+ 5
- 4
Marlin/Configuration_adv.h View File

@@ -144,12 +144,13 @@
144 144
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
145 145
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
146 146
 
147
-  #define Z_DUAL_ENDSTOPS
147
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
148
+  #define Z2_DIR_PIN E2_DIR_PIN
149
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
150
+
151
+  // #define Z_DUAL_ENDSTOPS
148 152
 
149 153
   #ifdef Z_DUAL_ENDSTOPS
150
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
151
-    #define Z2_DIR_PIN E2_DIR_PIN
152
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
153 154
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
154 155
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
155 156
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/configurator/config/Configuration_adv.h View File

@@ -139,12 +139,13 @@
139 139
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
140 140
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
141 141
 
142
-  #define Z_DUAL_ENDSTOPS
142
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
143
+  #define Z2_DIR_PIN E2_DIR_PIN
144
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
145
+
146
+  // #define Z_DUAL_ENDSTOPS
143 147
 
144 148
   #ifdef Z_DUAL_ENDSTOPS
145
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
146
-    #define Z2_DIR_PIN E2_DIR_PIN
147
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
148 149
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
149 150
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
150 151
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

+ 5
- 4
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -152,12 +152,13 @@
152 152
   // Play a little bit with small adjustments (0.5mm) and check the behaviour.
153 153
   // The M119 (endstops report) will start reporting the Z2 Endstop as well.
154 154
 
155
-  #define Z_DUAL_ENDSTOPS
155
+  #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
156
+  #define Z2_DIR_PIN E2_DIR_PIN
157
+  #define Z2_ENABLE_PIN E2_ENABLE_PIN
158
+
159
+  // #define Z_DUAL_ENDSTOPS
156 160
 
157 161
   #ifdef Z_DUAL_ENDSTOPS
158
-    #define Z2_STEP_PIN E2_STEP_PIN           // Stepper to be used to Z2 axis.
159
-    #define Z2_DIR_PIN E2_DIR_PIN
160
-    #define Z2_ENABLE_PIN E2_ENABLE_PIN
161 162
     #define Z2_MAX_PIN 36                     //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36)
162 163
     const bool Z2_MAX_ENDSTOP_INVERTING = false;
163 164
     #define DISABLE_XMAX_ENDSTOP              //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis.

Loading…
Cancel
Save