riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/nrf52: Ensure that uninitialized PWM outputs are disabled

Browse Source
This commit is contained in:
chrysn 2020-09-30 13:01:36 +02:00
parent 65d4c88be8
commit 2053a1785a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpu/nrf52/periph/pwm.c
View File

@ -92,7 +92,10 @@ uint32_t pwm_init(pwm_t pwm, pwm_mode_t mode, uint32_t freq, uint16_t res)
for (unsigned i = 0; i < PWM_CHANNELS; i++) { for (unsigned i = 0; i < PWM_CHANNELS; i++) {
/* either left aligned pol or inverted duty cycle */ /* either left aligned pol or inverted duty cycle */
pwm_seq[pwm][i] = (POL_MASK & mode) ? POL_MASK : res; pwm_seq[pwm][i] = (POL_MASK & mode) ? POL_MASK : res;
dev(pwm)->PSEL.OUT[i] = pwm_config[pwm].pin[i]; /* Sign-extend the undefined pin into a value that also sets the
* 'Disconnected' field, and is also that register's reset state */
uint32_t extended_pin = (int32_t)(int8_t)pwm_config[pwm].pin[i];
dev(pwm)->PSEL.OUT[i] = extended_pin;
DEBUG("set PIN[%i] to %i with 0x%x\n", DEBUG("set PIN[%i] to %i with 0x%x\n",
(int)i, (int)pwm_config[pwm].pin[i], pwm_seq[pwm][i]); (int)i, (int)pwm_config[pwm].pin[i], pwm_seq[pwm][i]);
} }

2
cpu/nrf5x_common/include/periph_cpu_common.h
View File

@ -55,6 +55,8 @@ extern "C" {
/** /**
* @brief Override GPIO_UNDEF value * @brief Override GPIO_UNDEF value
*/ */
/* The precise value matters where GPIO_UNDEF is set in registers like
* PWM.PSEL.OUT where it is used in sign-extended form to get a UINT32_MAX */
#define GPIO_UNDEF (UINT8_MAX) #define GPIO_UNDEF (UINT8_MAX)
/** /**