zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Support for manually deployed fixed probes (#11899)

Browse source
This commit is contained in:
Hannes Brandstätter-Müller 2018-09-23 18:50:03 +02:00 committed by Scott Lahteine
parent ddcbf80f23
commit a4cdffdd69
79 changed files with 270 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/Configuration.h
View file

@ -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.

3
Marlin/src/config/default/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Anet/A2/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Anet/A2plus/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Anet/A6/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Anet/A8/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/BQ/Hephestos/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/BQ/WITBOX/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Cartesio/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Creality/CR-10/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Creality/CR-10S/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Creality/CR-8/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Creality/Ender-2/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Creality/Ender-3/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Creality/Ender-4/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Einstart-S/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Felix/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Felix/DUAL/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/JGAurora/A5/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/MakerParts/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Malyan/M150/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Malyan/M200/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Mks/Sbase/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/RigidBot/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/SCARA/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/STM32F10/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/STM32F4/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Sanguinololu/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/TheBorg/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/TinyBoy2/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Tronxy/X1/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Tronxy/X3A/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Tronxy/X5S/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Tronxy/XY100/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Velleman/K8200/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Velleman/K8400/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/adafruit/ST7565/Configuration.h
View file

@ -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.

23
Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
View file

@ -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

3
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/delta/generic/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/makibox/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/stm32f103ret6/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/tvrrug/Round2/Configuration.h
View file

@ -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.

3
Marlin/src/config/examples/wt150/Configuration.h
View file

@ -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.

2
Marlin/src/lcd/language/language_de.h
View file

@ -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")

6
Marlin/src/lcd/language/language_en.h
View file

@ -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

25
Marlin/src/module/probe.cpp
View file

@ -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

2
buildroot/share/tests/megaatmega2560_tests
View file

@ -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