Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add BLTOUCH_SET_5V_MODE pin sanity test for stm32f103 #22840

Merged
merged 3 commits into from
Sep 27, 2021
Merged

add BLTOUCH_SET_5V_MODE pin sanity test for stm32f103 #22840

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3b55a7
add BLTOUCH_SET_5V_MODE sanity test
ellensp Sep 26, 2021
9a2d218
Condense 5V pins list
thinkyhead Sep 27, 2021
4678105
clarify
thinkyhead Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,10 +1529,34 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif

#if ENABLED(BLTOUCH)

// BLTouch can't run in 5V mode with a 3.3V probe pin
#if ENABLED(BLTOUCH_SET_5V_MODE)
#define _5V(P,A,B) WITHIN(P,A,B)
#ifdef STM32F1 // STM32F103 5V-tolerant pins
#define _IS_5V_TOLERANT(P) (_5V(P,PA8,PA15) || _5V(P,PB2,PB15) || _5V(P,PC6,PC12) || _5V(P,PD0,PD15) || _5V(P,PE0,PE15) || _5V(P,PF0,PF5) || _5V(P,PF11,PF15))
#elif defined(ARDUINO_ARCH_SAM)
#define _IS_5V_TOLERANT(P) 0 // Assume no 5V tolerance
#else
#define _IS_5V_TOLERANT(P) 1 // Assume 5V tolerance
#endif
#if USES_Z_MIN_PROBE_PIN && !_IS_5V_TOLERANT(Z_MIN_PROBE_PIN)
#error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PROBE_PIN."
#elif !_IS_5V_TOLERANT(Z_MIN_PIN)
#error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PIN."
#endif
#undef _IS_5V_TOLERANT
#undef _5V
#elif NONE(ONBOARD_ENDSTOPPULLUPS, ENDSTOPPULLUPS, ENDSTOPPULLUP_ZMIN, ENDSTOPPULLUP_ZMIN_PROBE)
#if USES_Z_MIN_PROBE_PIN
#error "BLTOUCH on Z_MIN_PROBE_PIN requires ENDSTOPPULLUP_ZMIN_PROBE, ENDSTOPPULLUPS, or BLTOUCH_SET_5V_MODE."
#else
#error "BLTOUCH on Z_MIN_PIN requires ENDSTOPPULLUP_ZMIN, ENDSTOPPULLUPS, or BLTOUCH_SET_5V_MODE."
#endif
#endif

#if BLTOUCH_DELAY < 200
#error "BLTOUCH_DELAY less than 200 is unsafe and is not supported."
#elif DISABLED(BLTOUCH_SET_5V_MODE) && NONE(ONBOARD_ENDSTOPPULLUPS, ENDSTOPPULLUPS, ENDSTOPPULLUP_ZMIN, ENDSTOPPULLUP_ZMIN_PROBE)
#error "BLTOUCH without BLTOUCH_SET_5V_MODE requires ENDSTOPPULLUPS, ENDSTOPPULLUP_ZMIN or ENDSTOPPULLUP_ZMIN_PROBE."
#endif
#endif

Expand Down