Browse Source

Merge pull request #1790 from Wurstnase/fix_home_z

fix feedrate for homing z
Scott Lahteine 10 years ago
parent
commit
e4934164e4
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      Marlin/Marlin_main.cpp

+ 2
- 2
Marlin/Marlin_main.cpp View File

1827
       // Raise Z before homing any other axes
1827
       // Raise Z before homing any other axes
1828
       if (home_all_axis || homeZ) {
1828
       if (home_all_axis || homeZ) {
1829
         destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS);    // Set destination away from bed
1829
         destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS);    // Set destination away from bed
1830
-        feedrate = max_feedrate[Z_AXIS];
1830
+        feedrate = max_feedrate[Z_AXIS] * 60;
1831
         line_to_destination();
1831
         line_to_destination();
1832
         st_synchronize();
1832
         st_synchronize();
1833
       }
1833
       }
1960
               current_position[Z_AXIS] = 0;
1960
               current_position[Z_AXIS] = 0;
1961
               plan_set_position(cpx, cpy, 0, current_position[E_AXIS]);
1961
               plan_set_position(cpx, cpy, 0, current_position[E_AXIS]);
1962
               destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS);    // Set destination away from bed
1962
               destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS);    // Set destination away from bed
1963
-              feedrate = max_feedrate[Z_AXIS];
1963
+              feedrate = max_feedrate[Z_AXIS] * 60;  // max_feedrate is in mm/s. line_to_destination is feedrate/60.
1964
               line_to_destination();
1964
               line_to_destination();
1965
               st_synchronize();
1965
               st_synchronize();
1966
               HOMEAXIS(Z);
1966
               HOMEAXIS(Z);

Loading…
Cancel
Save