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

Merge pull request #1652 from larsbrubaker/master

Browse source 
Don't send G4 dwell while wating to reach temp.
This commit is contained in:
johnlewin 2016-11-28 16:32:12 -08:00 • committed by GitHub
commit 75e244a7e5
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PrinterCommunication/Io/WaitForTempStream.cs
View file

@ -30,6 +30,7 @@ either expressed or implied, of the FreeBSD Project.
using MatterHackers.GCodeVisualizer;
using MatterHackers.VectorMath;
using System.Diagnostics;
using System.Threading;
namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
@ -89,7 +90,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
}
else
{
return "G4 P1000"; // 1 second
Thread.Sleep(100); // sleep .1 second while waiting for temp
return ""; // return nothing until we reach temp
}
}
else if (lineToSend.StartsWith("M190")) // bed set and wait temp
@ -108,12 +110,14 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
}
else
{
return "G4 P1000"; // 1 second
Thread.Sleep(100); // sleep .1 second while waiting for temp
return ""; // return nothing until we reach temp
}
}
else
{
return "G4 P1000";
Thread.Sleep(100); // sleep .1 second while waiting for temp
return ""; // return nothing until we reach temp
}
}
}
@ -140,7 +144,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
else
{
// send a wait command
return "G4 P1000"; // 1 second
Thread.Sleep(100); // sleep .1 second while waiting for temp
return ""; // return nothing until we reach temp
}
}
@ -173,7 +178,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
else
{
// send a wait command
return "G4 P1000"; // 1 second
Thread.Sleep(100); // sleep .1 second while waiting for temp
return ""; // return nothing until we reach temp
}
}
}

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 2dd73fbb995f4f68a8988bc6f9a3452db9132634
Subproject commit bb699e58df75cc5c3348f0250aab8999b432db6e