diff options
Diffstat (limited to 'src/Movement/DriveMovement.cpp')
-rw-r--r-- | src/Movement/DriveMovement.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Movement/DriveMovement.cpp b/src/Movement/DriveMovement.cpp index 77351302..fce12e1f 100644 --- a/src/Movement/DriveMovement.cpp +++ b/src/Movement/DriveMovement.cpp @@ -172,6 +172,8 @@ bool DriveMovement::NewCartesianSegment() noexcept } } +#if SUPPORT_LINEAR_DELTA + // This is called when currentSegment has just been changed to a new segment. Return true if there is a new segment to execute. bool DriveMovement::NewDeltaSegment(const DDA& dda) noexcept { @@ -311,6 +313,8 @@ bool DriveMovement::NewDeltaSegment(const DDA& dda) noexcept } } +#endif // SUPPORT_LINEAR_DELTA + // This is called when currentSegment has just been changed to a new segment. Return true if there is a new segment to execute. bool DriveMovement::NewExtruderSegment() noexcept { @@ -437,6 +441,8 @@ bool DriveMovement::PrepareCartesianAxis(const DDA& dda, const PrepParams& param return CalcNextStepTime(dda); } +#if SUPPORT_LINEAR_DELTA + // Prepare this DM for a Delta axis move, returning true if there are steps to do bool DriveMovement::PrepareDeltaAxis(const DDA& dda, const PrepParams& params) noexcept { @@ -616,6 +622,8 @@ bool DriveMovement::PrepareDeltaAxis(const DDA& dda, const PrepParams& params) n return CalcNextStepTime(dda); } +#endif // SUPPORT_LINEAR_DELTA + // Prepare this DM for an extruder move, returning true if there are steps to do // If there are no steps to do, set nextStep = 0 so that DDARing::CurrentMoveCompleted doesn't add any steps to the movement accumulator // We have already generated the extruder segments and we know that there are some @@ -902,9 +910,12 @@ pre(nextStep <= totalSteps; stepsTillRecalc == 0) if (stepsToLimit == 0) { currentSegment = currentSegment->GetNext(); - const bool more = (isDelta) ? NewDeltaSegment(dda) - : (isExtruder) ? NewExtruderSegment() - : NewCartesianSegment(); + const bool more = +#if SUPPORT_LINEAR_DELTA + (isDelta) ? NewDeltaSegment(dda) : +#endif + (isExtruder) ? NewExtruderSegment() + : NewCartesianSegment(); if (!more) { state = DMState::stepError; |