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

Remove invalid z-lifts, improve lift, travel, down

Browse source
This commit is contained in:
jlewin 2019-02-28 12:28:51 -08:00
parent 1176916efb
commit 4f83e765b6
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/CustomWidgets/NozzleOffsetTemplatePrinter.cs
View file

@ -71,7 +71,6 @@ namespace MatterHackers.MatterControl
public void BuildTemplate(GCodeSketch gcodeSketch, bool verticalLayout)
{
gcodeSketch.SetTool("T0");
gcodeSketch.WriteRaw($"G1 Z0.2 F{firstLayerSpeed}");
if (verticalLayout)
{
@ -93,6 +92,8 @@ namespace MatterHackers.MatterControl
double y1 = rect.Bottom;
gcodeSketch.MoveTo(rect.Left, y1);
gcodeSketch.PenDown();
var towerRect = new RectangleDouble(0, 0, towerSize, towerSize);
towerRect.Offset(originalRect.Left - towerSize, originalRect.Bottom);
@ -159,6 +160,8 @@ namespace MatterHackers.MatterControl
}
}
gcodeSketch.PenUp();
x = rect.Left + 1.5;
y1 = rect.Top + (nozzleWidth * .5);
y2 = y1 - sectionHeight + (nozzleWidth * .5);
@ -279,12 +282,13 @@ namespace MatterHackers.MatterControl
}
}
bool atStartingPosition = position == turtle.CurrentPosition;
bool atStartingPosition = position.Equals(turtle.CurrentPosition, .1);
if (!closed
&& !atStartingPosition)
{
turtle.LineTo((firstItem.position * scale) + currentPos);
atStartingPosition = position.Equals(turtle.CurrentPosition, .1);
}
// Restore original speed