From d49739f49079b875a8bbff55f457d218d87d642b Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 23 Nov 2015 15:45:35 -0800 Subject: [PATCH] Make sure we ask for position after auto bed level. Make sure we always show the known position of the printer when we re-build the display. --- .../PrintLeveling/LevelWizard13PointRadial.cs | 5 +++-- .../PrintLeveling/LevelWizard3Point.cs | 3 ++- .../PrintLeveling/LevelWizard7PointRadial.cs | 5 +++-- .../ControlWidgets/MovementControls.cs | 15 +++++++++++---- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs index 6e3d6c82d..a87c72952 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs @@ -83,8 +83,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } List lines = new List(); lines.Add(lineBeingSent); - if (lineBeingSent.StartsWith("G28")) - { + if (lineBeingSent.StartsWith("G28") + || lineBeingSent.StartsWith("G29")) + { lines.Add("M114"); } diff --git a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs index baa0ad9e5..47ab8b18c 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs @@ -120,7 +120,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } List lines = new List(); lines.Add(lineBeingSent); - if (lineBeingSent.StartsWith("G28")) + if (lineBeingSent.StartsWith("G28") + || lineBeingSent.StartsWith("G29")) { lines.Add("M114"); } diff --git a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs index 2a198d81b..768ef8fad 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs @@ -292,8 +292,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } List lines = new List(); lines.Add(lineBeingSent); - if (lineBeingSent.StartsWith("G28")) - { + if (lineBeingSent.StartsWith("G28") + || lineBeingSent.StartsWith("G29")) + { lines.Add("M114"); } diff --git a/PrinterControls/ControlWidgets/MovementControls.cs b/PrinterControls/ControlWidgets/MovementControls.cs index ccb949398..543373008 100644 --- a/PrinterControls/ControlWidgets/MovementControls.cs +++ b/PrinterControls/ControlWidgets/MovementControls.cs @@ -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);