diff options
| author | Egor Leonenko <jagor@leonenko.info> | 2018-08-17 19:34:03 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 19:34:03 +1200 |
| commit | 18e9f747381a342aa86d7ad28cf8fe8bf725038f (patch) | |
| tree | d1d054efe775568e1e83c7c9516fb8a6b9d3bc83 | |
| parent | 5dd420f7ff2c87a5412a55fea29eb21615a89e14 (diff) | |
Fix PWM Support on NRF52840
Replace usage of pin number alone with port+pin combination in NRF port of PWMOut
| -rw-r--r-- | ports/nrf/common-hal/pulseio/PWMOut.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/nrf/common-hal/pulseio/PWMOut.c b/ports/nrf/common-hal/pulseio/PWMOut.c index c85b77fcd..0f1461092 100644 --- a/ports/nrf/common-hal/pulseio/PWMOut.c +++ b/ports/nrf/common-hal/pulseio/PWMOut.c @@ -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; |
