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

Make sure we ask for position after auto bed level.

Browse source 
Make sure we always show the known position of the printer when we re-build the display.
This commit is contained in:
Lars Brubaker 2015-11-23 15:45:35 -08:00
parent 5b13fc9c5a
commit d49739f490
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs
View file

@ -83,8 +83,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
List<string> lines = new List<string>();
lines.Add(lineBeingSent);
if (lineBeingSent.StartsWith("G28"))
{
if (lineBeingSent.StartsWith("G28")
|| lineBeingSent.StartsWith("G29"))
{
lines.Add("M114");
}

3
ConfigurationPage/PrintLeveling/LevelWizard3Point.cs
View file

@ -120,7 +120,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
List<string> lines = new List<string>();
lines.Add(lineBeingSent);
if (lineBeingSent.StartsWith("G28"))
if (lineBeingSent.StartsWith("G28")
|| lineBeingSent.StartsWith("G29"))
{
lines.Add("M114");
}

5
ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs
View file

@ -292,8 +292,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
List<string> lines = new List<string>();
lines.Add(lineBeingSent);
if (lineBeingSent.StartsWith("G28"))
{
if (lineBeingSent.StartsWith("G28")
|| lineBeingSent.StartsWith("G29"))
{
lines.Add("M114");
}

15
PrinterControls/ControlWidgets/MovementControls.cs
View file

@ -258,14 +258,13 @@ namespace MatterHackers.MatterControl.PrinterControls
hwDestinationBar.AddChild(yPosition);
hwDestinationBar.AddChild(zPosition);
SetDestinationPositionText(xPosition, yPosition, zPosition);
reportDestinationChanged = new LimitCallingFrequency(1, () =>
{
UiThread.RunOnIdle(() =>
{
Vector3 destinationPosition = PrinterConnectionAndCommunication.Instance.CurrentDestination;
xPosition.Text = "X: {0:0.00}".FormatWith(destinationPosition.x);
yPosition.Text = "Y: {0:0.00}".FormatWith(destinationPosition.y);
zPosition.Text = "Z: {0:0.00}".FormatWith(destinationPosition.z);
SetDestinationPositionText(xPosition, yPosition, zPosition);
});
});
@ -277,6 +276,14 @@ namespace MatterHackers.MatterControl.PrinterControls
return hwDestinationBar;
}
private static void SetDestinationPositionText(TextWidget xPosition, TextWidget yPosition, TextWidget zPosition)
{
Vector3 destinationPosition = PrinterConnectionAndCommunication.Instance.CurrentDestination;
xPosition.Text = "X: {0:0.00}".FormatWith(destinationPosition.x);
yPosition.Text = "Y: {0:0.00}".FormatWith(destinationPosition.y);
zPosition.Text = "Z: {0:0.00}".FormatWith(destinationPosition.z);
}
private void homeAll_Click(object sender, EventArgs mouseEvent)
{
PrinterConnectionAndCommunication.Instance.HomeAxis(PrinterConnectionAndCommunication.Axis.XYZ);