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

Merge remote-tracking branch 'origin/1.5.3'

Browse source 
# Conflicts:
#	PrinterCommunication/Io/WaitForTempStream.cs
This commit is contained in:
John Lewin 2016-05-19 18:03:57 -07:00
commit 4fd2eee3c7
49 changed files with 729 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterCommunication/Io/WaitForTempStream.cs
View file

@ -148,6 +148,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
tempWithinRange = bedTemp >= targetTemp - sameTempRange;
}
// Added R code for M190
if (tempWithinRange && !timeHaveBeenAtTemp.IsRunning)
{
timeHaveBeenAtTemp.Start();