3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-29 23:07:42 +00:00
Code Issues Releases Wiki Activity

Add support for the V3 of the BlTouch (#13596)

Browse Source 
V3 of the BLTouch has an [Alarm Release & Touch mode](https://docs.wixstatic.com/ugd/f5a1c8_77037f55e5d542309d9fc178165c9f3f.pdf) to activate after the probe is deployed. If this mode isn't activated, the BLTouch keeps deploying, ends up detecting a collision and gets itself in error mode.

Tested on a Creality Ender-3.
This commit is contained in:
Damien Martin-Guillerez 2019-04-07 02:48:44 +02:00 committed by Scott Lahteine
parent 35775395d9
commit b1e3f4f42f
64 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Conditionals_LCD.h
View File

@ -479,6 +479,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

1
Marlin/Configuration.h
View File

@ -730,6 +730,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

5
Marlin/Marlin_main.cpp
View File

@ -2093,6 +2093,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)) {

1
Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
View File

@ -743,6 +743,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/AliExpress/CL-260/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Anet/A2plus/Configuration.h
View File

@ -762,6 +762,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Anet/A6/Configuration.h
View File

@ -771,6 +771,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Anet/A8/Configuration.h
View File

@ -736,6 +736,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/BIBO/TouchX/default/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/BQ/Hephestos/Configuration.h
View File

@ -711,6 +711,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
View File

@ -724,6 +724,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/BQ/WITBOX/Configuration.h
View File

@ -711,6 +711,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -722,6 +722,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Creality/CR-10/Configuration.h
View File

@ -733,6 +733,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Creality/CR-10S/Configuration.h
View File

@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Creality/CR-10mini/Configuration.h
View File

@ -742,6 +742,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Creality/CR-8/Configuration.h
View File

@ -733,6 +733,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Creality/Ender-2/Configuration.h
View File

@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Creality/Ender-3/Configuration.h
View File

@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Creality/Ender-4/Configuration.h
View File

@ -733,6 +733,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Felix/Configuration.h
View File

@ -705,6 +705,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -705,6 +705,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
View File

@ -729,6 +729,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Geeetech/GT2560/Configuration.h
View File

@ -738,6 +738,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
View File

@ -739,6 +739,7 @@
#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
View File

@ -738,6 +738,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Geeetech/Prusa i3 Pro C/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Geeetech/Prusa i3 Pro W/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Infitary/i3-M508/Configuration.h
View File

@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/JGAurora/A5/Configuration.h
View File

@ -735,6 +735,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Malyan/M150/Configuration.h
View File

@ -743,6 +743,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Micromake/C1/basic/Configuration.h
View File

@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
View File

@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/RepRapPro/Huxley/Configuration.h
View File

@ -763,6 +763,7 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -721,6 +721,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -736,6 +736,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Sanguinololu/Configuration.h
View File

@ -754,6 +754,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/TinyBoy2/Configuration.h
View File

@ -774,6 +774,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Tronxy/X1/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Tronxy/X3A/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Tronxy/X5S/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Tronxy/XY100/Configuration.h
View File

@ -734,6 +734,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Velleman/K8200/Configuration.h
View File

@ -752,6 +752,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Velleman/K8400/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h
View File

@ -733,6 +733,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/Anycubic/Kossel/Configuration.h
View File

@ -862,6 +862,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
View File

@ -808,6 +808,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/FLSUN/kossel/Configuration.h
View File

@ -808,6 +808,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
View File

@ -808,6 +808,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h
View File

@ -813,6 +813,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -798,6 +798,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -798,6 +798,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -791,6 +791,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -801,6 +801,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
View File

@ -736,6 +736,7 @@
#define BLTOUCH
#if ENABLED(BLTOUCH)
#define BLTOUCH_DELAY 500 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/hangprinter/Configuration.h
View File

@ -861,6 +861,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/makibox/Configuration.h
View File

@ -726,6 +726,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -718,6 +718,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**

1
Marlin/example_configurations/wt150/Configuration.h
View File

@ -728,6 +728,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_V3
#endif
/**