From 0845bc8521ef7e863d8f8aaf7ad243d450932afb Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <marcio@alephobjects.com>
Date: Wed, 28 Mar 2018 14:37:22 -0600
Subject: [PATCH] Remove workaround; park position change.

Remove endstop workaround (T1948)
Set filament purge location to coincide with v3 dual purge location (T2115)
---
 Marlin/Conditionals_LulzBot.h | 13 +++++++------
 Marlin/Configuration.h        |  2 +-
 Marlin/Marlin_main.cpp        |  9 ---------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h
index 4841b2f4e..24789c6cd 100644
--- a/Marlin/Conditionals_LulzBot.h
+++ b/Marlin/Conditionals_LulzBot.h
@@ -259,10 +259,6 @@
     #define LULZBOT_G28_DISABLES_LEVELING_WORKAROUND
 #endif
 
-// Marlin 1.1.5 does not respect ENDSTOPS_ALWAYS_ON_DEFAULT at startup,
-// as described in T1393
-#define LULZBOT_ENDSTOPS_ALWAYS_ON_DEFAULT_WORKAROUND
-
 // Fix for OctoPrint serial buffer overflow when using auto temperature
 // report.
 //      Back port of upstream https://github.com/MarlinFirmware/Marlin/commit/6ed284061580ffc6eef40df391afb30d2f8b45f5
@@ -1464,8 +1460,13 @@
     #define LULZBOT_ADVANCED_PAUSE_EXTRUDE_FEEDRATE  1
     #define LULZBOT_HOME_BEFORE_FILAMENT_CHANGE
     #define LULZBOT_PARK_HEAD_ON_PAUSE
-    #define LULZBOT_PAUSE_PARK_X_POS                 10
-    #define LULZBOT_PAUSE_PARK_Y_POS                 LULZBOT_Y_MAX_POS - 10
+#endif
+
+#if defined(LULZBOT_IS_MINI)
+    #define LULZBOT_NOZZLE_PARK_POINT {  10, (LULZBOT_Y_MAX_POS - 10), 20 }
+#else
+    // Match the purge location of the v3 dual so a single tray can be used.
+    #define LULZBOT_NOZZLE_PARK_POINT { 100, 300, 20 }
 #endif
 
 /*********************************** WIPER PAD **********************************/
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index deeea866c..2d191af44 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1211,7 +1211,7 @@
 
 #if ENABLED(NOZZLE_PARK_FEATURE)
   // Specify a park position as { X, Y, Z }
-  #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
+  #define NOZZLE_PARK_POINT LULZBOT_NOZZLE_PARK_POINT
   #define NOZZLE_PARK_XY_FEEDRATE 100   // X and Y axes feedrate in mm/s (also used for delta printers Z axis)
   #define NOZZLE_PARK_Z_FEEDRATE 5      // Z axis feedrate in mm/s (not used for delta printers)
 #endif
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 635a817be..85859ad26 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -14675,15 +14675,6 @@ void setup() {
     #endif
   #endif
 
-  #if defined(LULZBOT_ENDSTOPS_ALWAYS_ON_DEFAULT_WORKAROUND)
-    endstops.enable_globally(
-    #if ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
-      true
-    #else
-      false
-    #endif
-    );
-  #endif
   #if ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
     SET_OUTPUT(LCD_PINS_DC);
     OUT_WRITE(LCD_PINS_RS, LOW);