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

Getting the sync to print working better.

Browse source
This commit is contained in:
larsbrubaker 2014-08-18 16:42:04 -07:00
parent f202a3336f
commit 3771ec374f
4 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -1839,22 +1839,27 @@ namespace MatterHackers.MatterControl.PrinterCommunication
{
if (firstLineToResendIndex < allCheckSumLinesSent.Count)
{
WriteToPrinter(allCheckSumLinesSent[firstLineToResendIndex++], null);
WriteToPrinter(allCheckSumLinesSent[firstLineToResendIndex++], "resend");
}
else
{
string lineToWrite = loadedGCode.Instruction(printerCommandQueueIndex).Line;
if (lineToWrite == "MH_PAUSE")
string[] splitOnSemicolon = lineToWrite.Split(';');
string trimedLine = splitOnSemicolon[0].Trim().ToUpper();
if (trimedLine.Length > 0)
{
pauseRequested = true;
}
else
{
WriteChecksumLineToPrinter(lineToWrite);
}
if (lineToWrite == "MH_PAUSE")
{
pauseRequested = true;
}
else
{
WriteChecksumLineToPrinter(lineToWrite);
}
firstLineToResendIndex++;
}
printerCommandQueueIndex++;
firstLineToResendIndex++;
}
}
else if (printWasCanceled)
@ -2155,17 +2160,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication
gcodeFileContents = gcodeFileContents.Replace("\r\n", "\n");
gcodeFileContents = gcodeFileContents.Replace('\r', '\n');
string[] gcodeLines = gcodeFileContents.Split('\n');
List<string> printableGCode = new List<string>();
List<string> printableGCode = new List<string>(gcodeLines.Length);
foreach (string line in gcodeLines)
{
string[] splitOnSemicolon = line.Split(';');
string trimedLine = splitOnSemicolon[0].Trim().ToUpper();
if (trimedLine.Length < 1)
{
continue;
}
printableGCode.Add(trimedLine);
printableGCode.Add(line);
}
ExtrusionRatio = 1;