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

Check that loaded gcode has a print time > 30 seconds or warn

Browse source 
Removed gcodeDetails as a type
issue: MatterHackers/MCCentral#4309
Printing file that makes less than 30 second gcode does not show error
This commit is contained in:
Lars Brubaker 2018-10-29 16:38:31 -07:00
parent 24f3e4d3c4
commit 2bd677cb9c
6 changed files with 140 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

17
MatterControl.Printing/GCode/GCodeMemoryFile.cs
View file

@ -117,17 +117,6 @@ namespace MatterControl.Printing
GCodeCommandQueue.Insert(insertIndex, printerMachineInstruction);
}
public static GCodeFile ParseGCodeString(string gcodeContents,
Vector4 maxAccelerationMmPerS2,
Vector4 maxVelocityMmPerS,
Vector4 velocitySameAsStopMmPerS,
Vector4 speedMultiplier,
CancellationToken cancellationToken)
{
return ParseFileContents(gcodeContents,
maxAccelerationMmPerS2, maxVelocityMmPerS, velocitySameAsStopMmPerS, speedMultiplier, cancellationToken, null);
}
public static GCodeMemoryFile Load(Stream fileStream,
Vector4 maxAccelerationMmPerS2,
Vector4 maxVelocityMmPerS,
@ -140,9 +129,11 @@ namespace MatterControl.Printing
{
using (var reader = new StreamReader(fileStream))
{
return ParseFileContents(reader.ReadToEnd(),
var gcodeMemoryFile = ParseFileContents(reader.ReadToEnd(),
maxAccelerationMmPerS2, maxVelocityMmPerS, velocitySameAsStopMmPerS, speedMultiplier,
cancellationToken, progressReporter);
return gcodeMemoryFile;
}
}
catch (Exception e)
@ -213,7 +204,7 @@ namespace MatterControl.Printing
return crCount + 1;
}
public static GCodeMemoryFile ParseFileContents(string gCodeString,
private static GCodeMemoryFile ParseFileContents(string gCodeString,
Vector4 maxAccelerationMmPerS2,
Vector4 maxVelocityMmPerS,
Vector4 velocitySameAsStopMmPerS,