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

Fixed for smoothie probe math

Browse source
This commit is contained in:
Lars Brubaker 2017-04-12 15:17:29 -07:00
parent a368c0ee1e
commit ffc0ea296e
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ConfigurationPage/PrintLeveling/PrintLevelPages.cs
View file

@ -335,14 +335,23 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
StringEventArgs currentEvent = e as StringEventArgs; StringEventArgs currentEvent = e as StringEventArgs;
if (currentEvent != null) if (currentEvent != null)
{ {
if (currentEvent.Data.StartsWith("Bed Position") // marlin G30 return code (looks like: 'Bed Position X:20 Y:32 Z:.01') 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')
{ {
probePositions[probePositionsBeingEditedIndex].position.x = probeStartPosition.x; probePositions[probePositionsBeingEditedIndex].position.x = probeStartPosition.x;
probePositions[probePositionsBeingEditedIndex].position.y = probeStartPosition.y; probePositions[probePositionsBeingEditedIndex].position.y = probeStartPosition.y;
GCodeFile.GetFirstNumberAfter("Z:", currentEvent.Data, ref probePositions[probePositionsBeingEditedIndex].position.z); GCodeFile.GetFirstNumberAfter("Z:", currentEvent.Data, ref probePositions[probePositionsBeingEditedIndex].position.z);
UiThread.RunOnIdle(() => container.nextButton.ClickButton(null)); 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));
}
} }
} }