From e81e7738037020a7bcf997bb9c98fd0c53d82747 Mon Sep 17 00:00:00 2001 From: Brian Kahl Date: Wed, 1 Sep 2021 07:50:02 -0500 Subject: [PATCH] Changed to backlash calibration on TAZPro/ProXT --- Marlin/Configuration.h | 2 +- Marlin/Configuration_adv.h | 10 +++++----- .../generic/confirm_auto_calibration_dialog_box.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index fe6b1d3f9..8185ed504 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1826,7 +1826,7 @@ #define Y_BED_SIZE 286 // Travel limits (mm) after homing, corresponding to endstop positions. #define LULZBOT_X_MIN_POS -1 - #define LULZBOT_Y_MIN_POS -9 + #define LULZBOT_Y_MIN_POS -10 #define LULZBOT_X_MAX_POS 313 #define LULZBOT_Y_MAX_POS 318 #define LULZBOT_Z_MIN_POS -9 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 1e9d256f3..0e5144c36 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1106,8 +1106,8 @@ #define CALIBRATION_MEASURE_LEFT #define CALIBRATION_MEASURE_BACK #elif ENABLED(Workhorse) - #define CALIBRATION_OBJECT_CENTER { 266, -17.0, -2.0 } // mm True location is -22 in y but object size is accounting for location change - #define CALIBRATION_OBJECT_DIMENSIONS { 10.0, 4.0, 10.0 } // mm + #define CALIBRATION_OBJECT_CENTER { 266, -17.0,-2.0 } // mm True location is -22 in y but object size is accounting for location change + #define CALIBRATION_OBJECT_DIMENSIONS { 10.0, 4.0, 10.0 } // mm // Comment out any sides which are unreachable by the probe. For best // auto-calibration results, all sides must be reachable. @@ -1116,13 +1116,13 @@ #define CALIBRATION_MEASURE_LEFT #define CALIBRATION_MEASURE_BACK #elif ANY(TAZPro, TAZProXT) - #define CALIBRATION_OBJECT_CENTER {267.5, -20.0, -2.0} // mm - #define CALIBRATION_OBJECT_DIMENSIONS {10.0, 10.0, 10.0} // mm + #define CALIBRATION_OBJECT_CENTER {267.5,-9.5,-2.0} // mm + #define CALIBRATION_OBJECT_DIMENSIONS {10.0, 1.0, 10.0} // mm // Comment out any sides which are unreachable by the probe. For best // auto-calibration results, all sides must be reachable. #define CALIBRATION_MEASURE_RIGHT - #define CALIBRATION_MEASURE_FRONT + //#define CALIBRATION_MEASURE_FRONT #define CALIBRATION_MEASURE_LEFT #define CALIBRATION_MEASURE_BACK #endif diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp index 748cc1d7e..61577cf63 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp @@ -37,7 +37,7 @@ bool ConfirmAutoCalibrationDialogBox::onTouchEnd(uint8_t tag) { switch (tag) { case 1: GOTO_SCREEN(StatusScreen); - injectCommands_P(PSTR("G425")); + injectCommands_P(PSTR("M425 X0Y0Z0\nM117 Auto-Calibrate in Progress...\nG28\nG425\nM500\nM117 Backlash Saved")); return true; default: return DialogBoxBaseClass::onTouchEnd(tag);