diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-02-18 15:44:28 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-02-18 15:44:28 +0300 |
| commit | 957ac8fb2dac18d83aeda33d8e0772cb1fb9b54d (patch) | |
| tree | 3bcf7c037862b1b7cc1da23cc38eab069dfe4373 /src | |
| parent | 41390be8ea6d61f04c6454172c5b4ae340eb9c48 (diff) | |
3.01RC2
M220 no longer affects speeds of moves in macro files
Fixed a duplicate warning message when creating remote GPIn ports
Diffstat (limited to 'src')
| -rw-r--r-- | src/GCodes/GCodes.cpp | 2 | ||||
| -rw-r--r-- | src/GPIO/GpioPorts.cpp | 1 | ||||
| -rw-r--r-- | src/Version.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index e00c7f32..01dc6f40 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -1513,7 +1513,7 @@ bool GCodes::LoadExtrusionAndFeedrateFromGCode(GCodeBuffer& gb, bool isPrintingM if (gb.Seen(feedrateLetter)) { const float rate = gb.GetDistance(); - gb.MachineState().feedRate = (moveBuffer.moveType == 0 && isPrintingMove) + gb.MachineState().feedRate = (moveBuffer.moveType == 0 && isPrintingMove && !gb.IsDoingFileMacro()) ? rate * speedFactor * (0.01 * SecondsToMinutes) : rate * SecondsToMinutes; // don't apply the speed factor to homing and other special moves } diff --git a/src/GPIO/GpioPorts.cpp b/src/GPIO/GpioPorts.cpp index 3ee8b45f..7498dc8d 100644 --- a/src/GPIO/GpioPorts.cpp +++ b/src/GPIO/GpioPorts.cpp @@ -74,6 +74,7 @@ GCodeResult GpInputPort::Configure(uint32_t gpinNumber, GCodeBuffer &gb, const S if (CanInterface::DeleteHandle(boardAddress, handle, reply) != GCodeResult::ok) { reprap.GetPlatform().Message(AddWarning(gb.GetResponseMessageType()), reply.c_str()); + reply.Clear(); } boardAddress = CanId::MasterAddress; } diff --git a/src/Version.h b/src/Version.h index bee623f0..aec6c413 100644 --- a/src/Version.h +++ b/src/Version.h @@ -9,7 +9,7 @@ #define SRC_VERSION_H_ #ifndef VERSION -# define MAIN_VERSION "3.01-RC1+1" +# define MAIN_VERSION "3.01-RC2" # ifdef USE_CAN0 # define VERSION_SUFFIX " (CAN0)" # else @@ -19,7 +19,7 @@ #endif #ifndef DATE -# define DATE "2020-02-17b3" +# define DATE "2020-02-18b1" #endif #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d" |