From b25388ba25077127452f52ba497edce0e1c5fec0 Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <marcio@alephobjects.com>
Date: Tue, 5 Dec 2017 09:44:22 -0700
Subject: [PATCH] Fix T1397 for all Minis; adjust Mini 2 probe pts.

- On Mini will now raise head before homing Y to clear wiper pad (T1397).
- On Mini 2, probe locations shifted to land on washers when using bumpers.
---
 Marlin/Conditionals_LulzBot.h | 20 ++++++++++++++++----
 Marlin/Marlin_main.cpp        |  3 ++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h
index b4686f75c..039fa172c 100644
--- a/Marlin/Conditionals_LulzBot.h
+++ b/Marlin/Conditionals_LulzBot.h
@@ -13,7 +13,7 @@
  * got disabled.
  */
 
-#define LULZBOT_FW_VERSION ".54" // Change this with each update
+#define LULZBOT_FW_VERSION ".55" // Change this with each update
 
 #if ( \
     !defined(LULZBOT_Gladiola_Mini) && \
@@ -235,11 +235,16 @@
 #define LULZBOT_NO_PIN_PROTECTION_ON_M226
 
 // Marlin 1.1.5 has an issue where bed leveling is disabled when homing,
-// this causes problems when rehoming X/Y after pausing a print.
+// this causes problems when rehoming X/Y after pausing a print. This
+// bug has been reported upstream as bug #8670
 #if defined(LULZBOT_USE_AUTOLEVELING)
     #define LULZBOT_G28_DISABLES_LEVELING_WORKAROUND
 #endif
 
+// Marlin 1.1.5 does not respect Z_HOMING_HEIGHT on the Mini. This has
+// been reported upstream as bug #8669
+#define LULZBOT_Z_HOMING_HEIGHT_WORKAROUND
+
 /******************** MOTHERBOARD AND PIN CONFIGURATION ***********************/
 
 #if defined(TOOLHEAD_Devel_ServoDual)
@@ -359,7 +364,8 @@
     #define LULZBOT_Z_SAFE_HOMING_Y_POINT         10
     #define LULZBOT_Z_HOMING_HEIGHT               5
 #else
-    #define LULZBOT_Z_HOMING_HEIGHT               0
+    // On the Mini, raise nozzle to clear wiper pad before homing
+    #define LULZBOT_Z_HOMING_HEIGHT               4
 #endif  // LULZBOT_USE_HOME_BUTTON
 
 #define LULZBOT_G92_Z(z) \
@@ -397,7 +403,13 @@
 
 /*********************** AUTOLEVELING / BED PROBE *******************************/
 
-#if defined(LULZBOT_USE_AUTOLEVELING) && defined(LULZBOT_MINI_BED)
+#if defined(LULZBOT_USE_AUTOLEVELING) && defined(LULZBOT_MINI_BED) && defined(LULZBOT_USE_Z_BELT)
+    #define LULZBOT_LEFT_PROBE_BED_POSITION        0
+    #define LULZBOT_RIGHT_PROBE_BED_POSITION     165
+    #define LULZBOT_BACK_PROBE_BED_POSITION      165
+    #define LULZBOT_FRONT_PROBE_BED_POSITION      -6
+
+#elif defined(LULZBOT_USE_AUTOLEVELING) && defined(LULZBOT_MINI_BED)
     #define LULZBOT_LEFT_PROBE_BED_POSITION        0
     #define LULZBOT_RIGHT_PROBE_BED_POSITION     164
     #define LULZBOT_BACK_PROBE_BED_POSITION      162
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index a24906e45..f0da6286c 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -3999,8 +3999,9 @@ inline void gcode_G28(const bool always_home_all) {
         #endif
       }
 
-    #else
+    #endif
 
+    #if defined(LULZBOT_Z_HOMING_HEIGHT_WORKAROUND)
       if (home_all || homeX || homeY) {
         // Raise Z before homing any other axes and z is not already high enough (never lower z)
         destination[Z_AXIS] = LOGICAL_Z_POSITION(Z_HOMING_HEIGHT);