Переглянути джерело

Support for manually deployed fixed probes (#11899)

Hannes Brandstätter-Müller 5 роки тому
джерело
коміт
a4cdffdd69
79 змінених файлів з 270 додано та 10 видалено
  1. 3
    0
      Marlin/Configuration.h
  2. 3
    0
      Marlin/src/config/default/Configuration.h
  3. 3
    0
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 3
    0
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 3
    0
      Marlin/src/config/examples/Anet/A2/Configuration.h
  6. 3
    0
      Marlin/src/config/examples/Anet/A2plus/Configuration.h
  7. 3
    0
      Marlin/src/config/examples/Anet/A6/Configuration.h
  8. 3
    0
      Marlin/src/config/examples/Anet/A8/Configuration.h
  9. 3
    0
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  10. 3
    0
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  11. 3
    0
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
  12. 3
    0
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  13. 3
    0
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  14. 3
    0
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  15. 3
    0
      Marlin/src/config/examples/Cartesio/Configuration.h
  16. 3
    0
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  17. 3
    0
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  18. 3
    0
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  19. 3
    0
      Marlin/src/config/examples/Creality/CR-8/Configuration.h
  20. 3
    0
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  21. 3
    0
      Marlin/src/config/examples/Creality/Ender-3/Configuration.h
  22. 3
    0
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  23. 3
    0
      Marlin/src/config/examples/Einstart-S/Configuration.h
  24. 3
    0
      Marlin/src/config/examples/Felix/Configuration.h
  25. 3
    0
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  26. 3
    0
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  27. 3
    0
      Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h
  28. 3
    0
      Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
  29. 3
    0
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  30. 3
    0
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  31. 3
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  32. 3
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  33. 3
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
  34. 3
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
  35. 3
    0
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  36. 3
    0
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  37. 3
    0
      Marlin/src/config/examples/MakerParts/Configuration.h
  38. 3
    0
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  39. 3
    0
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  40. 3
    0
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  41. 3
    0
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  42. 3
    0
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  43. 3
    0
      Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
  44. 3
    0
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  45. 3
    0
      Marlin/src/config/examples/RigidBot/Configuration.h
  46. 3
    0
      Marlin/src/config/examples/SCARA/Configuration.h
  47. 3
    0
      Marlin/src/config/examples/STM32F10/Configuration.h
  48. 3
    0
      Marlin/src/config/examples/STM32F4/Configuration.h
  49. 3
    0
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  50. 3
    0
      Marlin/src/config/examples/TheBorg/Configuration.h
  51. 3
    0
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  52. 3
    0
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  53. 3
    0
      Marlin/src/config/examples/Tronxy/X3A/Configuration.h
  54. 3
    0
      Marlin/src/config/examples/Tronxy/X5S/Configuration.h
  55. 3
    0
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  56. 3
    0
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  57. 3
    0
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  58. 3
    0
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  59. 3
    0
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  60. 3
    0
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  61. 3
    0
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  62. 15
    8
      Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
  63. 3
    0
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  64. 3
    0
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  65. 3
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  66. 3
    0
      Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
  67. 3
    0
      Marlin/src/config/examples/delta/generic/Configuration.h
  68. 3
    0
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  69. 3
    0
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  70. 3
    0
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  71. 3
    0
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  72. 3
    0
      Marlin/src/config/examples/makibox/Configuration.h
  73. 3
    0
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  74. 3
    0
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  75. 3
    0
      Marlin/src/config/examples/wt150/Configuration.h
  76. 2
    0
      Marlin/src/lcd/language/language_de.h
  77. 6
    0
      Marlin/src/lcd/language/language_en.h
  78. 24
    1
      Marlin/src/module/probe.cpp
  79. 1
    1
      buildroot/share/tests/megaatmega2560_tests

+ 3
- 0
Marlin/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/default/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Anet/A2/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Anet/A2plus/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Anet/A6/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Anet/A8/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/BQ/Hephestos/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/BQ/WITBOX/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Cartesio/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Creality/CR-10S/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Creality/CR-8/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Creality/Ender-2/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Creality/Ender-3/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Creality/Ender-4/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Einstart-S/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Felix/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Felix/DUAL/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/JGAurora/A5/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/MakerParts/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Malyan/M150/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Malyan/M200/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Mks/Sbase/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/RigidBot/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/SCARA/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/STM32F10/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/STM32F4/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Sanguinololu/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/TheBorg/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/TinyBoy2/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Tronxy/X1/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Tronxy/X3A/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Tronxy/X5S/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Tronxy/XY100/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Velleman/K8200/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Velleman/K8400/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/adafruit/ST7565/Configuration.h Переглянути файл

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

+ 15
- 8
Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h Переглянути файл

@@ -672,7 +672,11 @@
672 672
 #define X_MAX_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
673 673
 #define Y_MAX_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
674 674
 #define Z_MAX_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
675
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true  // set to true to invert the logic of the probe.
675
+#if ANYCUBIC_PROBE_VERSION == 1
676
+  #define Z_MIN_PROBE_ENDSTOP_INVERTING false  // V1 Probe is NC
677
+#elif ANYCUBIC_PROBE_VERSION == 2
678
+  #define Z_MIN_PROBE_ENDSTOP_INVERTING true  // V2 Probe is NO
679
+#endif
676 680
 
677 681
 /**
678 682
  * Stepper Drivers
@@ -871,6 +875,9 @@
871 875
  */
872 876
 #if ANYCUBIC_PROBE_VERSION > 0
873 877
   #define FIX_MOUNTED_PROBE
878
+#if ENABLED(FIX_MOUNTED_PROBE)
879
+  #define MANUAL_DEPLOY_STOW
880
+#endif
874 881
 #endif
875 882
 
876 883
 /**
@@ -934,12 +941,12 @@
934 941
 #define X_PROBE_OFFSET_FROM_EXTRUDER 0     // X offset: -left  +right  [of the nozzle]
935 942
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0     // Y offset: -front +behind [the nozzle]
936 943
 
937
-#if ANYCUBIC_PROBE_VERSION == 0
938
-  #define Z_PROBE_OFFSET_FROM_EXTRUDER 0     // Z offset: -below +above  [the nozzle]
944
+#if ANYCUBIC_PROBE_VERSION == 2
945
+  #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8     // Z offset: -below +above  [the nozzle]
939 946
 #elif ANYCUBIC_PROBE_VERSION == 1
940 947
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above  [the nozzle]
941 948
 #else
942
-  #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above  [the nozzle]
949
+  #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above  [the nozzle]
943 950
 #endif
944 951
 
945 952
 // Certain types of probes need to stay away from edges
@@ -1020,10 +1027,10 @@
1020 1027
  * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
1021 1028
  *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
1022 1029
  */
1023
-#define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
1024
-#define Z_CLEARANCE_BETWEEN_PROBES 25 // Z Clearance between probe points
1025
-#define Z_CLEARANCE_MULTI_PROBE    25 // Z Clearance between multiple probes
1026
-#define Z_AFTER_PROBING            30 // Z position after probing is done
1030
+#define Z_CLEARANCE_DEPLOY_PROBE   30 // Z Clearance for Deploy/Stow
1031
+#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
1032
+#define Z_CLEARANCE_MULTI_PROBE    5 // Z Clearance between multiple probes
1033
+#define Z_AFTER_PROBING            5 // Z position after probing is done
1027 1034
 
1028 1035
 #define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
1029 1036
 

+ 3
- 0
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/delta/generic/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/delta/kossel_mini/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/delta/kossel_pro/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/delta/kossel_xl/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/makibox/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/stm32f103ret6/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/tvrrug/Round2/Configuration.h Переглянути файл

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

+ 3
- 0
Marlin/src/config/examples/wt150/Configuration.h Переглянути файл

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

+ 2
- 0
Marlin/src/lcd/language/language_de.h Переглянути файл

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

+ 6
- 0
Marlin/src/lcd/language/language_en.h Переглянути файл

@@ -810,6 +810,12 @@
810 810
 #ifndef MSG_BLTOUCH_STOW
811 811
   #define MSG_BLTOUCH_STOW                    _UxGT("Stow BLTouch")
812 812
 #endif
813
+#ifndef MSG_MANUAL_DEPLOY
814
+  #define MSG_MANUAL_DEPLOY                   _UxGT("Deploy Z-Probe")
815
+#endif
816
+#ifndef MSG_MANUAL_STOW
817
+  #define MSG_MANUAL_STOW                     _UxGT("Stow Z-Probe")
818
+#endif
813 819
 #ifndef MSG_HOME
814 820
   #define MSG_HOME                            _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
815 821
 #endif

+ 24
- 1
Marlin/src/module/probe.cpp Переглянути файл

@@ -28,6 +28,8 @@
28 28
 
29 29
 #if HAS_BED_PROBE
30 30
 
31
+#include "../libs/buzzer.h"
32
+
31 33
 #include "probe.h"
32 34
 #include "motion.h"
33 35
 #include "temperature.h"
@@ -377,7 +379,8 @@ bool set_probe_deployed(const bool deploy) {
377 379
 
378 380
   // Make room for probe to deploy (or stow)
379 381
   // Fix-mounted probe should only raise for deploy
380
-  #if ENABLED(FIX_MOUNTED_PROBE)
382
+  // unless MANUAL_DEPLOY_STOW is enabled
383
+  #if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(MANUAL_DEPLOY_STOW)
381 384
     const bool deploy_stow_condition = deploy;
382 385
   #else
383 386
     constexpr bool deploy_stow_condition = true;
@@ -440,6 +443,26 @@ bool set_probe_deployed(const bool deploy) {
440 443
 
441 444
         deploy ? run_deploy_moves_script() : run_stow_moves_script();
442 445
 
446
+      #elif ENABLED(MANUAL_DEPLOY_STOW)
447
+
448
+        do_probe_raise(Z_CLEARANCE_DEPLOY_PROBE);
449
+
450
+        #if PIN_EXISTS(BEEPER) || ENABLED(LCD_USE_I2C_BUZZER)
451
+          BUZZ(100, 659);
452
+          BUZZ(100, 698);
453
+        #endif
454
+
455
+        const char * const ds_str = deploy ? PSTR(MSG_MANUAL_DEPLOY) : PSTR(MSG_MANUAL_STOW);
456
+        lcd_setalertstatusPGM(ds_str);
457
+        serialprintPGM(ds_str);
458
+        SERIAL_EOL();
459
+
460
+        KEEPALIVE_STATE(PAUSED_FOR_USER);
461
+        wait_for_user = true;
462
+        while (wait_for_user) idle();
463
+        lcd_reset_status();
464
+        KEEPALIVE_STATE(IN_HANDLER);
465
+
443 466
       #endif
444 467
 
445 468
   #ifdef _TRIGGERED_WHEN_STOWED_TEST

+ 1
- 1
buildroot/share/tests/megaatmega2560_tests Переглянути файл

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

Завантаження…
Відмінити
Зберегти