|
@@ -1796,6 +1796,162 @@ static void clean_up_after_endstop_or_probe_move() {
|
1796
|
1796
|
}
|
1797
|
1797
|
|
1798
|
1798
|
#endif // Z_PROBE_SLED
|
|
1799
|
+#if ENABLED(Z_PROBE_ALLEN_KEY)
|
|
1800
|
+ void run_deploy_moves_script() {
|
|
1801
|
+ #if defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_X) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_Y) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_Z)
|
|
1802
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_1_X
|
|
1803
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X current_position[X_AXIS]
|
|
1804
|
+ #endif
|
|
1805
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_1_Y
|
|
1806
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y current_position[Y_AXIS]
|
|
1807
|
+ #endif
|
|
1808
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_1_Z
|
|
1809
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z current_position[Z_AXIS]
|
|
1810
|
+ #endif
|
|
1811
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE
|
|
1812
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE 0.0
|
|
1813
|
+ #endif
|
|
1814
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_DEPLOY_1_X, Z_PROBE_ALLEN_KEY_DEPLOY_1_Y, Z_PROBE_ALLEN_KEY_DEPLOY_1_Z, Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE);
|
|
1815
|
+ #endif
|
|
1816
|
+ #if defined(Z_PROBE_ALLEN_KEY_DEPLOY_2_X) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_2_Y) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_2_Z)
|
|
1817
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_2_X
|
|
1818
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X current_position[X_AXIS]
|
|
1819
|
+ #endif
|
|
1820
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_2_Y
|
|
1821
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y current_position[Y_AXIS]
|
|
1822
|
+ #endif
|
|
1823
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_2_Z
|
|
1824
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z current_position[Z_AXIS]
|
|
1825
|
+ #endif
|
|
1826
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE
|
|
1827
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE 0.0
|
|
1828
|
+ #endif
|
|
1829
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_DEPLOY_2_X, Z_PROBE_ALLEN_KEY_DEPLOY_2_Y, Z_PROBE_ALLEN_KEY_DEPLOY_2_Z, Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE);
|
|
1830
|
+ #endif
|
|
1831
|
+ #if defined(Z_PROBE_ALLEN_KEY_DEPLOY_3_X) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_3_Y) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_3_Z)
|
|
1832
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_3_X
|
|
1833
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X current_position[X_AXIS]
|
|
1834
|
+ #endif
|
|
1835
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_3_Y
|
|
1836
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y current_position[Y_AXIS]
|
|
1837
|
+ #endif
|
|
1838
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_3_Z
|
|
1839
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z current_position[Z_AXIS]
|
|
1840
|
+ #endif
|
|
1841
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE
|
|
1842
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE 0.0
|
|
1843
|
+ #endif
|
|
1844
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_DEPLOY_3_X, Z_PROBE_ALLEN_KEY_DEPLOY_3_Y, Z_PROBE_ALLEN_KEY_DEPLOY_3_Z, Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE);
|
|
1845
|
+ #endif
|
|
1846
|
+ #if defined(Z_PROBE_ALLEN_KEY_DEPLOY_4_X) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_4_Y) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_4_Z)
|
|
1847
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_4_X
|
|
1848
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_4_X current_position[X_AXIS]
|
|
1849
|
+ #endif
|
|
1850
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_4_Y
|
|
1851
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_4_Y current_position[Y_AXIS]
|
|
1852
|
+ #endif
|
|
1853
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_4_Z
|
|
1854
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_4_Z current_position[Z_AXIS]
|
|
1855
|
+ #endif
|
|
1856
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_4_FEEDRATE
|
|
1857
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_4_FEEDRATE 0.0
|
|
1858
|
+ #endif
|
|
1859
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_DEPLOY_4_X, Z_PROBE_ALLEN_KEY_DEPLOY_4_Y, Z_PROBE_ALLEN_KEY_DEPLOY_4_Z, Z_PROBE_ALLEN_KEY_DEPLOY_4_FEEDRATE);
|
|
1860
|
+ #endif
|
|
1861
|
+ #if defined(Z_PROBE_ALLEN_KEY_DEPLOY_5_X) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_5_Y) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_5_Z)
|
|
1862
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_5_X
|
|
1863
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_5_X current_position[X_AXIS]
|
|
1864
|
+ #endif
|
|
1865
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_5_Y
|
|
1866
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_5_Y current_position[Y_AXIS]
|
|
1867
|
+ #endif
|
|
1868
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_5_Z
|
|
1869
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_5_Z current_position[Z_AXIS]
|
|
1870
|
+ #endif
|
|
1871
|
+ #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_5_FEEDRATE
|
|
1872
|
+ #define Z_PROBE_ALLEN_KEY_DEPLOY_5_FEEDRATE 0.0
|
|
1873
|
+ #endif
|
|
1874
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_DEPLOY_5_X, Z_PROBE_ALLEN_KEY_DEPLOY_5_Y, Z_PROBE_ALLEN_KEY_DEPLOY_5_Z, Z_PROBE_ALLEN_KEY_DEPLOY_5_FEEDRATE);
|
|
1875
|
+ #endif
|
|
1876
|
+ }
|
|
1877
|
+ void run_stow_moves_script() {
|
|
1878
|
+ #if defined(Z_PROBE_ALLEN_KEY_STOW_1_X) || defined(Z_PROBE_ALLEN_KEY_STOW_1_Y) || defined(Z_PROBE_ALLEN_KEY_STOW_1_Z)
|
|
1879
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_1_X
|
|
1880
|
+ #define Z_PROBE_ALLEN_KEY_STOW_1_X current_position[X_AXIS]
|
|
1881
|
+ #endif
|
|
1882
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_1_Y
|
|
1883
|
+ #define Z_PROBE_ALLEN_KEY_STOW_1_Y current_position[Y_AXIS]
|
|
1884
|
+ #endif
|
|
1885
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_1_Z
|
|
1886
|
+ #define Z_PROBE_ALLEN_KEY_STOW_1_Z current_position[Z_AXIS]
|
|
1887
|
+ #endif
|
|
1888
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE
|
|
1889
|
+ #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE 0.0
|
|
1890
|
+ #endif
|
|
1891
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_STOW_1_X, Z_PROBE_ALLEN_KEY_STOW_1_Y, Z_PROBE_ALLEN_KEY_STOW_1_Z, Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE);
|
|
1892
|
+ #endif
|
|
1893
|
+ #if defined(Z_PROBE_ALLEN_KEY_STOW_2_X) || defined(Z_PROBE_ALLEN_KEY_STOW_2_Y) || defined(Z_PROBE_ALLEN_KEY_STOW_2_Z)
|
|
1894
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_2_X
|
|
1895
|
+ #define Z_PROBE_ALLEN_KEY_STOW_2_X current_position[X_AXIS]
|
|
1896
|
+ #endif
|
|
1897
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_2_Y
|
|
1898
|
+ #define Z_PROBE_ALLEN_KEY_STOW_2_Y current_position[Y_AXIS]
|
|
1899
|
+ #endif
|
|
1900
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_2_Z
|
|
1901
|
+ #define Z_PROBE_ALLEN_KEY_STOW_2_Z current_position[Z_AXIS]
|
|
1902
|
+ #endif
|
|
1903
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE
|
|
1904
|
+ #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE 0.0
|
|
1905
|
+ #endif
|
|
1906
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_STOW_2_X, Z_PROBE_ALLEN_KEY_STOW_2_Y, Z_PROBE_ALLEN_KEY_STOW_2_Z, Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE);
|
|
1907
|
+ #endif
|
|
1908
|
+ #if defined(Z_PROBE_ALLEN_KEY_STOW_3_X) || defined(Z_PROBE_ALLEN_KEY_STOW_3_Y) || defined(Z_PROBE_ALLEN_KEY_STOW_3_Z)
|
|
1909
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_3_X
|
|
1910
|
+ #define Z_PROBE_ALLEN_KEY_STOW_3_X current_position[X_AXIS]
|
|
1911
|
+ #endif
|
|
1912
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_3_Y
|
|
1913
|
+ #define Z_PROBE_ALLEN_KEY_STOW_3_Y current_position[Y_AXIS]
|
|
1914
|
+ #endif
|
|
1915
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_3_Z
|
|
1916
|
+ #define Z_PROBE_ALLEN_KEY_STOW_3_Z current_position[Z_AXIS]
|
|
1917
|
+ #endif
|
|
1918
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE
|
|
1919
|
+ #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE 0.0
|
|
1920
|
+ #endif
|
|
1921
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_STOW_3_X, Z_PROBE_ALLEN_KEY_STOW_3_Y, Z_PROBE_ALLEN_KEY_STOW_3_Z, Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE);
|
|
1922
|
+ #endif
|
|
1923
|
+ #if defined(Z_PROBE_ALLEN_KEY_STOW_4_X) || defined(Z_PROBE_ALLEN_KEY_STOW_4_Y) || defined(Z_PROBE_ALLEN_KEY_STOW_4_Z)
|
|
1924
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_4_X
|
|
1925
|
+ #define Z_PROBE_ALLEN_KEY_STOW_4_X current_position[X_AXIS]
|
|
1926
|
+ #endif
|
|
1927
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_4_Y
|
|
1928
|
+ #define Z_PROBE_ALLEN_KEY_STOW_4_Y current_position[Y_AXIS]
|
|
1929
|
+ #endif
|
|
1930
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_4_Z
|
|
1931
|
+ #define Z_PROBE_ALLEN_KEY_STOW_4_Z current_position[Z_AXIS]
|
|
1932
|
+ #endif
|
|
1933
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_4_FEEDRATE
|
|
1934
|
+ #define Z_PROBE_ALLEN_KEY_STOW_4_FEEDRATE 0.0
|
|
1935
|
+ #endif
|
|
1936
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_STOW_4_X, Z_PROBE_ALLEN_KEY_STOW_4_Y, Z_PROBE_ALLEN_KEY_STOW_4_Z, Z_PROBE_ALLEN_KEY_STOW_4_FEEDRATE);
|
|
1937
|
+ #endif
|
|
1938
|
+ #if defined(Z_PROBE_ALLEN_KEY_STOW_5_X) || defined(Z_PROBE_ALLEN_KEY_STOW_5_Y) || defined(Z_PROBE_ALLEN_KEY_STOW_5_Z)
|
|
1939
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_5_X
|
|
1940
|
+ #define Z_PROBE_ALLEN_KEY_STOW_5_X current_position[X_AXIS]
|
|
1941
|
+ #endif
|
|
1942
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_5_Y
|
|
1943
|
+ #define Z_PROBE_ALLEN_KEY_STOW_5_Y current_position[Y_AXIS]
|
|
1944
|
+ #endif
|
|
1945
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_5_Z
|
|
1946
|
+ #define Z_PROBE_ALLEN_KEY_STOW_5_Z current_position[Z_AXIS]
|
|
1947
|
+ #endif
|
|
1948
|
+ #ifndef Z_PROBE_ALLEN_KEY_STOW_5_FEEDRATE
|
|
1949
|
+ #define Z_PROBE_ALLEN_KEY_STOW_5_FEEDRATE 0.0
|
|
1950
|
+ #endif
|
|
1951
|
+ do_blocking_move_to(Z_PROBE_ALLEN_KEY_STOW_5_X, Z_PROBE_ALLEN_KEY_STOW_5_Y, Z_PROBE_ALLEN_KEY_STOW_5_Z, Z_PROBE_ALLEN_KEY_STOW_5_FEEDRATE);
|
|
1952
|
+ #endif
|
|
1953
|
+ }
|
|
1954
|
+#endif
|
1799
|
1955
|
|
1800
|
1956
|
#if HAS_BED_PROBE
|
1801
|
1957
|
|
|
@@ -1833,50 +1989,9 @@ static void clean_up_after_endstop_or_probe_move() {
|
1833
|
1989
|
if (z_min_endstop)
|
1834
|
1990
|
#endif
|
1835
|
1991
|
{
|
1836
|
|
- // Move to the start position to initiate deployment
|
1837
|
|
- destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_X;
|
1838
|
|
- destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Y;
|
1839
|
|
- destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Z;
|
1840
|
|
- prepare_move_to_destination(); // this will also set_current_to_destination
|
1841
|
|
-
|
1842
|
|
- // Move to engage deployment
|
1843
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE)
|
1844
|
|
- feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE;
|
1845
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_2_X != Z_PROBE_ALLEN_KEY_DEPLOY_1_X)
|
1846
|
|
- destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_X;
|
1847
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_2_Y != Z_PROBE_ALLEN_KEY_DEPLOY_1_Y)
|
1848
|
|
- destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_Y;
|
1849
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_2_Z != Z_PROBE_ALLEN_KEY_DEPLOY_1_Z)
|
1850
|
|
- destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_Z;
|
1851
|
|
- prepare_move_to_destination();
|
1852
|
|
-
|
1853
|
|
- #ifdef Z_PROBE_ALLEN_KEY_DEPLOY_3_X
|
1854
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE)
|
1855
|
|
- feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE;
|
1856
|
|
-
|
1857
|
|
- // Move to trigger deployment
|
1858
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE)
|
1859
|
|
- feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE;
|
1860
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_3_X != Z_PROBE_ALLEN_KEY_DEPLOY_2_X)
|
1861
|
|
- destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_3_X;
|
1862
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_3_Y != Z_PROBE_ALLEN_KEY_DEPLOY_2_Y)
|
1863
|
|
- destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_3_Y;
|
1864
|
|
- if (Z_PROBE_ALLEN_KEY_DEPLOY_3_Z != Z_PROBE_ALLEN_KEY_DEPLOY_2_Z)
|
1865
|
|
- destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_3_Z;
|
1866
|
|
-
|
1867
|
|
- prepare_move_to_destination();
|
1868
|
|
- #endif
|
|
1992
|
+ run_deploy_moves_script();
|
1869
|
1993
|
}
|
1870
|
1994
|
|
1871
|
|
- // Partially Home X,Y for safety
|
1872
|
|
- destination[X_AXIS] *= 0.75;
|
1873
|
|
- destination[Y_AXIS] *= 0.75;
|
1874
|
|
- prepare_move_to_destination(); // this will also set_current_to_destination
|
1875
|
|
-
|
1876
|
|
- feedrate = old_feedrate;
|
1877
|
|
-
|
1878
|
|
- stepper.synchronize();
|
1879
|
|
-
|
1880
|
1995
|
#if ENABLED(Z_MIN_PROBE_ENDSTOP)
|
1881
|
1996
|
z_probe_endstop = (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING);
|
1882
|
1997
|
if (z_probe_endstop)
|
|
@@ -1923,51 +2038,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
1923
|
2038
|
|
1924
|
2039
|
#elif ENABLED(Z_PROBE_ALLEN_KEY)
|
1925
|
2040
|
|
1926
|
|
- float old_feedrate = feedrate;
|
1927
|
|
-
|
1928
|
|
- // Move up for safety
|
1929
|
|
- feedrate = Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE;
|
1930
|
|
-
|
1931
|
|
- #if _Z_RAISE_PROBE_DEPLOY_STOW > 0
|
1932
|
|
- destination[Z_AXIS] = current_position[Z_AXIS] + _Z_RAISE_PROBE_DEPLOY_STOW;
|
1933
|
|
- prepare_move_to_destination_raw(); // this will also set_current_to_destination
|
1934
|
|
- #endif
|
1935
|
|
-
|
1936
|
|
- // Move to the start position to initiate retraction
|
1937
|
|
- destination[X_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_X;
|
1938
|
|
- destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_Y;
|
1939
|
|
- destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_Z;
|
1940
|
|
- prepare_move_to_destination();
|
1941
|
|
-
|
1942
|
|
- // Move the nozzle down to push the Z probe into retracted position
|
1943
|
|
- if (Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE)
|
1944
|
|
- feedrate = Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE;
|
1945
|
|
- if (Z_PROBE_ALLEN_KEY_STOW_2_X != Z_PROBE_ALLEN_KEY_STOW_1_X)
|
1946
|
|
- destination[X_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_X;
|
1947
|
|
- if (Z_PROBE_ALLEN_KEY_STOW_2_Y != Z_PROBE_ALLEN_KEY_STOW_1_Y)
|
1948
|
|
- destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_Y;
|
1949
|
|
- destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_Z;
|
1950
|
|
- prepare_move_to_destination();
|
1951
|
|
-
|
1952
|
|
- // Move up for safety
|
1953
|
|
- if (Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE)
|
1954
|
|
- feedrate = Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE;
|
1955
|
|
- if (Z_PROBE_ALLEN_KEY_STOW_3_X != Z_PROBE_ALLEN_KEY_STOW_2_X)
|
1956
|
|
- destination[X_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_X;
|
1957
|
|
- if (Z_PROBE_ALLEN_KEY_STOW_3_Y != Z_PROBE_ALLEN_KEY_STOW_2_Y)
|
1958
|
|
- destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_Y;
|
1959
|
|
- destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_Z;
|
1960
|
|
- prepare_move_to_destination();
|
1961
|
|
-
|
1962
|
|
- // Home XY for safety
|
1963
|
|
- feedrate = homing_feedrate[X_AXIS] / 2;
|
1964
|
|
- destination[X_AXIS] = 0;
|
1965
|
|
- destination[Y_AXIS] = 0;
|
1966
|
|
- prepare_move_to_destination(); // this will also set_current_to_destination
|
1967
|
|
-
|
1968
|
|
- feedrate = old_feedrate;
|
1969
|
|
-
|
1970
|
|
- stepper.synchronize();
|
|
2041
|
+ run_stow_moves_script();
|
1971
|
2042
|
|
1972
|
2043
|
#if ENABLED(Z_MIN_PROBE_ENDSTOP)
|
1973
|
2044
|
bool z_probe_endstop = (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING);
|