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

same70: Add CAN #6366

Merged
merged 1 commit into from
Oct 19, 2023
Merged

same70: Add CAN #6366

merged 1 commit into from
Oct 19, 2023

Conversation

Wulfsta
Copy link
Contributor

@Wulfsta Wulfsta commented Oct 11, 2023

Add CAN to same70. Thanks to @eamaclean for the help.

Depends on #6365.

@Wulfsta Wulfsta force-pushed the same70-canbus branch 2 times, most recently from 14c5f73 to 56f0d30 Compare October 11, 2023 04:10
Copy link
Collaborator

@KevinOConnor KevinOConnor left a comment

Choose a reason for hiding this comment

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

Thanks. Seems fine to me. I have a few very minor comments - see below.

-Kevin

src/atsam/fdcan.c Outdated Show resolved Hide resolved
src/atsam/main.c Outdated Show resolved Hide resolved
src/atsam/main.c Outdated
Comment on lines 69 to 70
#if CONFIG_MACH_SAME70
if (id == MCAN0_CLOCK_ID || id == MCAN1_CLOCK_ID)
return FREQ_CAN;
#endif
Copy link
Collaborator

Choose a reason for hiding this comment

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

As before, it would be preferable to use a regular if instead of an ifdef.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This isn't feasible here, unless we also define the clock ids for other chips, which would be a bit silly. Going to keep this one.

@Wulfsta Wulfsta force-pushed the same70-canbus branch 5 times, most recently from fec3a00 to 49d6a91 Compare October 18, 2023 02:25
Signed-off-by: Luke Vuksta <[email protected]>
@KevinOConnor KevinOConnor merged commit dd01e99 into Klipper3d:master Oct 19, 2023
1 check passed
@KevinOConnor
Copy link
Collaborator

Thanks.

-Kevin

4rianton pushed a commit to 4rianton/klipper that referenced this pull request Oct 19, 2023
rogerlz referenced this pull request in KalicoCrew/kalico Dec 19, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Oct 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants