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

Merge pull request #554 from jlewin/master

Browse source 
Revise waitForOK logic for Repetier
This commit is contained in:
johnlewin 2016-02-11 16:33:12 -08:00
commit ba01f22dc5
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -1320,11 +1320,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication
temperatureRequestTimer.Restart();
}
bool waited30SeconsdForOk = timeHaveBeenWaitingForOK.Elapsed.TotalSeconds > 30; // waited for more than 30 seconds
bool waited30SecondsForOk = timeHaveBeenWaitingForOK.Elapsed.TotalSeconds > 30; // waited for more than 30 seconds
bool noResponseFor5Seconds = timeSinceLastReadAnything.Elapsed.TotalSeconds > 5;
bool waitedToLongForOK = waited30SeconsdForOk && noResponseFor5Seconds;
while (LinesToWriteQueue.Count > 0 &&
(!timeHaveBeenWaitingForOK.IsRunning || waitedToLongForOK))
(waited30SecondsForOk || !timeHaveBeenWaitingForOK.IsRunning || noResponseFor5Seconds))
{
WriteNextLineFromQueue();
}
@ -2212,8 +2211,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication
// We have to send a line because some printers (like old print-r-bots) do not send anything when connecting and there is no other way to know they are there.
SendLineToPrinterNow("M105");
SendLineToPrinterNow("M115");
SendLineToPrinterNow("M114");
// We do not need to wait for the M105
PrintingCanContinue(null, null);
}
catch (System.ArgumentOutOfRangeException e)
{