Support for manually deployed fixed probes (#11899)

2.0.x
Hannes Brandstätter-Müller 6 years ago committed by Scott Lahteine
parent ddcbf80f23
commit a4cdffdd69

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -773,6 +773,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -736,6 +736,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -736,6 +736,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -801,6 +801,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -760,6 +760,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -725,6 +725,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -725,6 +725,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -741,6 +741,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -754,6 +754,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -741,6 +741,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -752,6 +752,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -763,6 +763,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -757,6 +757,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -772,6 +772,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -763,6 +763,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -757,6 +757,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -757,6 +757,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -763,6 +763,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -764,6 +764,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -735,6 +735,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -735,6 +735,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -759,6 +759,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -777,6 +777,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -788,6 +788,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -768,6 +768,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -769,6 +769,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -768,6 +768,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -757,6 +757,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -765,6 +765,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -773,6 +773,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -745,6 +745,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -752,6 +752,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -757,6 +757,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -757,6 +757,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -793,6 +793,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -751,6 +751,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -766,6 +766,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -755,6 +755,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -784,6 +784,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -804,6 +804,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -764,6 +764,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -782,6 +782,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -763,6 +763,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -672,7 +672,11 @@
#define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
#if ANYCUBIC_PROBE_VERSION == 1
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // V1 Probe is NC
#elif ANYCUBIC_PROBE_VERSION == 2
#define Z_MIN_PROBE_ENDSTOP_INVERTING true // V2 Probe is NO
#endif
/**
* Stepper Drivers
@ -871,6 +875,9 @@
*/
#if ANYCUBIC_PROBE_VERSION > 0
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif
#endif
/**
@ -934,12 +941,12 @@
#define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle]
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#if ANYCUBIC_PROBE_VERSION == 0
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
#if ANYCUBIC_PROBE_VERSION == 2
#define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle]
#elif ANYCUBIC_PROBE_VERSION == 1
#define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above [the nozzle]
#else
#define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
#endif
// Certain types of probes need to stay away from edges
@ -1020,10 +1027,10 @@
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
*/
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 25 // Z Clearance between probe points
#define Z_CLEARANCE_MULTI_PROBE 25 // Z Clearance between multiple probes
#define Z_AFTER_PROBING 30 // Z position after probing is done
#define Z_CLEARANCE_DEPLOY_PROBE 30 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
#define Z_AFTER_PROBING 5 // Z position after probing is done
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping

@ -835,6 +835,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -835,6 +835,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -835,6 +835,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -840,6 +840,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -825,6 +825,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -825,6 +825,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -818,6 +818,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -828,6 +828,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -766,6 +766,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -756,6 +756,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -755,6 +755,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -748,6 +748,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -758,6 +758,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
//#define MANUAL_DEPLOY_STOW
#endif
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.

@ -198,6 +198,8 @@
#define MSG_BLTOUCH_RESET _UxGT("BLTouch Reset")
#define MSG_BLTOUCH_DEPLOY _UxGT("BLTouch ausfahren")
#define MSG_BLTOUCH_STOW _UxGT("BLTouch einfahren")
#define MSG_MANUAL_DEPLOY _UxGT("Z-Sensor anbringen")
#define MSG_MANUAL_STOW _UxGT("Z-Sensor entfernen")
#define MSG_HOME _UxGT("Vorher") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("homen")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Versatz")

@ -810,6 +810,12 @@
#ifndef MSG_BLTOUCH_STOW
#define MSG_BLTOUCH_STOW _UxGT("Stow BLTouch")
#endif
#ifndef MSG_MANUAL_DEPLOY
#define MSG_MANUAL_DEPLOY _UxGT("Deploy Z-Probe")
#endif
#ifndef MSG_MANUAL_STOW
#define MSG_MANUAL_STOW _UxGT("Stow Z-Probe")
#endif
#ifndef MSG_HOME
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#endif

@ -28,6 +28,8 @@
#if HAS_BED_PROBE
#include "../libs/buzzer.h"
#include "probe.h"
#include "motion.h"
#include "temperature.h"
@ -377,7 +379,8 @@ bool set_probe_deployed(const bool deploy) {
// Make room for probe to deploy (or stow)
// Fix-mounted probe should only raise for deploy
#if ENABLED(FIX_MOUNTED_PROBE)
// unless MANUAL_DEPLOY_STOW is enabled
#if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(MANUAL_DEPLOY_STOW)
const bool deploy_stow_condition = deploy;
#else
constexpr bool deploy_stow_condition = true;
@ -440,6 +443,26 @@ bool set_probe_deployed(const bool deploy) {
deploy ? run_deploy_moves_script() : run_stow_moves_script();
#elif ENABLED(MANUAL_DEPLOY_STOW)
do_probe_raise(Z_CLEARANCE_DEPLOY_PROBE);
#if PIN_EXISTS(BEEPER) || ENABLED(LCD_USE_I2C_BUZZER)
BUZZ(100, 659);
BUZZ(100, 698);
#endif
const char * const ds_str = deploy ? PSTR(MSG_MANUAL_DEPLOY) : PSTR(MSG_MANUAL_STOW);
lcd_setalertstatusPGM(ds_str);
serialprintPGM(ds_str);
SERIAL_EOL();
KEEPALIVE_STATE(PAUSED_FOR_USER);
wait_for_user = true;
while (wait_for_user) idle();
lcd_reset_status();
KEEPALIVE_STATE(IN_HANDLER);
#endif
#ifdef _TRIGGERED_WHEN_STOWED_TEST

@ -291,7 +291,7 @@ exec_test $1 $2 "Delta Config (FLSUN AC because it's complex)"
# SCARA with TMC2130
#
use_example_configs SCARA
opt_enable AUTO_BED_LEVELING_BILINEAR FIX_MOUNTED_PROBE USE_ZMIN_PLUG EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER
opt_enable AUTO_BED_LEVELING_BILINEAR FIX_MOUNTED_PROBE MANUAL_DEPLOY_STOW USE_ZMIN_PLUG EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER
opt_set X_DRIVER_TYPE TMC2130
opt_set Y_DRIVER_TYPE TMC2130
opt_set Z_DRIVER_TYPE TMC2130

Loading…
Cancel
Save