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

In 2 point probe leveling marlin will not return the z probe if it is outside the software endstops.

Browse source 
So when homing we make sure to be within the endstops.
This commit is contained in:
larsbrubaker 2014-06-17 11:19:32 -07:00
parent 6495c5dc7a
commit 47e89e8956
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ConfigurationPage/PrintLeveling/LevelWizard2Point.cs
View file

@ -126,12 +126,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
if (lineBeingSent == "G28")
{
lines.Add("G28 X0");
lines.Add("G1 X1");
lines.Add("G28 Y0");
lines.Add("G1 Y1");
lines.Add("G28 Z0");
lines.Add("M114");
}
else if (lineBeingSent == "G29")
{
// first make sure we don't have any leftover reading.
PrinterConnectionAndCommunication.Instance.ReadLine.UnregisterEvent(FinishedProbe, ref unregisterEvents);
if (unregisterEvents != null)
{
unregisterEvents(null, null);

6
ConfigurationPage/PrintLeveling/PrintLevelPages.cs
View file

@ -105,6 +105,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public override void PageIsBecomingActive()
{
// first make sure there is no leftover FinishedProbe event
PrinterConnectionAndCommunication.Instance.ReadLine.UnregisterEvent(FinishedProbe, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(PrinterConnectionAndCommunication.Axis.Z, probeStartPosition.z, InstructionsPage.ManualControlsFeedRate().z);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(probeStartPosition, InstructionsPage.ManualControlsFeedRate().x);
PrinterConnectionAndCommunication.Instance.SendLineToPrinterNow("G30");
@ -346,6 +349,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public override void PageIsBecomingActive()
{
// first make sure there is no leftover FinishedProbe event
PrinterConnectionAndCommunication.Instance.ReadLine.UnregisterEvent(FinishedProbe, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(PrinterConnectionAndCommunication.Axis.Z, probeStartPosition.z, InstructionsPage.ManualControlsFeedRate().z);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(probeStartPosition, InstructionsPage.ManualControlsFeedRate().x);
PrinterConnectionAndCommunication.Instance.SendLineToPrinterNow("G30");