Browse Source

Fix CoreXY compile with backlash cal. (#19422)

Cole Markham 4 years ago
parent
commit
4628f0e237
No account linked to committer's email address

+ 1
- 1
Marlin/src/gcode/calibrate/M425.cpp View File

56
   };
56
   };
57
 
57
 
58
   LOOP_XYZ(a) {
58
   LOOP_XYZ(a) {
59
-    if (AXIS_CAN_CALIBRATE(a) && parser.seen(XYZ_CHAR(a))) {
59
+    if (axis_can_calibrate(a) && parser.seen(XYZ_CHAR(a))) {
60
       planner.synchronize();
60
       planner.synchronize();
61
       backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
61
       backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
62
       noArgs = false;
62
       noArgs = false;

+ 1
- 4
Marlin/src/inc/Conditionals_post.h View File

159
 // Calibration codes only for non-core axes
159
 // Calibration codes only for non-core axes
160
 #if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE)
160
 #if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE)
161
   #if EITHER(IS_CORE, MARKFORGED_XY)
161
   #if EITHER(IS_CORE, MARKFORGED_XY)
162
-    #define X_AXIS_INDEX 0
163
-    #define Y_AXIS_INDEX 1
164
-    #define Z_AXIS_INDEX 2
165
-    #define CAN_CALIBRATE(A,B) (A##_AXIS_INDEX == B##_INDEX)
162
+    #define CAN_CALIBRATE(A,B) (_AXIS(A) == B)
166
   #else
163
   #else
167
     #define CAN_CALIBRATE(A,B) 1
164
     #define CAN_CALIBRATE(A,B) 1
168
   #endif
165
   #endif

+ 1
- 1
Marlin/src/lcd/menu/menu_backlash.cpp View File

50
   END_MENU();
50
   END_MENU();
51
 }
51
 }
52
 
52
 
53
-#endif // HAS_LCD_MENU && BACKLASH_COMPENSATION
53
+#endif // HAS_LCD_MENU && BACKLASH_GCODE

Loading…
Cancel
Save