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.

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

FT_MOTION: Disable FT-MOTION for homing and probing for Biqu Microprobe #27368

Merged
merged 25 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
01814c0
Biqu Microprobe follow up
narno2202 Aug 24, 2024
f5da97d
Follow up
narno2202 Aug 24, 2024
1659ac3
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Aug 26, 2024
3a63306
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Aug 31, 2024
869c00f
Disable FT_MOTION for homing and probing with Biqu Microprobe
narno2202 Aug 31, 2024
e846ff0
Merge branch 'bugfix-2.1.x' into MicroProbeFix
narno2202 Sep 5, 2024
4247afc
Remove axis_did_move.reset() as it's not used with FTM
narno2202 Sep 5, 2024
b422ce0
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Sep 6, 2024
687ac6a
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Sep 10, 2024
88bbb9c
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Oct 5, 2024
f7fe296
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Oct 13, 2024
059932e
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Oct 23, 2024
b6845b4
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Nov 11, 2024
7862c84
Merge branch 'MarlinFirmware:bugfix-2.1.x' into MicroProbeFix
narno2202 Nov 24, 2024
18d6ed7
Merge 'bugfix-2.1.x' into pr/27368
thinkyhead Dec 4, 2024
5fa035c
better
thinkyhead Dec 4, 2024
e36f903
requires
thinkyhead Dec 4, 2024
91f510f
better
thinkyhead Dec 4, 2024
7f754c2
disable later
thinkyhead Dec 4, 2024
2e026f0
etc
thinkyhead Dec 9, 2024
5e8691d
in scope
thinkyhead Jan 21, 2025
391d147
Merge 'bugfix-2.1.x' into pr/27368
thinkyhead Jan 21, 2025
bde5f6c
conditional
thinkyhead Jan 21, 2025
545673e
ESP32 broken?
thinkyhead Jan 22, 2025
781fe6c
tweak
thinkyhead Jan 22, 2025
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
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@
* For information about this sensor https://github.com/bigtreetech/MicroProbe
*
* Also requires PROBE_ENABLE_DISABLE
* With FT_MOTION requires ENDSTOP_INTERRUPTS_FEATURE
* With FT_MOTION requires ENDSTOP_INTERRUPTS_FEATURE or Z_CURRENT_HOME lower than Z_CURRENT (300mA is a good start)
*/
//#define BIQU_MICROPROBE_V1 // Triggers HIGH
//#define BIQU_MICROPROBE_V2 // Triggers LOW
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/inc/SanityCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -1395,8 +1395,8 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
#error "BIQU MicroProbe requires a PROBE_ENABLE_PIN."
#endif

#if ENABLED(FT_MOTION) && DISABLED(ENDSTOP_INTERRUPTS_FEATURE)
#error "BIQU Microprobe requires ENDSTOP_INTERRUPTS_FEATURE with FT_MOTION."
#if ENABLED(FT_MOTION) && DISABLED(ENDSTOP_INTERRUPTS_FEATURE) && !(Z_CURRENT_HOME < Z_CURRENT)
#error "BIQU Microprobe requires ENDSTOP_INTERRUPTS_FEATURE or Z_CURRENT_HOME lower than Z_CURRENT with FT_MOTION."
Copy link
Member

Choose a reason for hiding this comment

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

We should be fixing the actual issue instead of adding more sanity checks/workarounds.

#endif

#if ENABLED(BIQU_MICROPROBE_V1)
Expand Down
Loading