diff options
author | David Crocker <dcrocker@eschertech.com> | 2022-07-27 22:42:13 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2022-07-27 22:42:13 +0300 |
commit | 9424a9d60dfffb2a3cc6f72ba4fa83c9f9e1e42f (patch) | |
tree | b7861a3d5bc20bb50828cb2b3bf44214ff140463 | |
parent | 040d9975e375241352b5d907ab362ab47ef8a937 (diff) |
Fixed pressure advance when board is in expansion mode
-rw-r--r-- | src/Movement/DDA.cpp | 2 | ||||
-rw-r--r-- | src/Movement/DriveMovement.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Movement/DDA.cpp b/src/Movement/DDA.cpp index 488aac3c..7050a28e 100644 --- a/src/Movement/DDA.cpp +++ b/src/Movement/DDA.cpp @@ -846,7 +846,7 @@ bool DDA::InitFromRemote(const CanMessageMovementLinear& msg) noexcept } // Check for sensible values, print them if they look dubious - if (reprap.Debug(moduleDda) && pdm->totalSteps > 1000000) + if (reprap.Debug(moduleDda) && (reprap.Debug(moduleMove) || pdm->totalSteps > 1000000)) { DebugPrintAll("rem"); } diff --git a/src/Movement/DriveMovement.cpp b/src/Movement/DriveMovement.cpp index deca30e2..2ebce91c 100644 --- a/src/Movement/DriveMovement.cpp +++ b/src/Movement/DriveMovement.cpp @@ -444,7 +444,12 @@ bool DriveMovement::PrepareExtruder(const DDA& dda, const PrepParams& params) no timeSoFar = 0.0; // Calculate the total forward and reverse movement distances - if (dda.flags.usePressureAdvance && shaper.GetKclocks() > 0.0) + if (( dda.flags.usePressureAdvance +#if SUPPORT_REMOTE_COMMANDS + || dda.flags.isRemote // for remote moves we check whether PA is wanted before calling PreparExtruder +#endif + ) && shaper.GetKclocks() > 0.0 + ) { // We are using nonzero pressure advance. Movement must be forwards. mp.cart.pressureAdvanceK = shaper.GetKclocks(); |