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

Merge branch 'master' into master

Browse source
This commit is contained in:
johnlewin 2017-01-12 06:28:04 -08:00 • committed by GitHub
commit c13b846435
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -2838,9 +2838,9 @@ namespace MatterHackers.MatterControl.PrinterCommunication
string lineWithCount;
if (lineToWrite.StartsWith("M110"))
{
lineWithCount = $"N{0} {lineToWrite}";
lineWithCount = $"N1 {lineToWrite}";
GCodeFile.GetFirstNumberAfter("N", lineToWrite, ref currentLineIndexToSend);
allCheckSumLinesSent.SetStartingIndex(currentLineIndexToSend-1);
allCheckSumLinesSent.SetStartingIndex(currentLineIndexToSend);
}
else
{

6
StaticData/Translations/Master.txt
View file

@ -5839,3 +5839,9 @@ Translated:Baby Step Offset
English:Oops! Unable to initialize device.
Translated:Oops! Unable to initialize device.
English:The distance between the top of the raft and the bottom of the model. 0.6 mm is a good starting point for PLA and 0.4 mm is a good starting point for ABS. Lower values give a smoother surface, higher values make the print easier to remove.
Translated:The distance between the top of the raft and the bottom of the model. 0.6 mm is a good starting point for PLA and 0.4 mm is a good starting point for ABS. Lower values give a smoother surface, higher values make the print easier to remove.
English:Clear ZOffset
Translated:Clear ZOffset

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 4ffc73838f6366e758c026426e03b7323e8bc2e1
Subproject commit 647d359b667cd2dd70158d65323d0ab82aaecb0c

5
Tests/MatterControl.AutomationTests/PrintingTests.cs
View file

@ -40,7 +40,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Start Print Button", 1);
testRunner.WaitForName("Done Button", 30);
testRunner.WaitForName("Done Button", 120);
Assert.True(testRunner.NameExists("Done Button"), "The print has completed");
testRunner.WaitForName("Print Again Button", 1);
testRunner.Wait(5);
@ -52,7 +53,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
return Task.FromResult(0);
};
await MatterControlUtilities.RunTest(testToRun, maxTimeToRun: 130);
await MatterControlUtilities.RunTest(testToRun, maxTimeToRun: 200);
}
[Test, Apartment(ApartmentState.STA)]