From ffc0ea296e02085f8436b941498eb8a2b81fc9bb Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 12 Apr 2017 15:17:29 -0700 Subject: [PATCH] Fixed for smoothie probe math --- ConfigurationPage/PrintLeveling/PrintLevelPages.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs index 668a24de4..9c4905a3d 100644 --- a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs +++ b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs @@ -335,14 +335,23 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling StringEventArgs currentEvent = e as StringEventArgs; if (currentEvent != null) { - if (currentEvent.Data.StartsWith("Bed Position") // marlin G30 return code (looks like: 'Bed Position X:20 Y:32 Z:.01') - || currentEvent.Data.StartsWith("Z:")) // smoothie G30 return code (looks like: 'Z:.01') + if (currentEvent.Data.StartsWith("Bed Position")) // marlin G30 return code (looks like: 'Bed Position X:20 Y:32 Z:.01') { probePositions[probePositionsBeingEditedIndex].position.x = probeStartPosition.x; probePositions[probePositionsBeingEditedIndex].position.y = probeStartPosition.y; GCodeFile.GetFirstNumberAfter("Z:", currentEvent.Data, ref probePositions[probePositionsBeingEditedIndex].position.z); UiThread.RunOnIdle(() => container.nextButton.ClickButton(null)); } + else if (currentEvent.Data.StartsWith("Z:")) // smoothie G30 return code (looks like: 'Z:10.01') + { + probePositions[probePositionsBeingEditedIndex].position.x = probeStartPosition.x; + probePositions[probePositionsBeingEditedIndex].position.y = probeStartPosition.y; + // smoothie returns the position relative to the start postion + double reportedProbeZ = 0; + GCodeFile.GetFirstNumberAfter("Z:", currentEvent.Data, ref reportedProbeZ); + probePositions[probePositionsBeingEditedIndex].position.z = reportedProbeZ - probeStartPosition.z; + UiThread.RunOnIdle(() => container.nextButton.ClickButton(null)); + } } }