Parcourir la source

Allow Z_SAFE_HOMING sanity checks to handle floats

Scott Lahteine il y a 7 ans
Parent
révision
f6d13e2295
1 fichiers modifiés avec 9 ajouts et 9 suppressions
  1. 9
    9
      Marlin/src/inc/SanityCheck.h

+ 9
- 9
Marlin/src/inc/SanityCheck.h Voir le fichier

@@ -920,15 +920,15 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
920 920
  */
921 921
 #if ENABLED(Z_SAFE_HOMING)
922 922
   #if HAS_BED_PROBE
923
-    #if !WITHIN(Z_SAFE_HOMING_X_POINT, MIN_PROBE_X, MAX_PROBE_X)
924
-      #error "Z_SAFE_HOMING_X_POINT is outside the probe region."
925
-    #elif !WITHIN(Z_SAFE_HOMING_Y_POINT, MIN_PROBE_Y, MAX_PROBE_Y)
926
-      #error "Z_SAFE_HOMING_Y_POINT is outside the probe region."
927
-    #endif
928
-  #elif !WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS)
929
-    #error "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle."
930
-  #elif !WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS)
931
-    #error "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle."
923
+    static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, MIN_PROBE_X, MAX_PROBE_X),
924
+      "Z_SAFE_HOMING_X_POINT is outside the probe region.");
925
+    static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, MIN_PROBE_Y, MAX_PROBE_Y),
926
+      "Z_SAFE_HOMING_Y_POINT is outside the probe region.");
927
+  #else
928
+    static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS),
929
+      "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
930
+    static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS),
931
+      "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
932 932
   #endif
933 933
 #endif // Z_SAFE_HOMING
934 934
 

Chargement…
Annuler
Enregistrer