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

Making matter slice and cure layer changes both be detected.

Browse source
This commit is contained in:
Lars Brubaker 2016-07-15 18:06:51 -07:00
parent c584814e56
commit 040da9da1e
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterCommunication/Io/BabyStepsStream.cs
View file

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
string processedLine = offsetStream.ReadLine();
if (processedLine != null
&& layerCount < 1
&& processedLine.StartsWith("; LAYER:"))
&& GCodeFile.IsLayerChange(processedLine))
{
layerCount++;
if (layerCount == 1)

3
PrinterCommunication/Io/PauseHandlingStream.cs
View file

@ -33,6 +33,7 @@ using System.Collections.Generic;
using System;
using MatterHackers.MatterControl.SlicerConfiguration;
using System.Linq;
using MatterHackers.GCodeVisualizer;
namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
@ -140,7 +141,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
}
}
if (lineToSend.StartsWith("; LAYER:"))
if (GCodeFile.IsLayerChange(lineToSend))
{
string layerNumber = lineToSend.Split(':')[1];
if (PauseOnLayer(layerNumber))

2
PrinterCommunication/Io/ResumePrintingStream.cs
View file

@ -201,7 +201,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
return null;
}
if (!lineToSend.StartsWith("; LAYER:"))
if (!GCodeFile.IsLayerChange(lineToSend))
{
// have not seen the end of this layer so keep printing slow
if (LineIsMovement(lineToSend))