소스 검색

Revert quick-home changes

Scott Lahteine 9 년 전
부모
커밋
177ec20bf0
1개의 변경된 파일4개의 추가작업 그리고 9개의 파일을 삭제
  1. 4
    9
      Marlin/Marlin_main.cpp

+ 4
- 9
Marlin/Marlin_main.cpp 파일 보기

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

Loading…
취소
저장