nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be more aggressive about understanding what the speed was when changing tools

Browse source
This commit is contained in:
LarsBrubaker 2020-03-28 08:24:11 -07:00
parent a875f05117
commit 1779e9a44c
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControlLib/PrinterCommunication/Io/ToolChangeStream.cs
View file

@ -44,6 +44,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
private PrinterMove lastDestination = PrinterMove.Unknown;
private string postSwitchLine;
private double preSwitchFeedRate;
private double lastSeenFeedRate;
private Vector3 preSwitchPosition;
private readonly IGCodeLineReader gcodeLineReader;
private readonly GCodeMemoryFile gCodeMemoryFile;
@ -97,6 +98,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
return lineToSend;
}
GCodeFile.GetFirstNumberAfter("F", lineToSend, ref lastSeenFeedRate);
var requestedToolForTempChange = -1;
// if we see a temp command remember what heat we are setting
if (lineToSend.StartsWith("M109") || lineToSend.StartsWith("M104"))
@ -449,8 +452,15 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
break;
}
preSwitchFeedRate = lastDestination.feedRate;
preSwitchPosition = lastDestination.position;
if (lastDestination.feedRate != double.PositiveInfinity)
{
preSwitchFeedRate = lastDestination.feedRate;
}
else
{
preSwitchFeedRate = lastSeenFeedRate;
}
// put together the output we want to send
var gcode = new StringBuilder();