Explorar el Código

Allow Z_SAFE_HOMING sanity checks to handle floats

Scott Lahteine hace 7 años
padre
commit
f6d13e2295
Se han modificado 1 ficheros con 9 adiciones y 9 borrados
  1. 9
    9
      Marlin/src/inc/SanityCheck.h

+ 9
- 9
Marlin/src/inc/SanityCheck.h Ver fichero

920
  */
920
  */
921
 #if ENABLED(Z_SAFE_HOMING)
921
 #if ENABLED(Z_SAFE_HOMING)
922
   #if HAS_BED_PROBE
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
   #endif
932
   #endif
933
 #endif // Z_SAFE_HOMING
933
 #endif // Z_SAFE_HOMING
934
 
934
 

Loading…
Cancelar
Guardar