From 1acdaa004eeece13aa1db766da0b8c3649733daa Mon Sep 17 00:00:00 2001
From: AndyEveritt <andreweveritt@e3d-online.com>
Date: Wed, 14 Oct 2020 15:44:23 +0100
Subject: [PATCH 1/2] update when check happens

---
 riley/macros/Tool Control/Coupler - Lock   | 1 +
 riley/macros/Tool Control/Coupler - Unlock | 1 +
 riley/sys/tooldetect.g                     | 3 +++
 riley/sys/tpre0.g                          | 9 ++++++---
 riley/sys/tpre1.g                          | 9 ++++++---
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/riley/macros/Tool Control/Coupler - Lock b/riley/macros/Tool Control/Coupler - Lock
index f6dc011..1124d49 100644
--- a/riley/macros/Tool Control/Coupler - Lock	
+++ b/riley/macros/Tool Control/Coupler - Lock	
@@ -1,4 +1,5 @@
 M400
+G90
 M913 C100
 G1 C33 F2500
 M400
diff --git a/riley/macros/Tool Control/Coupler - Unlock b/riley/macros/Tool Control/Coupler - Unlock
index 25e18ee..249faf4 100644
--- a/riley/macros/Tool Control/Coupler - Unlock	
+++ b/riley/macros/Tool Control/Coupler - Unlock	
@@ -1,4 +1,5 @@
 M400
+G90
 M913 C100
 G1 C129 F2500
 M400
diff --git a/riley/sys/tooldetect.g b/riley/sys/tooldetect.g
index be5682d..2010430 100644
--- a/riley/sys/tooldetect.g
+++ b/riley/sys/tooldetect.g
@@ -1,6 +1,9 @@
 ; Check tool detect switch
 if sensors.gpIn[0] != null && sensors.gpIn[0].value = 0
     M291 S3 P{"No tool on toolhead. Will set tool to T-1"} R"Tool Change Error"
+    ;Unlock Coupler
+    M98 P"/macros/Tool Control/Coupler - Unlock"
+    M400
     T-1 P0
     M98 P"resetaxislimit.g"
     M564 S1								; apply the normal limits again
diff --git a/riley/sys/tpre0.g b/riley/sys/tpre0.g
index 15a5fb3..7aef584 100644
--- a/riley/sys/tpre0.g
+++ b/riley/sys/tpre0.g
@@ -31,8 +31,14 @@ M400
 ;if you are using non-standard length hotends ensure the bed is lowered enough BEFORE undocking the tool!
 G91
 G1 Z13.5 F1000
+G1 Y-5
 G90
 
+; Check tool detect switch
+M400
+M98 P"tooldetect.g"
+M400
+
 ;Move Out
 G1 X-9 Y150 B4.25 F2000
 
@@ -41,6 +47,3 @@ M208 X-17.5:317.5 Y154
 
 ; apply the normal limits again
 M564 S1
-
-; Check tool detect switch
-M98 P"tooldetect.g"
diff --git a/riley/sys/tpre1.g b/riley/sys/tpre1.g
index b5faf8c..f1f0bf6 100644
--- a/riley/sys/tpre1.g
+++ b/riley/sys/tpre1.g
@@ -31,8 +31,14 @@ M400
 ;if you are using non-standard length hotends ensure the bed is lowered enough BEFORE undocking the tool!
 G91
 G1 Z13.5 F1000
+G1 Y-5
 G90
 
+; Check tool detect switch
+M400
+M98 P"tooldetect.g"
+M400
+
 ;Move Out
 G1 X81.1 Y150 B4.25 F2000
 
@@ -41,6 +47,3 @@ M208 X-17.5:317.5 Y154
 
 ; apply the normal limits again
 M564 S1
-
-; Check tool detect switch
-M98 P"tooldetect.g"

From ddb5e912f7601b741bdbfdf877afd9b095153afc Mon Sep 17 00:00:00 2001
From: AndyEveritt <andreweveritt@e3d-online.com>
Date: Wed, 14 Oct 2020 16:30:23 +0100
Subject: [PATCH 2/2] add push/pop to coupler macro. slow down pause

---
 riley/macros/Tool Control/Coupler - Lock   | 2 ++
 riley/macros/Tool Control/Coupler - Unlock | 2 ++
 riley/sys/config.g                         | 2 +-
 riley/sys/pause.g                          | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/riley/macros/Tool Control/Coupler - Lock b/riley/macros/Tool Control/Coupler - Lock
index 1124d49..acbc674 100644
--- a/riley/macros/Tool Control/Coupler - Lock	
+++ b/riley/macros/Tool Control/Coupler - Lock	
@@ -1,7 +1,9 @@
 M400
+M120
 G90
 M913 C100
 G1 C33 F2500
 M400
 M913 C50
+M121
 M400
diff --git a/riley/macros/Tool Control/Coupler - Unlock b/riley/macros/Tool Control/Coupler - Unlock
index 249faf4..25acb49 100644
--- a/riley/macros/Tool Control/Coupler - Unlock	
+++ b/riley/macros/Tool Control/Coupler - Unlock	
@@ -1,7 +1,9 @@
 M400
+M120
 G90
 M913 C100
 G1 C129 F2500
 M400
 M913 C50
+M121
 M400
diff --git a/riley/sys/config.g b/riley/sys/config.g
index 7244d44..bc9886d 100644
--- a/riley/sys/config.g
+++ b/riley/sys/config.g
@@ -91,7 +91,7 @@ G10 P1 R0 S0 							; Reset initial tool 1 active and standby temperatures to 0C
 
 ; Tool offsets, adding to vales brings the plane closer to the tool
 G10 P0 X19.5 Y42.5 Z-5.25				; T0 (X0 | Y0 | Z0)
-G10 P1 X19.5 Y42.5 Z-5.45				; T0 (X0 | Y0 | Z0)
+G10 P1 X19.5 Y42.5 Z-5.35				; T0 (X0 | Y0 | Z0)
 
 M593 F50								; cancel ringing at 50Hz (https://forum.e3d-online.com/threads/accelerometer-and-resonance-measurements-of-the-motion-system.3445/)
 M376 H15								; bed compensation taper
diff --git a/riley/sys/pause.g b/riley/sys/pause.g
index 2f57988..1aa2264 100644
--- a/riley/sys/pause.g
+++ b/riley/sys/pause.g
@@ -1,4 +1,4 @@
 G91 						; use relative positioning
 G1 H2 Z5 F5000				; lift Z 5mm
 G90 						; back to absolute positioning
-G1 X0 Y200 F50000	    ; move out the way.
+G1 X0 Y200 F20000	    ; move out the way.