From 258e128116d62d6e715e3e982ffd63b4d3d7c26c Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <marcio@alephobjects.com>
Date: Wed, 16 Aug 2017 09:54:21 -0600
Subject: [PATCH] Changes for Yellowfin toolhead.

- Suppress warning about homing toolhead when switching extruder with T0/T1
- Adjusted max feedrate for Yellowfin.
---
 Marlin/Conditionals_LulzBot.h | 6 +++++-
 Marlin/Marlin_main.cpp        | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h
index 20a17c865..d8bc61039 100644
--- a/Marlin/Conditionals_LulzBot.h
+++ b/Marlin/Conditionals_LulzBot.h
@@ -37,7 +37,7 @@
     #error Must specify model and toolhead. Please see "Configuration_LulzBot.h" for directions.
 #endif
 
-#define LULZBOT_FW_VERSION ".24"
+#define LULZBOT_FW_VERSION ".25"
 
 // Select options based on printer model
 
@@ -494,6 +494,7 @@
     #define LULZBOT_Y_MIN_POS                     -20
     #define LULZBOT_TEMP_SENSOR_1                   5
     #define LULZBOT_AO_Hexagon
+    #define LULZBOT_NO_HOME_ON_TOOLHEAD_CHANGE
 #endif /* TOOLHEAD_Javelin_DualExtruder || TOOLHEAD_Longfin_FlexyDually || TOOLHEAD_Yellowfin_DualExtruder */
 
 #if defined(TOOLHEAD_Javelin_DualExtruder)
@@ -638,6 +639,9 @@
     #undef  LULZBOT_Z_MAX_POS
     #define LULZBOT_Z_MAX_POS                     178
 
+    #undef  LULZBOT_DEFAULT_MAX_FEEDRATE
+    #define LULZBOT_DEFAULT_MAX_FEEDRATE          {800, 800, 16, 40}      // (mm/sec)
+
 #elif defined(LULZBOT_Oliveoil_TAZ_6)
     #define DIGIPOT_MOTOR_CURRENT_Z               200
     #define LULZBOT_DEFAULT_MAX_FEEDRATE          {800, 800, 3, 40}      // (mm/sec)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 6cd4dd8e6..283e951b7 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -10093,6 +10093,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
       feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : XY_PROBE_FEEDRATE_MM_S;
 
       if (tmp_extruder != active_extruder) {
+
+#if defined(LULZBOT_NO_MOVE_ON_TOOLHEAD_CHANGE)
+      no_move = true;
+#endif
+
         if (!no_move && axis_unhomed_error()) {
           SERIAL_ECHOLNPGM("No move on toolchange");
           no_move = true;