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

Fix CHEETAH v2.0 Bltouch bug #24635

Merged
merged 4 commits into from
Mar 18, 2023
Merged

Fix CHEETAH v2.0 Bltouch bug #24635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62740ae
Fix CHEETAH v2.0 Bltouch bug
GerogeFu Aug 16, 2022
2c91111
If PB1 is SERVO then it's not also Z-MIN
thinkyhead Sep 4, 2022
936dc30
Merge branch 'bugfix-2.1.x' into pr/24635
thinkyhead Mar 18, 2023
cd15882
followup
thinkyhead Mar 18, 2023
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
24 changes: 13 additions & 11 deletions Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,24 @@
#define FLASH_ADDRESS_START 0x8004000
#endif

#define SERVO0_PIN PB1 // BL-TOUCH/PWM

//
// Z Probe
// Limit Switches
//
#if ENABLED(BLTOUCH)
#error "You need to set jumper to 5v for Bltouch, then comment out this line to proceed."
#define SERVO0_PIN PA0
#elif !defined(Z_MIN_PROBE_PIN)
#define Z_MIN_PROBE_PIN PA0
#endif
#define X_STOP_PIN PB4 // X-MIN
#define Y_STOP_PIN PC8 // Y-MIN
#define Z_STOP_PIN PA0 // Z-MIN

//
// Limit Switches
// Z Probe
//
#define X_STOP_PIN PB4
#define Y_STOP_PIN PC8
#define Z_STOP_PIN PB1
#if ENABLED(BLTOUCH)
#error "You need to set jumper to 5V for BLTouch, then comment out this line to proceed."
#endif
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PB1 // BL-TOUCH/PWM repurposed
#endif

//
// Filament runout
Expand Down
2 changes: 1 addition & 1 deletion buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ extern "C" {

// Timer Definitions
#define TIMER_TONE TIM2 // TIMER_TONE must be defined in this file
#define TIMER_SERVO TIM5 // TIMER_SERVO must be defined in this file
#define TIMER_SERVO TIM3 // TIMER_SERVO must be defined in this file
#define TIMER_SERIAL TIM11 // TIMER_SERIAL must be defined in this file

// UART Definitions
Expand Down