diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-08-16 18:01:52 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-08-16 18:01:52 +0300 |
| commit | 095e7fc7b686d77df1bda5d3ae7d3e1bd234f126 (patch) | |
| tree | 35d10c39ee14e3a077ee9ff06a4f308d04921d02 /src/GCodes/GCodes3.cpp | |
| parent | ed937836566b766a9066547e0b3be863a4f7260b (diff) | |
| parent | a397a29a99a8987a21591e90dea3c268da6256c9 (diff) | |
Merge branch '3.4-input-shaping' into 3.4-dev
Diffstat (limited to 'src/GCodes/GCodes3.cpp')
| -rw-r--r-- | src/GCodes/GCodes3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/GCodes/GCodes3.cpp b/src/GCodes/GCodes3.cpp index 1ae67e63..306f7254 100644 --- a/src/GCodes/GCodes3.cpp +++ b/src/GCodes/GCodes3.cpp @@ -912,7 +912,7 @@ GCodeResult GCodes::ProbeTool(GCodeBuffer& gb, const StringRef& reply) THROWS(GC // Get the feed rate and axis gb.MustSee(feedrateLetter); - m585Settings.feedRate = gb.LatestMachineState().feedRate = gb.GetDistance() * SecondsToMinutes; // don't apply the speed factor to homing and other special moves + m585Settings.feedRate = gb.LatestMachineState().feedRate = gb.GetSpeed(); // don't apply the speed factor to homing and other special moves m585Settings.axisNumber = FindAxisLetter(gb); m585Settings.offset = gb.GetDistance(); @@ -1003,7 +1003,7 @@ GCodeResult GCodes::FindCenterOfCavity(GCodeBuffer& gb, const StringRef& reply) // Get the feed rate, backoff distance, and axis gb.MustSee(feedrateLetter); - m675Settings.feedRate = gb.LatestMachineState().feedRate = gb.GetDistance() * SecondsToMinutes; // don't apply the speed factor to homing and other special moves + m675Settings.feedRate = gb.LatestMachineState().feedRate = gb.GetSpeed(); // don't apply the speed factor to homing and other special moves m675Settings.backoffDistance = gb.Seen('R') ? gb.GetDistance() : 5.0; m675Settings.axisNumber = FindAxisLetter(gb); |