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

Fixe to realtime position tracking and gcode e tracking

Browse source 
This hopefully fixes issues with re-slice (did on test environment)
This commit is contained in:
Lars Brubaker 2018-12-06 17:01:26 -08:00
parent 4494ac8251
commit 62b6b9ae44
4 changed files with 87 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControlLib/PrinterCommunication/Io/FeedRateMultiplyerStream.cs
View file

@ -35,7 +35,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
public class FeedRateMultiplyerStream : GCodeStreamProxy
{
public PrinterMove LastDestination { get; private set; }
private PrinterMove lastDestination;
public FeedRateMultiplyerStream(PrinterConfig printer, GCodeStream internalStream)
: base(printer, internalStream)
@ -46,8 +46,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
public override void SetPrinterPosition(PrinterMove position)
{
this.LastDestination.CopyKnowSettings(position);
internalStream.SetPrinterPosition(this.LastDestination);
this.lastDestination.CopyKnowSettings(position);
internalStream.SetPrinterPosition(this.lastDestination);
}
public override string ReadLine()
@ -63,13 +63,13 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
if (lineToSend != null
&& LineIsMovement(lineToSend))
{
PrinterMove currentMove = GetPosition(lineToSend, this.LastDestination);
PrinterMove currentMove = GetPosition(lineToSend, this.lastDestination);
PrinterMove moveToSend = currentMove;
moveToSend.feedRate *= FeedRateRatio;
lineToSend = CreateMovementLine(moveToSend, this.LastDestination);
this.LastDestination = currentMove;
lineToSend = CreateMovementLine(moveToSend, this.lastDestination);
this.lastDestination = currentMove;
return lineToSend;
}

2
MatterControlLib/PrinterCommunication/Io/MaxLengthStream.cs
View file

@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
this.MaxSegmentLength = maxSegmentLength;
}
PrinterMove lastDestination { get; set; } = PrinterMove.Unknown;
PrinterMove lastDestination = PrinterMove.Unknown;
public double MaxSegmentLength { get; set; }
public void Cancel()