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

Update main with latest 6.0.x #3608

Merged
merged 8 commits into from
Oct 27, 2020
Merged

Update main with latest 6.0.x #3608

merged 8 commits into from
Oct 27, 2020

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Oct 26, 2020

No description provided.

jerryneedell and others added 6 commits October 21, 2020 17:07
.. pull in various doc build fixes that prevented the previous commit from building.  This is still "0.54.5", the tag was updated in micropython-ulab (since no functional difference was introduced, only doc and CI differences, I imagine)
ulab: Incorporate bugfixes (update to tag 0.54.5, was 0.54.0)
@tannewt tannewt requested a review from jepler October 26, 2020 20:19
@tannewt
Copy link
Member Author

tannewt commented Oct 26, 2020

This depends on #3609

Use old translation date to avoid merge conflict
@tannewt
Copy link
Member Author

tannewt commented Oct 27, 2020

@jepler Please take a look at this. It should be a simple review.

Copy link
Member

@jepler jepler left a comment

Choose a reason for hiding this comment

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

Thanks, looks good to me!

@jepler jepler merged commit 5110fec into main Oct 27, 2020
jepler pushed a commit to jepler/circuitpython that referenced this pull request Jan 10, 2022
This commit allows using all the available PWM timers (up to 8) and
channels (up to 16), without affecting the PWM API.

If a new frequency is set, first it checks if another timer is using the
same frequency.  If yes, then it uses this timer, otherwise, it creates a
new one.  If all timers are used, the user should set an already used
frequency, or de-init a channel.

This work is based on adafruit#6276 and adafruit#3608.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants