Browse Source

BLTOUCH probe config option

pull/1/head
Scott Lahteine 8 years ago
parent
commit
1583177ef4
  1. 15
      Marlin/Conditionals.h
  2. 3
      Marlin/Configuration.h
  3. 3
      Marlin/example_configurations/Cartesio/Configuration.h
  4. 3
      Marlin/example_configurations/Felix/Configuration.h
  5. 3
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  6. 3
      Marlin/example_configurations/Hephestos/Configuration.h
  7. 3
      Marlin/example_configurations/Hephestos_2/Configuration.h
  8. 3
      Marlin/example_configurations/K8200/Configuration.h
  9. 3
      Marlin/example_configurations/K8400/Configuration.h
  10. 3
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  11. 3
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  12. 3
      Marlin/example_configurations/RigidBot/Configuration.h
  13. 3
      Marlin/example_configurations/SCARA/Configuration.h
  14. 3
      Marlin/example_configurations/TAZ4/Configuration.h
  15. 3
      Marlin/example_configurations/WITBOX/Configuration.h
  16. 3
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  17. 3
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  18. 3
      Marlin/example_configurations/delta/generic/Configuration.h
  19. 3
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  20. 3
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  21. 3
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  22. 3
      Marlin/example_configurations/makibox/Configuration.h
  23. 3
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

15
Marlin/Conditionals.h

@ -368,6 +368,21 @@
#define Z_HOME_POS (Z_HOME_DIR < 0 ? Z_MIN_POS : Z_MAX_POS) #define Z_HOME_POS (Z_HOME_DIR < 0 ? Z_MIN_POS : Z_MAX_POS)
#endif //!MANUAL_HOME_POSITIONS #endif //!MANUAL_HOME_POSITIONS
/**
* The BLTouch Probe emulates a servo probe
*/
#if ENABLED(BLTOUCH)
#undef Z_ENDSTOP_SERVO_NR
#undef Z_SERVO_ANGLES
#define Z_ENDSTOP_SERVO_NR 0
#define Z_SERVO_ANGLES {10,90} // For BLTouch 10=deploy, 90=retract
#undef DEACTIVATE_SERVOS_AFTER_MOVE
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
#undef Z_MIN_ENDSTOP_INVERTING
#define Z_MIN_ENDSTOP_INVERTING false
#endif
#endif
/** /**
* Auto Bed Leveling and Z Probe Repeatability Test * Auto Bed Leveling and Z Probe Repeatability Test
*/ */

3
Marlin/Configuration.h

@ -465,6 +465,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/Cartesio/Configuration.h

@ -465,6 +465,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/Felix/Configuration.h

@ -447,6 +447,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/Felix/DUAL/Configuration.h

@ -445,6 +445,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/Hephestos/Configuration.h

@ -457,6 +457,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/Hephestos_2/Configuration.h

@ -459,6 +459,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
#define FIX_MOUNTED_PROBE #define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/K8200/Configuration.h

@ -482,6 +482,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/K8400/Configuration.h

@ -442,6 +442,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/K8400/Dual-head/Configuration.h

@ -442,6 +442,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h

@ -465,6 +465,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/RigidBot/Configuration.h

@ -462,6 +462,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/SCARA/Configuration.h

@ -473,6 +473,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/TAZ4/Configuration.h

@ -486,6 +486,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/WITBOX/Configuration.h

@ -457,6 +457,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/adafruit/ST7565/Configuration.h

@ -465,6 +465,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/delta/biv2.5/Configuration.h

@ -507,6 +507,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/delta/generic/Configuration.h

@ -507,6 +507,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/delta/kossel_mini/Configuration.h

@ -507,6 +507,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/delta/kossel_pro/Configuration.h

@ -496,6 +496,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/delta/kossel_xl/Configuration.h

@ -505,6 +505,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
#define FIX_MOUNTED_PROBE #define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/makibox/Configuration.h

@ -468,6 +468,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

3
Marlin/example_configurations/tvrrug/Round2/Configuration.h

@ -455,6 +455,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// its trigger-point if hardware endstops are active. // its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// The BLTouch probe emulates a servo probe.
//#define BLTOUCH
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles

Loading…
Cancel
Save