djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1122 from Jahor/patch-1

Browse Source 
Fix PWM Support on port 1 of NRF52840
This commit is contained in:
Scott Shawcroft 2018-08-17 16:54:03 -07:00 committed by GitHub
commit 1a6f6ff8e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/nrf/common-hal/pulseio/PWMOut.c
View File

@ -146,7 +146,7 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
// check if mapped to PWM channel already
for(int i=0; i<PWM_MAX_MODULE; i++)
{
int ch = pin2channel(pwm_arr[i], pin->pin);
int ch = pin2channel(pwm_arr[i], NRF_GPIO_PIN_MAP(pin->port, pin->pin));
if ( ch >= 0 )
{
self->pwm = pwm_arr[i];
@ -168,7 +168,7 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
// disable before mapping pin channel
self->pwm->ENABLE = 0;
self->pwm->PSEL.OUT[self->channel] = pin->pin;
self->pwm->PSEL.OUT[self->channel] = NRF_GPIO_PIN_MAP(pin->port, pin->pin);
self->pwm->COUNTERTOP = (PWM_MAX_FREQ/frequency);
self->freq = frequency;