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

Fix observed toolchange mismatched

Browse source
This commit is contained in:
jlewin 2019-04-08 14:06:11 -07:00
parent b82cca9f04
commit 6b37fb57fb
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,12 +121,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
// if this command is a temperature change request
if (requestedToolForTempChange != -1)
{
if (requestedToolForTempChange == activeTool)
if (requestedToolForTempChange != activeTool)
{
queuedCommands.Enqueue(lineToSend);
// For smoothie, switch back to the extrude we were using before the temp change (smoothie switches to the specified extruder, marlin repetier do not)
queuedCommands.Enqueue($"T{activeTool}");
return "";
return lineToSend;
}
// if we are waiting to switch to the next tool
else if (activeTool != requestedTool)
@ -136,11 +135,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
queuedCommands.Enqueue($"T{requestedTool}");
}
// then send the heat command
queuedCommands.Enqueue(lineToSend);
// For smoothie, switch back to the extrude we were using before the temp change (smoothie switches to the specified extruder, marlin repetier do not)
queuedCommands.Enqueue($"T{activeTool}");
return "";
// then send the heat command
return lineToSend;
}
}
// if this is a tool change request