浏览代码

Fix BLTOUCH compile error

Followup to #10250
Scott Lahteine 7 年前
父节点
当前提交
b852781eba
共有 1 个文件被更改,包括 20 次插入13 次删除
  1. 20
    13
      Marlin/src/module/motion.cpp

+ 20
- 13
Marlin/src/module/motion.cpp 查看文件

1007
   const bool is_home_dir = (axis_home_dir > 0) == (distance > 0);
1007
   const bool is_home_dir = (axis_home_dir > 0) == (distance > 0);
1008
 
1008
 
1009
   if (is_home_dir) {
1009
   if (is_home_dir) {
1010
-    #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
1011
-      const bool deploy_bltouch = (axis == Z_AXIS && is_home_dir);
1012
-      if (deploy_bltouch) set_bltouch_deployed(true);
1013
-    #endif
1014
 
1010
 
1015
-    #if QUIET_PROBING
1016
-      if (axis == Z_AXIS) probing_pause(true);
1017
-    #endif
1011
+    if (axis == Z_AXIS) {
1012
+      #if HOMING_Z_WITH_PROBE
1013
+        #if ENABLED(BLTOUCH)
1014
+          set_bltouch_deployed(true);
1015
+        #endif
1016
+        #if QUIET_PROBING
1017
+          probing_pause(true);
1018
+        #endif
1019
+      #endif
1020
+    }
1018
 
1021
 
1019
     // Disable stealthChop if used. Enable diag1 pin on driver.
1022
     // Disable stealthChop if used. Enable diag1 pin on driver.
1020
     #if ENABLED(SENSORLESS_HOMING)
1023
     #if ENABLED(SENSORLESS_HOMING)
1039
   stepper.synchronize();
1042
   stepper.synchronize();
1040
 
1043
 
1041
   if (is_home_dir) {
1044
   if (is_home_dir) {
1042
-    #if QUIET_PROBING
1043
-      if (axis == Z_AXIS) probing_pause(false);
1044
-    #endif
1045
 
1045
 
1046
-    #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
1047
-      if (deploy_bltouch) set_bltouch_deployed(false);
1048
-    #endif
1046
+    if (axis == Z_AXIS) {
1047
+      #if HOMING_Z_WITH_PROBE
1048
+        #if QUIET_PROBING
1049
+          probing_pause(false);
1050
+        #endif
1051
+        #if ENABLED(BLTOUCH)
1052
+          set_bltouch_deployed(false);
1053
+        #endif
1054
+      #endif
1055
+    }
1049
 
1056
 
1050
     endstops.hit_on_purpose();
1057
     endstops.hit_on_purpose();
1051
 
1058
 

正在加载...
取消
保存