Skip to content

merge 4.1.x into 4.x #2401

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

Merged
merged 7 commits into from
Dec 17, 2019
Merged

merge 4.1.x into 4.x #2401

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84839de
Hallowing M4
tannewt Jul 24, 2019
0aa5507
add additional pin aliases
tannewt Aug 29, 2019
8d14266
Merge pull request #2094 from tannewt/hallowing_m4
tannewt Aug 29, 2019
251c0f5
nRF: PWMOut: At deinit, make pin available again
jepler Sep 12, 2019
c8eee68
Merge pull request #2153 from jepler/issue2146-4x
tannewt Sep 14, 2019
1719a14
preprocess_frozen_modules: exclude subdirs of examples, docs, tests
jepler Dec 17, 2019
8d43848
Merge pull request #2398 from jepler/excluded-mpy-subdirs-4.x
dhalbert Dec 17, 2019
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
3 changes: 3 additions & 0 deletions ports/nrf/common-hal/pulseio/PWMOut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
// Disconnect pin from channel.
pwm->PSEL.OUT[self->channel] = 0xFFFFFFFF;

reset_pin_number(self->pin_number);
self->pin_number = NO_PIN;

for(int i=0; i < CHANNELS_PER_PWM; i++) {
if (self->pwm->PSEL.OUT[i] != 0xFFFFFFFF) {
// Some channel is still being used, so don't disable.
Expand Down