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

Putting in info for tool change timing

Browse source 
refactoring extruder index to tool index
This commit is contained in:
LarsBrubaker 2019-03-04 08:04:29 -08:00
parent 0c6a0fe4be
commit 457e31ef10
8 changed files with 41 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,7 @@ namespace MatterControl.Printing
private double diameterOfFilamentUsedMmCache = 0;
private List<double> layerHeights = new List<double>();
private List<int> toolChanges = new List<int>();
private List<PrinterMachineInstruction> GCodeCommandQueue = new List<PrinterMachineInstruction>();
private bool foundFirstLayerMarker;
@ -255,7 +256,7 @@ namespace MatterControl.Printing
double extruderIndex = 0;
if (GetFirstNumberAfter("T", lineString, ref extruderIndex))
{
machineInstructionForLine.ExtruderIndex = (int)extruderIndex;
machineInstructionForLine.ToolIndex = (int)extruderIndex;
}
break;
@ -349,6 +350,8 @@ namespace MatterControl.Printing
Stopwatch maxProgressReport = new Stopwatch();
maxProgressReport.Start();
int currentTool = 0;
for (int lineIndex = 0; lineIndex < GCodeCommandQueue.Count; lineIndex++)
{
PrinterMachineInstruction instruction = GCodeCommandQueue[lineIndex];
@ -387,6 +390,12 @@ namespace MatterControl.Printing
}
}
if(instruction.ToolIndex != currentTool)
{
toolChanges.Add(lineIndex);
currentTool = instruction.ToolIndex;
}
if (feedRateMmPerMin > 0)
{
var timeForE = Estimator.GetSecondsForMovement(deltaEPositionThisLine,