Skip to content

Change ARMED tone and servo timers #1171

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
Merged
merged 1 commit into from
Sep 14, 2020
Merged

Change ARMED tone and servo timers #1171

merged 1 commit into from
Sep 14, 2020

Conversation

ktand
Copy link
Contributor

@ktand ktand commented Sep 13, 2020

Summary

Change the ARMED variant TIMER_TONE and TIMER_SERVO definitions to avoid timer conflicts in Marlin.

@fpistm fpistm added the enhancement New feature or request label Sep 14, 2020
@fpistm fpistm added this to the 2.0.0 milestone Sep 14, 2020
@fpistm fpistm self-requested a review September 14, 2020 08:16
fpistm
fpistm approved these changes Sep 14, 2020
View reviewed changes
Copy link
Member

@fpistm fpistm left a comment

Choose a reason for hiding this comment

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

LGTM

@fpistm fpistm merged commit fdc2856 into stm32duino:master Sep 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpistm fpistm fpistm approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ktand @fpistm