diff options
author | David Crocker <dcrocker@eschertech.com> | 2021-07-24 23:25:06 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2021-07-24 23:25:06 +0300 |
commit | ab1e1d44e38f4d6a7eb9959f60feee29527309c9 (patch) | |
tree | 1431a17e7eed372f2bc2ed7ff892d8d6c0f14e1b | |
parent | 5bc2241603812ed77d4a266b5c696916eac90d3c (diff) |
Fixed compile errors for CAN-enabled builds3.4-input-shaping-new-units
-rw-r--r-- | src/Movement/DDA.cpp | 2 | ||||
-rw-r--r-- | src/Movement/Move.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Movement/DDA.cpp b/src/Movement/DDA.cpp index 741ae844..0f6a3c09 100644 --- a/src/Movement/DDA.cpp +++ b/src/Movement/DDA.cpp @@ -1543,7 +1543,7 @@ void DDA::Prepare(uint8_t simMode) noexcept const int32_t rawSteps = lrintf(netMovement * stepsPerMm); // we round here instead of truncating to match the old code if (flags.usePressureAdvance) { - netMovement += (endSpeed - startSpeed) * directionVector[drive] * shaper.GetK(); + netMovement += (endSpeed - startSpeed) * directionVector[drive] * shaper.GetKclocks(); } if (rawSteps != 0) { diff --git a/src/Movement/Move.cpp b/src/Movement/Move.cpp index 3ad5350a..ad1e51e5 100644 --- a/src/Movement/Move.cpp +++ b/src/Movement/Move.cpp @@ -1061,7 +1061,7 @@ GCodeResult Move::ConfigurePressureAdvance(GCodeBuffer& gb, const StringRef& rep #if SUPPORT_CAN_EXPANSION ct->IterateExtruders([this, advance, &canDriversToUpdate](unsigned int extruder) { - extruderShapers[extruder].SetK(advance); + extruderShapers[extruder].SetKseconds(advance); const DriverId did = reprap.GetPlatform().GetExtruderDriver(extruder); if (did.IsRemote()) { @@ -1117,7 +1117,7 @@ GCodeResult Move::EutSetRemotePressureAdvance(const CanMessageMultipleDrivesRequ } else { - extruderShapers[driver].SetK(msg.values[count]); + extruderShapers[driver].SetKseconds(msg.values[count]); } } ); |