bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Less timely comment, tweak conditions

Browse Source
This commit is contained in:
Scott Lahteine
2019-03-26 19:20:13 -05:00
parent eb91f08725
commit b46ca9aa94
93 changed files with 374 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/Configuration.h
View File

@ -818,9 +818,10 @@
#if ENABLED(BLTOUCH)
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
/** BLTouch V3.0 and newer smart series
* Functions with most genuine sensors, however clones have been reporting issues with the new code.
* If the pin trigger is not detected, first try swapping black and white wires then toggle this.
/**
* BLTouch V3.0 and newer smart series
* For genuine BLTouch 3.0 sensors. Clones may be confused by 3.0 command angles. YMMV.
* If the pin trigger is not detected, first try swapping the black and white wires then toggle this.
*/
//#define BLTOUCH_V3
#if ENABLED(BLTOUCH_V3)

14
Marlin/src/feature/bltouch.cpp
View File

@ -71,19 +71,17 @@ bool BLTouch::set_deployed(const bool in_deploy) {
}
#if ENABLED(BLTOUCH_V3)
#if ENABLED(BLTOUCH_FORCE_5V_MODE)
set_5V_mode();
#elif ENABLED(BLTOUCH_FORCE_OPEN_DRAIN_MODE)
set_OD_mode();
#elif ENABLED(ENDSTOPPULLUPS) || ALL(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, ENDSTOPPULLUP_ZMIN) || (USES_Z_MIN_PROBE_ENDSTOP && ENABLED(ENDSTOPPULLUP_ZMIN_PROBE))
set_5V_mode(); // Assume 5V DC logic level if endstop pullup resistors are enabled
#else
#if EITHER(BLTOUCH_FORCE_5V_MODE, ENDSTOPPULLUPS) \
|| ALL(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, ENDSTOPPULLUP_ZMIN) \
|| (USES_Z_MIN_PROBE_ENDSTOP && ENABLED(ENDSTOPPULLUP_ZMIN_PROBE))
set_5V_mode(); // Assume 5V DC logic level if endstop pullup resistors are enabled
#elif true || ENABLED(BLTOUCH_FORCE_OPEN_DRAIN_MODE)
set_OD_mode();
#endif
#endif
if (in_deploy) {
_deploy();
#if ENABLED(BLTOUCH_V3)
set_SW_mode();
#endif