Browse Source

Fix Z safe homing sanity check for no probe

Fix #9851
Scott Lahteine 7 years ago
parent
commit
8c03ce4d80
1 changed files with 7 additions and 9 deletions
  1. 7
    9
      Marlin/src/inc/SanityCheck.h

+ 7
- 9
Marlin/src/inc/SanityCheck.h View File

@@ -947,18 +947,16 @@ static_assert(1 >= 0
947 947
  * Make sure Z_SAFE_HOMING point is reachable
948 948
  */
949 949
 #if ENABLED(Z_SAFE_HOMING)
950
-  #if !WITHIN(Z_SAFE_HOMING_X_POINT, MIN_PROBE_X, MAX_PROBE_X)
951
-    #if HAS_BED_PROBE
950
+  #if HAS_BED_PROBE
951
+    #if !WITHIN(Z_SAFE_HOMING_X_POINT, MIN_PROBE_X, MAX_PROBE_X)
952 952
       #error "Z_SAFE_HOMING_X_POINT can't be reached by the Z probe."
953
-    #else
954
-      #error "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle."
955
-    #endif
956
-  #elif !WITHIN(Z_SAFE_HOMING_Y_POINT, MIN_PROBE_Y, MAX_PROBE_Y)
957
-    #if HAS_BED_PROBE
953
+    #elif !WITHIN(Z_SAFE_HOMING_Y_POINT, MIN_PROBE_Y, MAX_PROBE_Y)
958 954
       #error "Z_SAFE_HOMING_Y_POINT can't be reached by the Z probe."
959
-    #else
960
-      #error "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle."
961 955
     #endif
956
+  #elif !WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS)
957
+    #error "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle."
958
+  #elif !WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS)
959
+    #error "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle."
962 960
   #endif
963 961
 #endif // Z_SAFE_HOMING
964 962
 

Loading…
Cancel
Save