|
@@ -1990,11 +1990,11 @@ bool Planner::_populate_block(
|
|
|
dm.c = (CORESIGN(dist.b - dist.c) > 0); // Motor C direction
|
|
|
#endif
|
|
|
#elif ENABLED(MARKFORGED_XY)
|
|
|
- dm.a = (dist.a + dist.b > 0); // Motor A direction
|
|
|
+ dm.a = (dist.a TERN(MARKFORGED_INVERSE, -, +) dist.b > 0); // Motor A direction
|
|
|
dm.b = (dist.b > 0); // Motor B direction
|
|
|
#elif ENABLED(MARKFORGED_YX)
|
|
|
dm.a = (dist.a > 0); // Motor A direction
|
|
|
- dm.b = (dist.b + dist.a > 0); // Motor B direction
|
|
|
+ dm.b = (dist.b TERN(MARKFORGED_INVERSE, -, +) dist.a > 0); // Motor B direction
|
|
|
#else
|
|
|
XYZ_CODE(
|
|
|
dm.x = (dist.a > 0),
|
|
@@ -2062,9 +2062,9 @@ bool Planner::_populate_block(
|
|
|
#elif CORE_IS_YZ
|
|
|
ABS(dist.a), ABS(dist.b + dist.c), ABS(dist.b - dist.c)
|
|
|
#elif ENABLED(MARKFORGED_XY)
|
|
|
- ABS(dist.a + dist.b), ABS(dist.b), ABS(dist.c)
|
|
|
+ ABS(dist.a TERN(MARKFORGED_INVERSE, -, +) dist.b), ABS(dist.b), ABS(dist.c)
|
|
|
#elif ENABLED(MARKFORGED_YX)
|
|
|
- ABS(dist.a), ABS(dist.b + dist.a), ABS(dist.c)
|
|
|
+ ABS(dist.a), ABS(dist.b TERN(MARKFORGED_INVERSE, -, +) dist.a), ABS(dist.c)
|
|
|
#elif IS_SCARA
|
|
|
ABS(dist.a), ABS(dist.b), ABS(dist.c)
|
|
|
#else // default non-h-bot planning
|
|
@@ -2110,11 +2110,11 @@ bool Planner::_populate_block(
|
|
|
dist_mm.c = CORESIGN(dist.b - dist.c) * mm_per_step[C_AXIS];
|
|
|
#endif
|
|
|
#elif ENABLED(MARKFORGED_XY)
|
|
|
- dist_mm.a = (dist.a - dist.b) * mm_per_step[A_AXIS];
|
|
|
+ dist_mm.a = (dist.a TERN(MARKFORGED_INVERSE, +, -) dist.b) * mm_per_step[A_AXIS];
|
|
|
dist_mm.b = dist.b * mm_per_step[B_AXIS];
|
|
|
#elif ENABLED(MARKFORGED_YX)
|
|
|
dist_mm.a = dist.a * mm_per_step[A_AXIS];
|
|
|
- dist_mm.b = (dist.b - dist.a) * mm_per_step[B_AXIS];
|
|
|
+ dist_mm.b = (dist.b TERN(MARKFORGED_INVERSE, +, -) dist.a) * mm_per_step[B_AXIS];
|
|
|
#else
|
|
|
XYZ_CODE(
|
|
|
dist_mm.a = dist.a * mm_per_step[A_AXIS],
|