Browse Source

Revert quick-home changes

Scott Lahteine 9 years ago
parent
commit
177ec20bf0
1 changed files with 4 additions and 9 deletions
  1. 4
    9
      Marlin/Marlin_main.cpp

+ 4
- 9
Marlin/Marlin_main.cpp View File

@@ -2936,19 +2936,14 @@ inline void gcode_G28() {
2936 2936
 
2937 2937
     #if ENABLED(QUICK_HOME)
2938 2938
 
2939
-      bool quick_homed = home_all_axis || (homeX && homeY);
2940
-      if (quick_homed) quick_home_xy();
2941
-
2942
-    #else
2943
-
2944
-      const bool quick_homed = false;
2939
+      if (home_all_axis || (homeX && homeY)) quick_home_xy();
2945 2940
 
2946 2941
     #endif
2947 2942
 
2948 2943
     #if ENABLED(HOME_Y_BEFORE_X)
2949 2944
 
2950 2945
       // Home Y
2951
-      if (!quick_homed && (home_all_axis || homeY)) {
2946
+      if (home_all_axis || homeY) {
2952 2947
         HOMEAXIS(Y);
2953 2948
         #if ENABLED(DEBUG_LEVELING_FEATURE)
2954 2949
           if (DEBUGGING(LEVELING)) DEBUG_POS("> homeY", current_position);
@@ -2958,7 +2953,7 @@ inline void gcode_G28() {
2958 2953
     #endif
2959 2954
 
2960 2955
     // Home X
2961
-    if (!quick_homed && (home_all_axis || homeX)) {
2956
+    if (home_all_axis || homeX) {
2962 2957
       #if ENABLED(DUAL_X_CARRIAGE)
2963 2958
         int tmp_extruder = active_extruder;
2964 2959
         extruder_duplication_enabled = false;
@@ -2981,7 +2976,7 @@ inline void gcode_G28() {
2981 2976
 
2982 2977
     #if DISABLED(HOME_Y_BEFORE_X)
2983 2978
       // Home Y
2984
-      if (!quick_homed && (home_all_axis || homeY)) {
2979
+      if (home_all_axis || homeY) {
2985 2980
         HOMEAXIS(Y);
2986 2981
         #if ENABLED(DEBUG_LEVELING_FEATURE)
2987 2982
           if (DEBUGGING(LEVELING)) DEBUG_POS("> homeY", current_position);

Loading…
Cancel
Save