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

Better end of lie trimming.

Browse source 
Make the extrusion setting correct on resume.
This commit is contained in:
Lars Brubaker 2016-04-19 15:14:22 -07:00
parent f20ac4dcb5
commit ec51decbee
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PrinterCommunication/Io/ResumePrintingStream.cs
View file

@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
}
resumeState = ResumeState.PrimingAndMovingToStart;
goto case ResumeState.PrimingAndMovingToStart;
return "G92 E{0}".FormatWith(lastDestination.extrusion);
case ResumeState.PrimingAndMovingToStart:
resumeState = ResumeState.PrintingSlow;
@ -134,7 +134,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
PrinterMove currentMove = GetPosition(lineToSend, lastDestination);
PrinterMove moveToSend = currentMove;
double feedRate = ActiveSliceSettings.Instance.GetActiveValueAsDouble("first_layer_speed", 10);
double feedRate = ActiveSliceSettings.Instance.GetActiveValueAsDouble("first_layer_speed", 10) * 60;
moveToSend.feedRate = feedRate;
lineToSend = CreateMovementLine(moveToSend, lastDestination);
@ -144,6 +144,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
return lineToSend;
}
resumeState = ResumeState.PrintingToEnd;
goto case ResumeState.PrintingToEnd;

2
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -2861,7 +2861,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
StringEventArgs currentEvent = new StringEventArgs(lineToWrite);
if (PrinterIsPrinting)
{
string lineWidthoutCR = lineToWrite.Substring(0, lineToWrite.Length - 2);
string lineWidthoutCR = lineToWrite.TrimEnd();
CommunicationUnconditionalToPrinter.CallEvents(this, new StringEventArgs("{0} [{1:0.000}]\n".FormatWith(lineWidthoutCR, timeSinceStartedPrint.Elapsed.TotalSeconds)));
}
else

3
StaticData/Translations/Master.txt
View file

@ -4678,3 +4678,6 @@ Translated:Resume Last Print
English:It appears your last print failed to complete.\n\nWould your like to attempt to resume from the last know position?
Translated:It appears your last print failed to complete.\n\nWould your like to attempt to resume from the last know position?
English:Unable to Connect
Translated:Unable to Connect