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

Update descriptions and dont call unneeded functions

Browse Source
This commit is contained in:
InsanityAutomation
2019-03-26 11:24:52 -04:00
parent fe346cd4d1
commit eb91f08725
94 changed files with 385 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,19 +70,23 @@ bool BLTouch::set_deployed(const bool in_deploy) {
}
}
#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
set_OD_mode();
#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
set_OD_mode();
#endif
#endif
if (in_deploy) {
_deploy();
set_SW_mode(); // Ensure Switch mode is activated for BLTouch V3. Ignored on V2.
#if ENABLED(BLTOUCH_V3)
set_SW_mode();
#endif
}
else _stow();

18
Marlin/src/feature/bltouch.h
View File

@ -43,21 +43,9 @@ public:
FORCE_INLINE static void reset() { command(BLTOUCH_RESET); }
FORCE_INLINE static void selftest() { command(BLTOUCH_SELFTEST); }
FORCE_INLINE static void set_5V_mode() {
#if ENABLED(BLTOUCH_V3)
command(BLTOUCH_5V_MODE);
#endif
}
FORCE_INLINE static void set_OD_mode() {
#if ENABLED(BLTOUCH_V3)
command(BLTOUCH_OD_MODE);
#endif
}
FORCE_INLINE static void set_SW_mode() {
#if ENABLED(BLTOUCH_V3)
command(BLTOUCH_SW_MODE);
#endif
}
FORCE_INLINE static void set_5V_mode() { command(BLTOUCH_5V_MODE); }
FORCE_INLINE static void set_OD_mode() { command(BLTOUCH_OD_MODE); }
FORCE_INLINE static void set_SW_mode() { command(BLTOUCH_SW_MODE); }
FORCE_INLINE static bool deploy() { return set_deployed(true); }
FORCE_INLINE static bool stow() { return set_deployed(false); }