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

Prevent retract at start, unretract as final step

Browse source
This commit is contained in:
jlewin 2019-03-12 13:10:42 -07:00 • committed by johnlewin
parent 7936320d3b
commit 7d88861bc3
3 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
MatterControlLib/CustomWidgets/GCodeSketch.cs
View file

@ -45,6 +45,7 @@ namespace MatterHackers.MatterControl
private StringWriter writer;
private double currentE = 0;
private bool retracted = false;
private bool penUp = false;
private double currentSpeed = 0;
private double layerHeight = 0.2;
@ -112,7 +113,7 @@ namespace MatterHackers.MatterControl
}
}
private void Unretract()
public void Unretract()
{
if (retracted)
{
@ -129,21 +130,31 @@ namespace MatterHackers.MatterControl
public void PenUp()
{
this.WriteRaw("; PenUp");
this.Retract();
this.WriteSpeedLine(
string.Format("G1 Z{0:0.###}", layerHeight + this.RetractLift),
this.TravelSpeed);
if (!penUp)
{
penUp = true;
this.WriteRaw("; PenUp");
this.Retract();
this.WriteSpeedLine(
string.Format("G1 Z{0:0.###}", layerHeight + this.RetractLift),
this.TravelSpeed);
}
}
public void PenDown()
{
this.WriteRaw("; PenDown");
this.WriteSpeedLine(
string.Format("G1 Z{0:0.###}", layerHeight),
this.TravelSpeed);
if (penUp)
{
penUp = false;
this.Unretract();
this.WriteRaw("; PenDown");
this.WriteSpeedLine(
string.Format("G1 Z{0:0.###}", layerHeight),
this.TravelSpeed);
this.Unretract();
}
}
public void LineTo(double x, double y)