BLTouch V3 Fix

th3dstudio · Apr 11, 2019 · 8cda6de · 8cda6de
1 parent 3ad1e97
commit 8cda6de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/TH3DUF_R2/Conditionals_LCD.h b/TH3DUF_R2/Conditionals_LCD.h
@@ -496,6 +496,7 @@
   #define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
 
   #define BLTOUCH_DEPLOY    10
+  #define BLTOUCH_ALARM     60
   #define BLTOUCH_STOW      90
   #define BLTOUCH_SELFTEST 120
   #define BLTOUCH_RESET    160

diff --git a/TH3DUF_R2/Configuration.h b/TH3DUF_R2/Configuration.h
@@ -763,9 +763,11 @@
 // and then enter your probe offsets in the CUSTOM_PROBE section above. The Pin 27 boards on eBay are clones of our original EZOut. If you want to 
 // support the people that originally came up with the board you can get our EZOut breakout board here: http://EZOut.TH3DStudio.com
 // Sales from our shop allow us to allocate time for community firmware development at no charge to you. <3
+// If you have a V3 BL Touch also uncomment the BLTOUCH_V3 line to fix issues with the new V3 probe.
 //
 //#define BLTOUCH
-// Here is where you set your servo pin. EZOut Servo Pin Numbers: Others - 27, Ender 2 - 29. For 2560 boards look for the pin you connected the servo wire to and enter below.
+//#define BLTOUCH_V3
+// Here is where you set your servo pin. EZOut Servo Pin Numbers: Ender3/5/CR-10 - 27, Ender 2 - 29. For 2560 boards look for the pin you connected the servo wire to and enter below.
 //#define SERVO0_PIN 27
 //
 // NOTE: On 1284p boards due to space limitations and the large amount of code the BLTouch requires for the LCD Menus
@@ -809,6 +811,6 @@
 
 #include "Configuration_backend.h"
 
-#define UNIFIED_VERSION "TH3D U1.R2.10a"
+#define UNIFIED_VERSION "TH3D U1.R2.10b"
 
 #endif // CONFIGURATION_H
diff --git a/TH3DUF_R2/Marlin_main.cpp b/TH3DUF_R2/Marlin_main.cpp
@@ -2098,6 +2098,11 @@ void clean_up_after_endstop_or_probe_move() {
       }
 
       bltouch_command(deploy ? BLTOUCH_DEPLOY : BLTOUCH_STOW);
+      #if ENABLED(BLTOUCH_V3)
+        // The version 3 of BlTouch needs to switch to Alarm & Test mode after deploy
+        // or it keeps on pushing the probes out and ends up in error mode (collision).
+        if (deploy) bltouch_command(BLTOUCH_ALARM);
+      #endif
 
       #if ENABLED(DEBUG_LEVELING_FEATURE)
         if (DEBUGGING(LEVELING)) {