Browse Source

🧑‍💻 Add AXIS_COLLISION to catch broken parameters

Scott Lahteine 2 years ago
parent
commit
2351b0df84
2 changed files with 3 additions and 1 deletions
  1. 2
    0
      Marlin/src/core/types.h
  2. 1
    1
      Marlin/src/gcode/config/M200-M205.cpp

+ 2
- 0
Marlin/src/core/types.h View File

@@ -64,6 +64,8 @@ struct IF<true, L, R> { typedef L type; };
64 64
   #define GANG_ITEM_E(N)
65 65
 #endif
66 66
 
67
+#define AXIS_COLLISION(L) (AXIS4_NAME == L || AXIS5_NAME == L || AXIS6_NAME == L)
68
+
67 69
 //
68 70
 // Enumerated axis indices
69 71
 //

+ 1
- 1
Marlin/src/gcode/config/M200-M205.cpp View File

@@ -253,7 +253,7 @@ void GcodeSuite::M205() {
253 253
   if (parser.seenval('S')) planner.settings.min_feedrate_mm_s = parser.value_linear_units();
254 254
   if (parser.seenval('T')) planner.settings.min_travel_feedrate_mm_s = parser.value_linear_units();
255 255
   #if HAS_JUNCTION_DEVIATION
256
-    #if HAS_CLASSIC_JERK && (AXIS4_NAME == 'J' || AXIS5_NAME == 'J' || AXIS6_NAME == 'J')
256
+    #if HAS_CLASSIC_JERK && AXIS_COLLISION('J')
257 257
       #error "Can't set_max_jerk for 'J' axis because 'J' is used for Junction Deviation."
258 258
     #endif
259 259
     if (parser.seenval('J')) {

Loading…
Cancel
Save