bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix CoreXY compile with backlash cal. (#19422)

Browse Source
This commit is contained in:
Cole Markham 2020-09-19 08:14:34 -05:00 committed by GitHub
parent e65deacabb
commit 4628f0e237
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/calibrate/M425.cpp
View File

@ -56,7 +56,7 @@ void GcodeSuite::M425() {
}; };
LOOP_XYZ(a) { LOOP_XYZ(a) {
if (AXIS_CAN_CALIBRATE(a) && parser.seen(XYZ_CHAR(a))) { if (axis_can_calibrate(a) && parser.seen(XYZ_CHAR(a))) {
planner.synchronize(); planner.synchronize();
backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a)); backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
noArgs = false; noArgs = false;

5
Marlin/src/inc/Conditionals_post.h
View File

@ -159,10 +159,7 @@
// Calibration codes only for non-core axes // Calibration codes only for non-core axes
#if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE) #if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE)
#if EITHER(IS_CORE, MARKFORGED_XY) #if EITHER(IS_CORE, MARKFORGED_XY)
#define X_AXIS_INDEX 0 #define CAN_CALIBRATE(A,B) (_AXIS(A) == B)
#define Y_AXIS_INDEX 1
#define Z_AXIS_INDEX 2
#define CAN_CALIBRATE(A,B) (A##_AXIS_INDEX == B##_INDEX)
#else #else
#define CAN_CALIBRATE(A,B) 1 #define CAN_CALIBRATE(A,B) 1
#endif #endif

2
Marlin/src/lcd/menu/menu_backlash.cpp
View File

@ -50,4 +50,4 @@ void menu_backlash() {
END_MENU(); END_MENU();
} }
#endif // HAS_LCD_MENU && BACKLASH_COMPENSATION #endif // HAS_LCD_MENU && BACKLASH_GCODE