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

Making leveling test run a second leveling and test it changes

Browse source
This commit is contained in:
LarsBrubaker 2018-10-18 08:19:20 -07:00 • committed by Lars Brubaker
parent 671622aa51
commit 133da5d35a
6 changed files with 78 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs
View file

@ -72,10 +72,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
if (LineIsMovement(lineFromChild))
{
PrinterMove currentDestination = GetPosition(lineFromChild, lastDestination);
lineFromChild = GetLeveledPosition(lineFromChild, currentDestination);
var leveledLine = GetLeveledPosition(lineFromChild, currentDestination);
lastDestination = currentDestination;
return lineFromChild;
return leveledLine;
}
else if (lineFromChild.StartsWith("G29"))
{

36
MatterControlLib/PrinterCommunication/Io/RelativeToAbsoluteStream.cs
View file

@ -36,21 +36,21 @@ using System.Collections.Generic;
namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
public class RelativeToAbsoluteStream : GCodeStreamProxy
{
protected PrinterMove lastDestination = new PrinterMove();
public PrinterMove LastDestination { get { return lastDestination; } }
public class RelativeToAbsoluteStream : GCodeStreamProxy
{
protected PrinterMove lastDestination = new PrinterMove();
public PrinterMove LastDestination { get { return lastDestination; } }
bool xyzAbsoluteMode = true;
bool eAbsoluteMode = true;
public RelativeToAbsoluteStream(GCodeStream internalStream)
: base(internalStream)
{
}
public RelativeToAbsoluteStream(GCodeStream internalStream)
: base(internalStream)
{
}
public override void SetPrinterPosition(PrinterMove position)
{
public override void SetPrinterPosition(PrinterMove position)
{
lastDestination = position;
internalStream.SetPrinterPosition(lastDestination);
}
@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
// extruder to relative mode
eAbsoluteMode = false;
}
else if(lineToProcess.StartsWith("82"))
else if (lineToProcess.StartsWith("82"))
{
// extruder to absolute mode
eAbsoluteMode = true;
@ -124,12 +124,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
}
public override string ReadLine()
{
// G91 Relative
// G90 Absolute
string lineToSend = base.ReadLine();
{
// G91 Relative
// G90 Absolute
string lineToSend = base.ReadLine();
return ProcessLine(lineToSend);
}
}
return ProcessLine(lineToSend);
}
}
}