Browse Source

Use prepare_move_to_destination for Allen Key deploy/stow

Scott Lahteine 8 years ago
parent
commit
da6b0dab5f
1 changed files with 8 additions and 8 deletions
  1. 8
    8
      Marlin/Marlin_main.cpp

+ 8
- 8
Marlin/Marlin_main.cpp View File

1821
           destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_X;
1821
           destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_X;
1822
           destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Y;
1822
           destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Y;
1823
           destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Z;
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
           // Move to engage deployment
1826
           // Move to engage deployment
1827
           if (Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE)
1827
           if (Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE)
1832
             destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_Y;
1832
             destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_Y;
1833
           if (Z_PROBE_ALLEN_KEY_DEPLOY_2_Z != Z_PROBE_ALLEN_KEY_DEPLOY_1_Z)
1833
           if (Z_PROBE_ALLEN_KEY_DEPLOY_2_Z != Z_PROBE_ALLEN_KEY_DEPLOY_1_Z)
1834
             destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_2_Z;
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
           #ifdef Z_PROBE_ALLEN_KEY_DEPLOY_3_X
1837
           #ifdef Z_PROBE_ALLEN_KEY_DEPLOY_3_X
1838
             if (Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE)
1838
             if (Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE != Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE)
1848
             if (Z_PROBE_ALLEN_KEY_DEPLOY_3_Z != Z_PROBE_ALLEN_KEY_DEPLOY_2_Z)
1848
             if (Z_PROBE_ALLEN_KEY_DEPLOY_3_Z != Z_PROBE_ALLEN_KEY_DEPLOY_2_Z)
1849
               destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_3_Z;
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
           #endif
1852
           #endif
1853
         }
1853
         }
1854
 
1854
 
1855
       // Partially Home X,Y for safety
1855
       // Partially Home X,Y for safety
1856
       destination[X_AXIS] *= 0.75;
1856
       destination[X_AXIS] *= 0.75;
1857
       destination[Y_AXIS] *= 0.75;
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
       feedrate = old_feedrate;
1860
       feedrate = old_feedrate;
1861
 
1861
 
1921
       destination[X_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_X;
1921
       destination[X_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_X;
1922
       destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_Y;
1922
       destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_Y;
1923
       destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_1_Z;
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
       // Move the nozzle down to push the Z probe into retracted position
1926
       // Move the nozzle down to push the Z probe into retracted position
1927
       if (Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE)
1927
       if (Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE)
1931
       if (Z_PROBE_ALLEN_KEY_STOW_2_Y != Z_PROBE_ALLEN_KEY_STOW_1_Y)
1931
       if (Z_PROBE_ALLEN_KEY_STOW_2_Y != Z_PROBE_ALLEN_KEY_STOW_1_Y)
1932
         destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_Y;
1932
         destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_Y;
1933
       destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_2_Z;
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
       // Move up for safety
1936
       // Move up for safety
1937
       if (Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE)
1937
       if (Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE != Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE)
1941
       if (Z_PROBE_ALLEN_KEY_STOW_3_Y != Z_PROBE_ALLEN_KEY_STOW_2_Y)
1941
       if (Z_PROBE_ALLEN_KEY_STOW_3_Y != Z_PROBE_ALLEN_KEY_STOW_2_Y)
1942
         destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_Y;
1942
         destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_Y;
1943
       destination[Z_AXIS] = Z_PROBE_ALLEN_KEY_STOW_3_Z;
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
       // Home XY for safety
1946
       // Home XY for safety
1947
       feedrate = homing_feedrate[X_AXIS] / 2;
1947
       feedrate = homing_feedrate[X_AXIS] / 2;
1948
       destination[X_AXIS] = 0;
1948
       destination[X_AXIS] = 0;
1949
       destination[Y_AXIS] = 0;
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
       feedrate = old_feedrate;
1952
       feedrate = old_feedrate;
1953
 
1953
 

Loading…
Cancel
Save