Skip to content

[1.1.x] Treat TMC2660 like non-TMC#11485

Merged
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-1.1.xfrom
thinkyhead:bf1_tmc2660_defer
Aug 10, 2018
Merged

[1.1.x] Treat TMC2660 like non-TMC#11485
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-1.1.xfrom
thinkyhead:bf1_tmc2660_defer

Conversation

@thinkyhead
Copy link
Member

@thinkyhead thinkyhead commented Aug 7, 2018

TMC2660 may not be supportable at this time, so for now simply remove them from the HAS_TRINAMIC condition and treat them like other non-Trinamic stepper drivers.

Counterpart to #11508

@teemuatlut
Copy link
Member

I think it would also be a good idea to modify the stealthchop and stallguard macros.

#define HAS_STEALTHCHOP (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2208))
#define HAS_STALLGUARD (HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2660))
#define AXIS_HAS_STEALTHCHOP(ST) ( AXIS_DRIVER_TYPE(ST, TMC2130) || AXIS_DRIVER_TYPE(ST, TMC2208) )
#define AXIS_HAS_STALLGUARD(ST) ( AXIS_DRIVER_TYPE(ST, TMC2130) || AXIS_DRIVER_TYPE(ST, TMC2660) )

Just don't remove them as they will be expanded again.

@thinkyhead
Copy link
Member Author

I think it would also be a good idea to modify the stealthchop and stallguard macros.

How should they be modified?

@teemuatlut
Copy link
Member

We can remove the references to TMC2660 for now. They'll be added back once the time is right.

@thinkyhead
Copy link
Member Author

thinkyhead commented Aug 10, 2018

Ah, ok. I see that HAS_STALLGUARD mentions 2660, but HAS_STEALTHCHOP doesn't.

@thinkyhead thinkyhead merged commit 9e46e84 into MarlinFirmware:bugfix-1.1.x Aug 10, 2018
@thinkyhead thinkyhead deleted the bf1_tmc2660_defer branch August 10, 2018 05:30
thinkyhead added a commit that referenced this pull request Aug 13, 2018
thinkyhead added a commit that referenced this pull request Sep 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants