Browse Source

Merge remote-tracking branch 'origin/Development' into Development

Chris Roadfeldt 10 years ago
parent
commit
faac2af4af
1 changed files with 0 additions and 2 deletions
  1. 0
    2
      Marlin/Marlin_main.cpp

+ 0
- 2
Marlin/Marlin_main.cpp View File

@@ -1889,12 +1889,10 @@ inline void gcode_G28() {
1889 1889
         if (home_all_axis || homeZ) {
1890 1890
           // Raise Z before homing Z? Shouldn't this happen before homing X or Y?
1891 1891
           #if defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0
1892
-            #ifndef Z_PROBE_AND_ENDSTOP
1893 1892
             destination[Z_AXIS] = -Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS);    // Set destination away from bed
1894 1893
             feedrate = max_feedrate[Z_AXIS];
1895 1894
             plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate, active_extruder);
1896 1895
             st_synchronize();
1897
-            #endif
1898 1896
           #endif
1899 1897
           HOMEAXIS(Z);
1900 1898
         }

Loading…
Cancel
Save