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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source 
Conflicts:
	StaticData/Translations/Master.txt
This commit is contained in:
larsbrubaker 2014-06-23 09:32:13 -07:00
commit 16815c97c4
7 changed files with 203 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

27
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -138,6 +138,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
public RootedObjectEventHandler PositionRead = new RootedObjectEventHandler();
public RootedObjectEventHandler ReadLine = new RootedObjectEventHandler();
public RootedObjectEventHandler WroteLine = new RootedObjectEventHandler();
public RootedObjectEventHandler UpdateEventHook = new RootedObjectEventHandler();
FoundStringStartsWithCallbacks ReadLineStartCallBacks = new FoundStringStartsWithCallbacks();
FoundStringContainsCallbacks ReadLineContainsCallBacks = new FoundStringContainsCallbacks();
@ -154,6 +155,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication
Stopwatch timeSinceLastReadAnything = new Stopwatch();
Stopwatch timeHaveBeenWaitingForOK = new Stopwatch();
Stopwatch timeSinceUpdateEvent = new Stopwatch();
int secondsBetweenUpdateEvent = 300;
public enum CommunicationStates { Disconnected, AttemptingToConnect, FailedToConnect, Connected, PreparingToPrint, Printing, PrintingFromSd, Paused, FinishedPrint, Disconnecting, ConnectionLost };
CommunicationStates communicationState = CommunicationStates.Disconnected;
@ -610,6 +613,22 @@ namespace MatterHackers.MatterControl.PrinterCommunication
}
}
public int TotalLayersInPrint
{
get
{
try
{
int layerCount = loadedGCode.NumChangesInZ;
return layerCount;
}
catch
{
return -1;
}
}
}
public double RatioIntoCurrentLayer
{
get
@ -717,6 +736,14 @@ namespace MatterHackers.MatterControl.PrinterCommunication
temperatureRequestTimer.Restart();
}
if (timeSinceUpdateEvent.Elapsed.Seconds > secondsBetweenUpdateEvent)
{
UpdateEventHook.CallEvents(null, null);
timeSinceUpdateEvent.Restart();
}
bool waited30SeconsdForOk = timeHaveBeenWaitingForOK.Elapsed.Seconds > 30; // waited for more than 30 seconds
bool noResponseFor5Seconds = timeSinceLastReadAnything.Elapsed.Seconds > 5;
bool waitedToLongForOK = waited30SeconsdForOk && noResponseFor5Seconds;