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

Merge pull request #1875 from Natealus/Development 

Z Probe inverting not present in example configs, causes error
Scott Lahteine 10 years ago
parent
2ca099d1e7 585eee6549
commit
b1950a7f25
10 changed files with 14 additions and 4 deletions
Unified View Show Diff Stats
  1. 2
    1
      Marlin/example_configurations/Felix/Configuration.h
  2. 2
    1
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  3. 1
    0
      Marlin/example_configurations/Hephestos/Configuration.h
  4. 1
    0
      Marlin/example_configurations/K8200/Configuration.h
  5. 1
    0
      Marlin/example_configurations/SCARA/Configuration.h
  6. 1
    0
      Marlin/example_configurations/WITBOX/Configuration.h
  7. 2
    1
      Marlin/example_configurations/delta/generic/Configuration.h
  8. 2
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  9. 1
    0
      Marlin/example_configurations/makibox/Configuration.h
  10. 1
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 2
- 1
Marlin/example_configurations/Felix/Configuration.h View File

1 
-#ifndef CONFIGURATION_H
1 
+#ifndef CONFIGURATION_H
2 
 #define CONFIGURATION_H
 2 
 #define CONFIGURATION_H
3
3
4 
 #include "boards.h"
 4 
 #include "boards.h"
305 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 305 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
306 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 306 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
307 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 307 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
308 
+const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
308 
 #define DISABLE_MAX_ENDSTOPS
 309 
 #define DISABLE_MAX_ENDSTOPS
309 
 //#define DISABLE_MIN_ENDSTOPS
 310 
 //#define DISABLE_MIN_ENDSTOPS
310
311

+ 2
- 1
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

1 
-#ifndef CONFIGURATION_H
1 
+#ifndef CONFIGURATION_H
2 
 #define CONFIGURATION_H
 2 
 #define CONFIGURATION_H
3
3
4 
 #include "boards.h"
 4 
 #include "boards.h"
305 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 305 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
306 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 306 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
307 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 307 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
308 
+const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
308 
 #define DISABLE_MAX_ENDSTOPS
 309 
 #define DISABLE_MAX_ENDSTOPS
309 
 //#define DISABLE_MIN_ENDSTOPS
 310 
 //#define DISABLE_MIN_ENDSTOPS
310
311

+ 1
- 0
Marlin/example_configurations/Hephestos/Configuration.h View File

328 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 328 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
329 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 329 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
330 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 330 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
331 
+const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
331 
 //#define DISABLE_MAX_ENDSTOPS
 332 
 //#define DISABLE_MAX_ENDSTOPS
332 
 //#define DISABLE_MIN_ENDSTOPS
 333 
 //#define DISABLE_MIN_ENDSTOPS
333
334

+ 1
- 0
Marlin/example_configurations/K8200/Configuration.h View File

333 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 333 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
334 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 334 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
335 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 335 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
336 
+const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
336 
 #define DISABLE_MAX_ENDSTOPS
 337 
 #define DISABLE_MAX_ENDSTOPS
337 
 //#define DISABLE_MIN_ENDSTOPS
 338 
 //#define DISABLE_MIN_ENDSTOPS
338
339

+ 1
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

357 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 357 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
358 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 358 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
359 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 359 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
360 
+const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
360 
 //#define DISABLE_MAX_ENDSTOPS
 361 
 //#define DISABLE_MAX_ENDSTOPS
361 
 //#define DISABLE_MIN_ENDSTOPS
 362 
 //#define DISABLE_MIN_ENDSTOPS
362
363

+ 1
- 0
Marlin/example_configurations/WITBOX/Configuration.h View File

327 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 327 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
328 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 328 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
329 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 329 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
330 
+const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
330 
 //#define DISABLE_MAX_ENDSTOPS
 331 
 //#define DISABLE_MAX_ENDSTOPS
331 
 //#define DISABLE_MIN_ENDSTOPS
 332 
 //#define DISABLE_MIN_ENDSTOPS
332
333

+ 2
- 1
Marlin/example_configurations/delta/generic/Configuration.h View File

1 
-#ifndef CONFIGURATION_H
1 
+#ifndef CONFIGURATION_H
2 
 #define CONFIGURATION_H
 2 
 #define CONFIGURATION_H
3
3
4 
 #include "boards.h"
 4 
 #include "boards.h"
355 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 355 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
356 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 356 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
357 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 357 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
358 
+const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
358 
 //#define DISABLE_MAX_ENDSTOPS
 359 
 //#define DISABLE_MAX_ENDSTOPS
359 
 #define DISABLE_MIN_ENDSTOPS // Deltas only use min endstops for probing
 360 
 #define DISABLE_MIN_ENDSTOPS // Deltas only use min endstops for probing
360
361

+ 2
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

1 
-#ifndef CONFIGURATION_H
1 
+#ifndef CONFIGURATION_H
2 
 #define CONFIGURATION_H
 2 
 #define CONFIGURATION_H
3
3
4 
 #include "boards.h"
 4 
 #include "boards.h"
355 
 const bool X_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
 355 
 const bool X_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
356 
 const bool Y_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
 356 
 const bool Y_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
357 
 const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
 357 
 const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
358 
+const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
358 
 //#define DISABLE_MAX_ENDSTOPS
 359 
 //#define DISABLE_MAX_ENDSTOPS
359 
 //#define DISABLE_MIN_ENDSTOPS // Deltas only use min endstops for probing
 360 
 //#define DISABLE_MIN_ENDSTOPS // Deltas only use min endstops for probing
360
361

+ 1
- 0
Marlin/example_configurations/makibox/Configuration.h View File

325 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 325 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
326 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 326 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
327 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 327 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
328 
+const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
328 
 //#define DISABLE_MAX_ENDSTOPS
 329 
 //#define DISABLE_MAX_ENDSTOPS
329 
 //#define DISABLE_MIN_ENDSTOPS
 330 
 //#define DISABLE_MIN_ENDSTOPS
330
331

+ 1
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

327 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 327 
 const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
328 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 328 
 const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
329 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
 329 
 const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
330 
+const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
330 
 //#define DISABLE_MAX_ENDSTOPS
 331 
 //#define DISABLE_MAX_ENDSTOPS
331 
 //#define DISABLE_MIN_ENDSTOPS
 332 
 //#define DISABLE_MIN_ENDSTOPS
332
333

Write Preview
Loading…
Cancel
Save