cleanup

MarlinFirmware · Jan 16, 2022 · 4a894ff · 4a894ff
1 parent 06888cb
commit 4a894ff
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 31 deletions.
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
@@ -309,26 +309,14 @@ class GCodeParser {
     }
 
     static float axis_unit_factor(const AxisEnum axis) {
-      #if HAS_ROTATIONAL_AXES
-        if (axis == I_AXIS
-          #if ENABLED(AXIS5_ROTATES)
-            || axis == J_AXIS
-          #endif
-          #if ENABLED(AXIS6_ROTATES)
-            || axis == K_AXIS
-          #endif
-          #if ENABLED(AXIS7_ROTATES)
-            || axis == U_AXIS
-          #endif
-          #if ENABLED(AXIS8_ROTATES)
-            || axis == V_AXIS
-          #endif
-          #if ENABLED(AXIS9_ROTATES)
-            || axis == W_AXIS
-          #endif
-        )
-          return 1.0f;
-      #endif
+      if (false
+        || TERN0(AXIS4_ROTATES, axis == I_AXIS)
+        || TERN0(AXIS5_ROTATES, axis == J_AXIS)
+        || TERN0(AXIS6_ROTATES, axis == K_AXIS)
+        || TERN0(AXIS7_ROTATES, axis == U_AXIS)
+        || TERN0(AXIS8_ROTATES, axis == V_AXIS)
+        || TERN0(AXIS9_ROTATES, axis == W_AXIS)
+      ) return 1.0f;
       #if HAS_EXTRUDERS
         if (axis >= E_AXIS && volumetric_enabled) return volumetric_unit_factor;
       #endif

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -1448,7 +1448,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_J_AXIS
   #if AXIS5_NAME == AXIS4_NAME
     #error "AXIS5_NAME must be unique."
-  #elif defined(AXIS5_ROTATES) && !defined(AXIS4_ROTATES)
+  #elif ENABLED(AXIS5_ROTATES) && DISABLED(AXIS4_ROTATES)
     #error "AXIS4_ROTATES must be enabled with AXIS5_ROTATES."
   #elif !defined(J_MIN_POS) || !defined(J_MAX_POS)
     #error "J_MIN_POS and J_MAX_POS are required with NUM_AXES >= 5."
@@ -1461,7 +1461,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_K_AXIS
   #if AXIS6_NAME == AXIS5_NAME || AXIS6_NAME == AXIS4_NAME
     #error "AXIS6_NAME must be unique."
-  #elif defined(AXIS6_ROTATES) && (!defined(AXIS5_ROTATES) || !defined(AXIS4_ROTATES))
+  #elif ENABLED(AXIS6_ROTATES) && !BOTH(AXIS5_ROTATES, AXIS4_ROTATES)
     #error "AXIS4_ROTATES and AXIS5_ROTATES must be enabled with AXIS6_ROTATES."
   #elif !defined(K_MIN_POS) || !defined(K_MAX_POS)
     #error "K_MIN_POS and K_MAX_POS are required with NUM_AXES >= 6."
@@ -1474,7 +1474,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_U_AXIS
   #if AXIS7_NAME == AXIS6_NAME || AXIS7_NAME == AXIS5_NAME || AXIS7_NAME == AXIS4_NAME
     #error "AXIS7_NAME must be unique."
-  #elif defined(AXIS7_ROTATES) && (!defined(AXIS6_ROTATES) || !defined(AXIS5_ROTATES) || !defined(AXIS4_ROTATES))
+  #elif ENABLED(AXIS7_ROTATES) && !ALL(AXIS6_ROTATES, AXIS5_ROTATES, AXIS4_ROTATES)
     #error "AXIS4_ROTATES through AXIS6_ROTATES must all be enabled with AXIS7_ROTATES."
   #elif !defined(U_MIN_POS) || !defined(U_MAX_POS)
     #error "U_MIN_POS and U_MAX_POS are required with NUM_AXES >= 7."
@@ -1487,7 +1487,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_V_AXIS
   #if AXIS8_NAME == AXIS7_NAME || AXIS8_NAME == AXIS6_NAME || AXIS8_NAME == AXIS5_NAME || AXIS8_NAME == AXIS4_NAME
     #error "AXIS8_NAME must be unique."
-  #elif defined(AXIS8_ROTATES) && (!defined(AXIS7_ROTATES) || !defined(AXIS6_ROTATES) || !defined(AXIS5_ROTATES) || !defined(AXIS4_ROTATES))
+  #elif ENABLED(AXIS8_ROTATES) && !ALL(AXIS7_ROTATES, AXIS6_ROTATES, AXIS5_ROTATES, AXIS4_ROTATES)
     #error "AXIS4_ROTATES through AXIS7_ROTATES must all be enabled with AXIS8_ROTATES."
   #elif !defined(V_MIN_POS) || !defined(V_MAX_POS)
     #error "V_MIN_POS and V_MAX_POS are required with NUM_AXES >= 8."
@@ -1500,7 +1500,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_W_AXIS
   #if AXIS9_NAME == AXIS8_NAME || AXIS9_NAME == AXIS7_NAME || AXIS9_NAME == AXIS6_NAME || AXIS9_NAME == AXIS5_NAME || AXIS9_NAME == AXIS4_NAME
     #error "AXIS9_NAME must be unique."
-  #elif defined(AXIS9_ROTATES) && (!defined(AXIS8_ROTATES) || !defined(AXIS7_ROTATES) || !defined(AXIS6_ROTATES) || !defined(AXIS5_ROTATES) || !defined(AXIS4_ROTATES))
+  #elif ENABLED(AXIS9_ROTATES) && !ALL(AXIS8_ROTATES, AXIS7_ROTATES, AXIS6_ROTATES, AXIS5_ROTATES, AXIS4_ROTATES)
     #error "AXIS4_ROTATES through AXIS8_ROTATES must all be enabled with AXIS9_ROTATES."
   #elif !defined(W_MIN_POS) || !defined(W_MAX_POS)
     #error "W_MIN_POS and W_MAX_POS are required with NUM_AXES >= 9."

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
@@ -2140,22 +2140,22 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         if (NEAR_ZERO(distance_sqr)) {
           // Move does not involve any primary linear axes (xyz) but might involve secondary linear axes
           distance_sqr = (0.0
-            #if HAS_I_AXIS && !defined(AXIS4_ROTATES)
+            #if HAS_I_AXIS && DISABLED(AXIS4_ROTATES)
               + sq(steps_dist_mm.i)
             #endif
-            #if HAS_J_AXIS && !defined(AXIS5_ROTATES)
+            #if HAS_J_AXIS && DISABLED(AXIS5_ROTATES)
               + sq(steps_dist_mm.j)
             #endif
-            #if HAS_K_AXIS && !defined(AXIS6_ROTATES)
+            #if HAS_K_AXIS && DISABLED(AXIS6_ROTATES)
               + sq(steps_dist_mm.k)
             #endif
-            #if HAS_U_AXIS && !defined(AXIS7_ROTATES)
+            #if HAS_U_AXIS && DISABLED(AXIS7_ROTATES)
               + sq(steps_dist_mm.u)
             #endif
-            #if HAS_V_AXIS && !defined(AXIS8_ROTATES)
+            #if HAS_V_AXIS && DISABLED(AXIS8_ROTATES)
               + sq(steps_dist_mm.v)
             #endif
-            #if HAS_W_AXIS && !defined(AXIS9_ROTATES)
+            #if HAS_W_AXIS && DISABLED(AXIS9_ROTATES)
               + sq(steps_dist_mm.w)
             #endif
           );