diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-07-27 22:43:37 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-07-27 22:43:37 +0300 |
| commit | 6f1298000ef4dcb14778d64421ea1fa0d5a569aa (patch) | |
| tree | d06d1885a565f8ef53a25c15a36faad5d65cd62c /src | |
| parent | 1b6f16b111b4a7f660acb1abf94b47bc739f7f29 (diff) | |
Input shaping bug fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/Movement/AxisShaper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Movement/AxisShaper.cpp b/src/Movement/AxisShaper.cpp index 455d50a5..d9d9c2d7 100644 --- a/src/Movement/AxisShaper.cpp +++ b/src/Movement/AxisShaper.cpp @@ -520,8 +520,8 @@ void AxisShaper::TryShapeAccelBoth(DDA& dda, PrepParams& params) const noexcept return; } - const float newAccelDistnce = (dda.startSpeed * overlappedShapingClocks) + (newAcceleration * overlappedDistancePerA); - if (ImplementAccelShaping(dda, params, newAccelDistnce, overlappedShapingClocks)) + const float newAccelDistance = (dda.startSpeed * overlappedShapingClocks) + (newAcceleration * overlappedDistancePerA); + if (ImplementAccelShaping(dda, params, newAccelDistance, overlappedShapingClocks)) { params.shapingPlan.shapeAccelOverlapped = true; params.shaped.acceleration = newAcceleration; @@ -562,7 +562,7 @@ bool AxisShaper::ImplementAccelShaping(const DDA& dda, PrepParams& params, float const float speedIncrease = dda.topSpeed - dda.startSpeed; const float unshapedAccelClocks = 2 * (dda.topSpeed * newAccelClocks - newAccelDistance)/speedIncrease; const float unshapedAccelDistance = (dda.startSpeed + dda.topSpeed) * unshapedAccelClocks * 0.5; - if (unshapedAccelDistance <= params.shaped.decelStartDistance) + if (unshapedAccelDistance <= params.unshaped.decelStartDistance) { params.shaped.accelDistance = newAccelDistance; params.shaped.accelClocks = newAccelClocks; |