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

Fixed the error message when a gcode file is too big to show.

Browse source 
Made the terminal window output during printing show the time since start.
This commit is contained in:
Lars Brubaker 2015-02-21 16:30:29 -08:00
parent b11c22fb31
commit 1ab46d7977
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -1941,8 +1941,15 @@ namespace MatterHackers.MatterControl.PrinterCommunication
// write data to communication
{
StringEventArgs currentEvent = new StringEventArgs(lineToWrite);
CommunicationUnconditionalToPrinter.CallEvents(this, currentEvent);
StringEventArgs currentEvent = new StringEventArgs(lineToWrite);
if (PrinterIsPrinting)
{
CommunicationUnconditionalFromPrinter.CallEvents(this, new StringEventArgs("[{0}] {1}".FormatWith(timeSinceStartedPrint.ElapsedMilliseconds, lineToWrite)));
}
else
{
CommunicationUnconditionalFromPrinter.CallEvents(this, currentEvent);
}
if (lineWithoutChecksum != null)
{
@ -2599,8 +2606,15 @@ namespace MatterHackers.MatterControl.PrinterCommunication
// process this command
{
StringEventArgs currentEvent = new StringEventArgs(lastLineRead);
CommunicationUnconditionalFromPrinter.CallEvents(this, currentEvent);
StringEventArgs currentEvent = new StringEventArgs(lastLineRead);
if (PrinterIsPrinting)
{
CommunicationUnconditionalFromPrinter.CallEvents(this, new StringEventArgs("[{0}] {1}".FormatWith(timeSinceStartedPrint.ElapsedMilliseconds, lastLineRead)));
}
else
{
CommunicationUnconditionalFromPrinter.CallEvents(this, currentEvent);
}
FoundStringEventArgs foundResponse = new FoundStringEventArgs(currentEvent.Data);
ReadLineStartCallBacks.CheckForKeys(foundResponse);