diff options
Diffstat (limited to 'src/Movement/DDA.cpp')
| -rw-r--r-- | src/Movement/DDA.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Movement/DDA.cpp b/src/Movement/DDA.cpp index 7050a28e..5ea10f5b 100644 --- a/src/Movement/DDA.cpp +++ b/src/Movement/DDA.cpp @@ -345,17 +345,17 @@ bool DDA::InitStandardMove(DDARing& ring, const RawMove &nextMove, bool doMotorM directionVector[drive] = positionDelta; if (positionDelta != 0.0) { - if (reprap.GetPlatform().IsAxisRotational(drive)) + if (reprap.GetPlatform().IsAxisRotational(drive) && nextMove.rotationalAxesMentioned) { rotationalAxesMoving = true; } - else + else if (nextMove.linearAxesMentioned) { linearAxesMoving = true; - } - if (Tool::GetXAxes(nextMove.tool).IsBitSet(drive) || Tool::GetYAxes(nextMove.tool).IsBitSet(drive)) - { - flags.xyMoving = true; // this move has XY movement in user space, before axis were mapped + if (Tool::GetXAxes(nextMove.tool).IsBitSet(drive) || Tool::GetYAxes(nextMove.tool).IsBitSet(drive)) + { + flags.xyMoving = true; // this move has XY movement in user space, before axis were mapped + } } } } |