|
@@ -1821,7 +1821,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
1821
|
1821
|
destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_X;
|
1822
|
1822
|
destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Y;
|
1823
|
1823
|
destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Z;
|
1824
|
|
- prepare_move_to_destination_raw(); // this will also set_current_to_destination
|
|
1824
|
+ prepare_move_to_destination(); // this will also set_current_to_destination
|
1825
|
1825
|
|
1826
|
1826
|
// Move to engage deployment
|
1827
|
1827
|
if (Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE)
|
|
@@ -1832,7 +1832,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
1832
|
1832
|
destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_Y;
|
1833
|
1833
|
if (Z_PROBE_ALLEN_KEY_DEPLOY_2_Z != Z_PROBE_ALLEN_KEY_DEPLOY_1_Z)
|
1834
|
1834
|
destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_Z;
|
1835
|
|
- prepare_move_to_destination_raw();
|
|
1835
|
+ prepare_move_to_destination();
|
1836
|
1836
|
|
1837
|
1837
|
#ifdef Z_PROBE_ALLEN_KEY_DEPLOY_3_X
|
1838
|
1838
|
if (Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE)
|
|
@@ -1848,14 +1848,14 @@ static void clean_up_after_endstop_or_probe_move() {
|
1848
|
1848
|
if (Z_PROBE_ALLEN_KEY_DEPLOY_3_Z != Z_PROBE_ALLEN_KEY_DEPLOY_2_Z)
|
1849
|
1849
|
destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_3_Z;
|
1850
|
1850
|
|
1851
|
|
- prepare_move_to_destination_raw();
|
|
1851
|
+ prepare_move_to_destination();
|
1852
|
1852
|
#endif
|
1853
|
1853
|
}
|
1854
|
1854
|
|
1855
|
1855
|
// Partially Home X,Y for safety
|
1856
|
1856
|
destination[X_AXIS] *= 0.75;
|
1857
|
1857
|
destination[Y_AXIS] *= 0.75;
|
1858
|
|
- prepare_move_to_destination_raw(); // this will also set_current_to_destination
|
|
1858
|
+ prepare_move_to_destination(); // this will also set_current_to_destination
|
1859
|
1859
|
|
1860
|
1860
|
feedrate = old_feedrate;
|
1861
|
1861
|
|
|
@@ -1921,7 +1921,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
1921
|
1921
|
destination[X_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_X;
|
1922
|
1922
|
destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_Y;
|
1923
|
1923
|
destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_Z;
|
1924
|
|
- prepare_move_to_destination_raw();
|
|
1924
|
+ prepare_move_to_destination();
|
1925
|
1925
|
|
1926
|
1926
|
// Move the nozzle down to push the Z probe into retracted position
|
1927
|
1927
|
if (Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE)
|
|
@@ -1931,7 +1931,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
1931
|
1931
|
if (Z_PROBE_ALLEN_KEY_STOW_2_Y != Z_PROBE_ALLEN_KEY_STOW_1_Y)
|
1932
|
1932
|
destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_Y;
|
1933
|
1933
|
destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_Z;
|
1934
|
|
- prepare_move_to_destination_raw();
|
|
1934
|
+ prepare_move_to_destination();
|
1935
|
1935
|
|
1936
|
1936
|
// Move up for safety
|
1937
|
1937
|
if (Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE)
|
|
@@ -1941,13 +1941,13 @@ static void clean_up_after_endstop_or_probe_move() {
|
1941
|
1941
|
if (Z_PROBE_ALLEN_KEY_STOW_3_Y != Z_PROBE_ALLEN_KEY_STOW_2_Y)
|
1942
|
1942
|
destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_Y;
|
1943
|
1943
|
destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_Z;
|
1944
|
|
- prepare_move_to_destination_raw();
|
|
1944
|
+ prepare_move_to_destination();
|
1945
|
1945
|
|
1946
|
1946
|
// Home XY for safety
|
1947
|
1947
|
feedrate = homing_feedrate[X_AXIS] / 2;
|
1948
|
1948
|
destination[X_AXIS] = 0;
|
1949
|
1949
|
destination[Y_AXIS] = 0;
|
1950
|
|
- prepare_move_to_destination_raw(); // this will also set_current_to_destination
|
|
1950
|
+ prepare_move_to_destination(); // this will also set_current_to_destination
|
1951
|
1951
|
|
1952
|
1952
|
feedrate = old_feedrate;
|
1953
|
1953
|
|