Skip to content

Commit

Permalink
BLTouchV3
Browse files Browse the repository at this point in the history
  • Loading branch information
@InsanityAutomation
InsanityAutomation committed Mar 21, 2019
2 parents 35d6e29 + 4c43664 commit 15ce74b
Show file tree
Hide file tree
Showing 59 changed files with 73 additions and 6 deletions.
11 changes: 7 additions & 4 deletions Marlin/Conditionals_LCD.h
View file
Expand Up @@ -478,10 +478,13 @@
#undef Z_SERVO_ANGLES
#define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }

#define BLTOUCH_DEPLOY 10
#define BLTOUCH_STOW 90
#define BLTOUCH_SELFTEST 120
#define BLTOUCH_RESET 160
#define BLTOUCH_DEPLOY 10
#define BLTOUCH_SW_MODE 60
#define BLTOUCH_STOW 90
#define BLTOUCH_SELFTEST 120
#define BLTOUCH_5V_MODE 140
#define BLTOUCH_OD_MODE 150
#define BLTOUCH_RESET 160
#define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING)

// Always disable probe pin inverting for BLTouch
Expand Down
1 change: 1 addition & 0 deletions Marlin/Configuration.h
View file
Expand Up @@ -1055,6 +1055,7 @@
#endif
#if ENABLED(BLTOUCH)
#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
8 changes: 8 additions & 0 deletions Marlin/Marlin_main.cpp
View file
Expand Up @@ -2155,6 +2155,8 @@ void clean_up_after_endstop_or_probe_move() {
}

bltouch_command(deploy ? BLTOUCH_DEPLOY : BLTOUCH_STOW);
if(deploy)
bltouch_command(BLTOUCH_SW_MODE);

#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) {
Expand Down Expand Up @@ -15553,6 +15555,12 @@ void setup() {
#endif

#if ENABLED(BLTOUCH)
#if ENABLED(BLTOUCH_FORCE_5V_MODE)
bltouch_command(BLTOUCH_5V_MODE);
#else
bltouch_command(BLTOUCH_OD_MODE);
#endif

// Make sure any BLTouch error condition is cleared
bltouch_command(BLTOUCH_RESET);
set_bltouch_deployed(false);
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Version.h
View file
Expand Up @@ -35,7 +35,7 @@
/**
* Marlin release version identifier
*/
#define SHORT_BUILD_VERSION "1.1.9_B5"
#define SHORT_BUILD_VERSION "1.1.9_B6"

/**
* Verbose version identifier which should contain a reference to the location
Expand All @@ -50,7 +50,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
#define STRING_DISTRIBUTION_DATE "2018-09-12"
#define STRING_DISTRIBUTION_DATE "2019-03-20"

/**
* Required minimum Configuration.h and Configuration_adv.h file versions.
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
View file
Expand Up @@ -743,6 +743,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/AliExpress/CL-260/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Anet/A6/Configuration.h
View file
Expand Up @@ -771,6 +771,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Anet/A8/Configuration.h
View file
Expand Up @@ -730,6 +730,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/BIBO/TouchX/Cyclops/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/BIBO/TouchX/default/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/BQ/Hephestos/Configuration.h
View file
Expand Up @@ -711,6 +711,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
View file
Expand Up @@ -724,6 +724,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/BQ/WITBOX/Configuration.h
View file
Expand Up @@ -711,6 +711,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Cartesio/Configuration.h
View file
Expand Up @@ -722,6 +722,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Creality/CR-10/Configuration.h
View file
Expand Up @@ -733,6 +733,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Creality/CR-10S/Configuration.h
View file
Expand Up @@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Creality/CR-10mini/Configuration.h
View file
Expand Up @@ -742,6 +742,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Creality/CR-8/Configuration.h
View file
Expand Up @@ -733,6 +733,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Creality/Ender-2/Configuration.h
View file
Expand Up @@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Creality/Ender-3/Configuration.h
View file
Expand Up @@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Creality/Ender-4/Configuration.h
View file
Expand Up @@ -733,6 +733,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Felix/Configuration.h
View file
Expand Up @@ -705,6 +705,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Felix/DUAL/Configuration.h
View file
Expand Up @@ -705,6 +705,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
View file
Expand Up @@ -729,6 +729,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Geeetech/GT2560/Configuration.h
View file
Expand Up @@ -738,6 +738,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
View file
Expand Up @@ -739,6 +739,7 @@
#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
View file
Expand Up @@ -738,6 +738,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Geeetech/Prusa i3 Pro C/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Geeetech/Prusa i3 Pro W/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Infitary/i3-M508/Configuration.h
View file
Expand Up @@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/JGAurora/A5/Configuration.h
View file
Expand Up @@ -735,6 +735,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Malyan/M150/Configuration.h
View file
Expand Up @@ -743,6 +743,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Micromake/C1/basic/Configuration.h
View file
Expand Up @@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
View file
Expand Up @@ -727,6 +727,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/RepRapPro/Huxley/Configuration.h
View file
Expand Up @@ -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_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/RigidBot/Configuration.h
View file
Expand Up @@ -721,6 +721,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/SCARA/Configuration.h
View file
Expand Up @@ -736,6 +736,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Sanguinololu/Configuration.h
View file
Expand Up @@ -754,6 +754,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/TinyBoy2/Configuration.h
View file
Expand Up @@ -774,6 +774,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Tronxy/X1/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Tronxy/X5S/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Tronxy/XY100/Configuration.h
View file
Expand Up @@ -734,6 +734,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Velleman/K8200/Configuration.h
View file
Expand Up @@ -752,6 +752,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/example_configurations/Velleman/K8400/Configuration.h
View file
Expand Up @@ -723,6 +723,7 @@
//#define BLTOUCH
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_FORCE_5V_MODE // For BLTouch V3.0 force 5V only mode
#endif

/**
Expand Down

1 comment on commit 15ce74b

@emartin8907
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this still apply for bugfix 2.0?

Please sign in to comment.