From bb73859e1d4435f1720794d398523699d241ff09 Mon Sep 17 00:00:00 2001
From: Rob McKenzie <TheZeroBeast@me.com>
Date: Wed, 25 Sep 2019 21:54:51 +1000
Subject: [PATCH] Sync unload length adjustment

---
 src/config.h   | 6 +++---
 src/motion.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/config.h b/src/config.h
index 6fe0a856..73a15abe 100644
--- a/src/config.h
+++ b/src/config.h
@@ -2,7 +2,7 @@
 
 
 #define FW_VERSION  300 // example: 103 means version 1.0.3
-#define FW_BUILDNR  352 // number of commits in 'master'
+#define FW_BUILDNR  354 // number of commits in 'master'
 
 #define WAKE_TIMER            300000        // 5m
 
@@ -145,7 +145,7 @@
 #define TYPE_0_FEED_SPEED_PUL                  760  //  S/S
 #define TYPE_0_L2ExStageOne                    350  //  S/S
 #define TYPE_0_L2ExStageTwo                    440  //  S/S
-#define TYPE_0_UnloadSpeed                     855  //  S/S
+#define TYPE_0_UnloadSpeed                     750  //  S/S
 // Flex
 #define TYPE_1_MAX_SPPED_PUL                  2500  //  S/S from 300
 #define TYPE_1_ACC_FEED_PUL                   1800  //  S/S/S
@@ -163,7 +163,7 @@
 #define TYPE_2_FEED_SPEED_PUL                  760  //  S/S
 #define TYPE_2_L2ExStageOne                    350  //  S/S
 #define TYPE_2_L2ExStageTwo                    440  //  S/S
-#define TYPE_2_UnloadSpeed                     855  //  S/S
+#define TYPE_2_UnloadSpeed                     750  //  S/S
 
 // number of extruders
 #define EXTRUDERS 5
diff --git a/src/motion.cpp b/src/motion.cpp
index beacd98e..1fe2248b 100644
--- a/src/motion.cpp
+++ b/src/motion.cpp
@@ -196,9 +196,9 @@ void unload_filament_withSensor(uint8_t extruder)
         unsigned char txUFR[5] = {'U', mmPerSecSpeedUpper, mmPerSecSpeedLower, BLK, BLK};
         txPayload(txUFR);
         delay(40);
-        moveSmooth(AX_PUL, -(70*AX_PUL_STEP_MM_Ratio), filament_lookup_table[8][filament_type[extruder]],
+        moveSmooth(AX_PUL, -(20*AX_PUL_STEP_MM_Ratio), filament_lookup_table[8][filament_type[extruder]],
                    false, false, GLOBAL_ACC);
-        if (moveSmooth(AX_PUL, ((BOWDEN_LENGTH - 150) * -1),
+        if (moveSmooth(AX_PUL, ((BOWDEN_LENGTH -(20*AX_PUL_STEP_MM_Ratio)) * -1),
                    filament_lookup_table[0][filament_type[extruder]], false, false,
                    filament_lookup_table[1][filament_type[extruder]], true) == MR_Success) goto loop;
         if (filament_type[extruder] == 1) unloadFINDACheckSteps = -5000;