diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-07-30 23:52:59 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2021-07-30 23:52:59 +0300 |
| commit | b3d6ce1358c1b730fffd79b46e940a587bfc1751 (patch) | |
| tree | 9b3f93f80ea048906adeeeb30ef7fba38f401ebc /src/GCodes/GCodeMachineState.cpp | |
| parent | b9294e1d2f9d1166fa09187e82c2cebb179ce0ca (diff) | |
| parent | b017f7a4bee002c3463007c77e340642bdf1c2d3 (diff) | |
Merge remote-tracking branch 'origin/3.4-input-shaping' into v3-chrishamm
Diffstat (limited to 'src/GCodes/GCodeMachineState.cpp')
| -rw-r--r-- | src/GCodes/GCodeMachineState.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/GCodes/GCodeMachineState.cpp b/src/GCodes/GCodeMachineState.cpp index c868714c..6c4730f3 100644 --- a/src/GCodes/GCodeMachineState.cpp +++ b/src/GCodes/GCodeMachineState.cpp @@ -12,7 +12,7 @@ // Create a default initialised GCodeMachineState GCodeMachineState::GCodeMachineState() noexcept - : feedRate(DefaultFeedRate * SecondsToMinutes), + : feedRate(ConvertSpeedFromMmPerMin(DefaultFeedRate)), #if HAS_LINUX_INTERFACE fileId(NoFileId), #endif |