From af56aeb7fc12bdffa18e47a3c461aa852e1445b5 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 20 Mar 2019 16:17:54 -0700 Subject: [PATCH] Refining xy calibration to go in the right direction --- .../CustomWidgets/XyCalibrationCollectDataPage.cs | 4 ++-- MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs b/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs index e07bcd60f..8a208aa3f 100644 --- a/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs +++ b/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs @@ -109,8 +109,8 @@ namespace MatterHackers.MatterControl { // save the offsets to the extruder var hotendOffset = printer.Settings.Helpers.ExtruderOffset(xyCalibrationData.ExtruderToCalibrateIndex); - hotendOffset.X += xyCalibrationData.Offset * -2 + xyCalibrationData.Offset * xyCalibrationData.XPick; - hotendOffset.Y += xyCalibrationData.Offset * -2 + xyCalibrationData.Offset * xyCalibrationData.YPick; + hotendOffset.X -= xyCalibrationData.Offset * -2 + xyCalibrationData.Offset * xyCalibrationData.XPick; + hotendOffset.Y -= xyCalibrationData.Offset * -2 + xyCalibrationData.Offset * xyCalibrationData.YPick; printer.Settings.Helpers.SetExtruderOffset(xyCalibrationData.ExtruderToCalibrateIndex, hotendOffset); diff --git a/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs b/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs index 1b6913198..fc1914fb0 100644 --- a/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs +++ b/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs @@ -168,7 +168,7 @@ namespace MatterHackers.MatterControl .05, printer.Settings.GetValue(SettingsKey.nozzle_diameter), printer.Settings.GetValue(SettingsKey.wipe_tower_size), - 8).GetAwaiter().GetResult(); + 6).GetAwaiter().GetResult(); break; default: @@ -178,7 +178,7 @@ namespace MatterHackers.MatterControl .1, printer.Settings.GetValue(SettingsKey.nozzle_diameter), printer.Settings.GetValue(SettingsKey.wipe_tower_size), - 8).GetAwaiter().GetResult(); + 6).GetAwaiter().GetResult(); break; }