forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Goodbye MECHANICAL_PROBE

Browse Source
master
Scott Lahteine 9 years ago
parent 2640d13a9f
commit bd01592816
24 changed files with 89 additions and 130 deletions
Show Stats Download Patch File Download Diff File

4
.travis.yml
Unescape View File

@ -101,10 +101,10 @@ script:
- opt_enable AUTO_BED_LEVELING_FEATURE DEBUG_LEVELING_FEATURE - opt_enable AUTO_BED_LEVELING_FEATURE DEBUG_LEVELING_FEATURE
- build_marlin - build_marlin
# #
# Test a Mechanical Probe # Test a Sled Z Probe
# #
- restore_configs - restore_configs
- opt_enable MECHANICAL_PROBE - opt_enable Z_PROBE_SLED
- build_marlin - build_marlin
# #
# ...with AUTO_BED_LEVELING_FEATURE & DEBUG_LEVELING_FEATURE # ...with AUTO_BED_LEVELING_FEATURE & DEBUG_LEVELING_FEATURE

2
Marlin/Conditionals.h
Unescape View File

@ -752,7 +752,7 @@
#endif #endif
#endif #endif
#define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED)) #define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))
#define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))) #define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))

10
Marlin/Configuration.h
Unescape View File

@ -419,8 +419,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -431,10 +433,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

4
Marlin/Marlin_main.cpp
Unescape View File

@ -1890,7 +1890,7 @@ static void clean_up_after_endstop_or_probe_move() {
stop(); stop();
} }
#elif ENABLED(FIX_MOUNTED_PROBE) #else
// Nothing to be done. Just enable_z_probe below... // Nothing to be done. Just enable_z_probe below...
@ -1982,7 +1982,7 @@ static void clean_up_after_endstop_or_probe_move() {
stop(); stop();
} }
#elif ENABLED(FIX_MOUNTED_PROBE) #else
// Nothing to do here. Just clear endstops.z_probe_enabled // Nothing to do here. Just clear endstops.z_probe_enabled

9
Marlin/SanityCheck.h
Unescape View File

@ -268,11 +268,10 @@
/** /**
* Only allow one probe option to be defined * Only allow one probe option to be defined
*/ */
#if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \ #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|| (ENABLED(MECHANICAL_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|| (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \ || (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|| (HAS_Z_SERVO_ENDSTOP && ENABLED(Z_PROBE_SLED)) || (HAS_Z_SERVO_ENDSTOP && ENABLED(Z_PROBE_SLED))
#error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." #error "Please define only one type of probe: Z Servo, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
#endif #endif
/** /**
@ -314,9 +313,9 @@
* Require some kind of probe for bed leveling and probe testing * Require some kind of probe for bed leveling and probe testing
*/ */
#if ENABLED(AUTO_BED_LEVELING_FEATURE) #if ENABLED(AUTO_BED_LEVELING_FEATURE)
#error "AUTO_BED_LEVELING_FEATURE requires a probe! Define a Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." #error "AUTO_BED_LEVELING_FEATURE requires a probe! Define a Z Servo, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
#elif ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) #elif ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
#error "Z_MIN_PROBE_REPEATABILITY_TEST requires a probe! Define a Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." #error "Z_MIN_PROBE_REPEATABILITY_TEST requires a probe! Define a Z Servo, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
#endif #endif
#endif #endif

10
Marlin/example_configurations/Cartesio/Configuration.h
Unescape View File

@ -418,8 +418,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -430,10 +432,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/Felix/Configuration.h
Unescape View File

@ -401,8 +401,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -413,10 +415,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/Felix/DUAL/Configuration.h
Unescape View File

@ -399,8 +399,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -411,10 +413,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/Hephestos/Configuration.h
Unescape View File

@ -411,8 +411,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -423,10 +425,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/Hephestos_2/Configuration.h
Unescape View File

@ -413,8 +413,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
#define FIX_MOUNTED_PROBE #define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -425,10 +427,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/K8200/Configuration.h
Unescape View File

@ -436,8 +436,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -448,10 +450,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

@ -419,8 +419,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -431,10 +433,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

@ -413,8 +413,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -425,10 +427,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -427,8 +427,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -439,10 +441,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/TAZ4/Configuration.h
Unescape View File

@ -440,8 +440,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -452,10 +454,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/WITBOX/Configuration.h
Unescape View File

@ -411,8 +411,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -423,10 +425,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

@ -419,8 +419,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -431,10 +433,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/delta/biv2.5/Configuration.h
Unescape View File

@ -461,8 +461,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -473,10 +475,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

@ -461,8 +461,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -473,10 +475,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

@ -461,8 +461,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -473,10 +475,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

@ -450,8 +450,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -462,10 +464,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/delta/kossel_xl/Configuration.h
Unescape View File

@ -459,8 +459,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
#define FIX_MOUNTED_PROBE #define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -471,10 +473,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -422,8 +422,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -434,10 +436,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

10
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -409,8 +409,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Use M851 to set the Z probe vertical offset from the nozzle. Store with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store with M500.
// //
// A fix mounted probe, like the normal inductive probe, must be deactivated to go // A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
// below Z_PROBE_OFFSET_FROM_EXTRUDER when the hardware endstops are active. // For example an inductive probe, or a setup that uses the nozzle to probe.
// An inductive probe must be deactivated to go below
// its trigger-point if hardware endstops are active.
//#define FIX_MOUNTED_PROBE //#define FIX_MOUNTED_PROBE
// Z Servo Probe, such as an endstop switch on a rotating arm. // Z Servo Probe, such as an endstop switch on a rotating arm.
@ -421,10 +423,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//#define Z_PROBE_SLED //#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
// A Mechanical Probe is any probe that either doesn't deploy or needs manual deployment
// For example any setup that uses the nozzle itself as a probe.
//#define MECHANICAL_PROBE
// Z Probe to nozzle (X,Y) offset, relative to (0, 0). // Z Probe to nozzle (X,Y) offset, relative to (0, 0).
// X and Y offsets must be integers. // X and Y offsets must be integers.
// //

Write Preview
Loading…
Cancel
Save