From fb9cda684e2835660f8a5ff454acee18feb7aad5 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 11 Mar 2019 15:57:20 -0700 Subject: [PATCH] Debugging leveling offset problem --- .../PrinterCommunication/Io/PrintLevelingStream.cs | 1 + MatterControlLib/PrinterCommunication/Io/PrinterMove.cs | 2 +- MatterControlLib/PrinterCommunication/PrinterConnection.cs | 4 ++++ Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- Tests/MatterControl.Tests/MatterControl/LevelingTests.cs | 2 -- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs b/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs index 0ea412204..5a95fc895 100644 --- a/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs +++ b/MatterControlLib/PrinterCommunication/Io/PrintLevelingStream.cs @@ -138,6 +138,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io } else { + this._lastDestination.CopyKnowSettings(position); internalStream.SetPrinterPosition(position); } } diff --git a/MatterControlLib/PrinterCommunication/Io/PrinterMove.cs b/MatterControlLib/PrinterCommunication/Io/PrinterMove.cs index 95fbeb56d..9a4c4f198 100644 --- a/MatterControlLib/PrinterCommunication/Io/PrinterMove.cs +++ b/MatterControlLib/PrinterCommunication/Io/PrinterMove.cs @@ -116,7 +116,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io return left; } - public override string ToString() => $"{position} E{extrusion} F{feedRate}"; + public override string ToString() => $"{position} E{extrusion:0.###} F{feedRate:0.###}"; public void CopyKnowSettings(PrinterMove copyFrom) { diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index 7539ed714..c5149deb6 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -2338,6 +2338,10 @@ You will then need to logout and log back in to the computer for the changes to // heat and wait will allow a long wait time for ok return 60; } + else if(lastInstruction.StartsWith("G28")) + { + return 30; + } // any other move we allow up to 10 seconds for response return 10 * timeMultiple; diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 62121a3cd..c2e5938ef 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 62121a3cdc03268198a1869c84321697bc19f71e +Subproject commit c2e5938efa974a96a04408336b30e0df99077bf8 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index e70e1bd1e..5c306a40a 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit e70e1bd1e90049b88dd87fb9ead81614b684f246 +Subproject commit 5c306a40adc917f3ab6939233d0e170748c48ff5 diff --git a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs index f5b2dbf32..a3cc2ec99 100644 --- a/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LevelingTests.cs @@ -49,8 +49,6 @@ namespace MatterControl.Tests.MatterControl AggContext.StaticData = new FileSystemStaticData(TestContext.CurrentContext.ResolveProjectPath(4, "StaticData")); MatterControlUtilities.OverrideAppDataLocation(TestContext.CurrentContext.ResolveProjectPath(4)); - - var printerSettings = new PrinterSettings(); printerSettings.SetValue(SettingsKey.z_probe_z_offset, "0");