From 46b6c4ffc47741f6348ffbaad4a8050d9782befa Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Thu, 14 Dec 2017 10:39:48 -0700 Subject: [PATCH] Restore legacy TAZ probe point sequence (T1538) - Modified Marlin to begin the probe sequence at the washer below the wiper pad. --- Marlin/Conditionals_LulzBot.h | 14 ++++++++++---- Marlin/Marlin_main.cpp | 6 +++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index f45177abc..83e3088e1 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -13,7 +13,7 @@ * got disabled. */ -#define LULZBOT_FW_VERSION ".62" // Change this with each update +#define LULZBOT_FW_VERSION ".63" // Change this with each update #if ( \ !defined(LULZBOT_Gladiola_Mini) && \ @@ -462,9 +462,15 @@ // using a degenerate 2x2 grid. This is the traditional behavior. #define LULZBOT_GRID_MAX_POINTS_X 2 #define LULZBOT_GRID_MAX_POINTS_Y 2 - // We can't control the order of probe points exactly, but - // this makes the probe start closer to the wiper pad. - #define LULZBOT_PROBE_Y_FIRST + #if defined(LULZBOT_IS_MINI) + // We can't control the order of probe points exactly, but + // this makes the probe start closer to the wiper pad. + #define LULZBOT_PROBE_Y_FIRST + #else + // Restore the old probe sequence on the TAZ that starts + // probing on the washer underneath the wiper pad. + #define LULZBOT_LAST_PROBE_POINT_ON_BACK_LEFT_CORNER + #endif #endif /* Auto-leveling was introduced on the Mini and TAZ 6. diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 8977ac7f2..ec1e6ef64 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -4950,7 +4950,11 @@ void home_all_axes() { gcode_G28(true); } #if ABL_GRID - bool zig = PR_OUTER_END & 1; // Always end at RIGHT and BACK_PROBE_BED_POSITION + #if defined(LULZBOT_LAST_PROBE_POINT_ON_BACK_LEFT_CORNER) + bool zig = !(PR_OUTER_END & 1); // Always end at LEFT and BACK_PROBE_BED_POSITION + #else + bool zig = PR_OUTER_END & 1; // Always end at RIGHT and BACK_PROBE_BED_POSITION + #endif // Outer loop is Y with PROBE_Y_FIRST disabled for (uint8_t PR_OUTER_VAR = 0; PR_OUTER_VAR < PR_OUTER_END && !isnan(measured_z); PR_OUTER_VAR++) {