abawo/pico-sdk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional PWM validation and small tidy-up (#801)

Browse Source 
See #768 for discussion / inspiration
This commit is contained in:
Andrew Scheller 2022-05-04 21:29:26 +01:00 committed by GitHub
parent d5121dc880
commit 510ca47c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/rp2_common/hardware_pwm/include/hardware/pwm.h
View File

@ -106,7 +106,7 @@ static inline void pwm_config_set_phase_correct(pwm_config *c, bool phase_correc
| (bool_to_bit(phase_correct) << PWM_CH0_CSR_PH_CORRECT_LSB); | (bool_to_bit(phase_correct) << PWM_CH0_CSR_PH_CORRECT_LSB);
} }
/** \brief Set clock divider in a PWM configuration /** \brief Set PWM clock divider in a PWM configuration
* \ingroup hardware_pwm * \ingroup hardware_pwm
* *
* \param c PWM configuration struct to modify * \param c PWM configuration struct to modify
@ -117,23 +117,10 @@ static inline void pwm_config_set_phase_correct(pwm_config *c, bool phase_correc
* before passing them on to the PWM counter. * before passing them on to the PWM counter.
*/ */
static inline void pwm_config_set_clkdiv(pwm_config *c, float div) { static inline void pwm_config_set_clkdiv(pwm_config *c, float div) {
valid_params_if(PWM, div >= 1.f && div < 256.f);
c->div = (uint32_t)(div * (float)(1u << PWM_CH0_DIV_INT_LSB)); c->div = (uint32_t)(div * (float)(1u << PWM_CH0_DIV_INT_LSB));
} }
/** \brief Set PWM clock divider in a PWM configuration
* \ingroup hardware_pwm
*
* \param c PWM configuration struct to modify
* \param div Integer value to reduce counting rate by. Must be greater than or equal to 1.
*
* If the divide mode is free-running, the PWM counter runs at clk_sys / div.
* Otherwise, the divider reduces the rate of events seen on the B pin input (level or edge)
* before passing them on to the PWM counter.
*/
static inline void pwm_config_set_clkdiv_int(pwm_config *c, uint div) {
c->div = div << PWM_CH0_DIV_INT_LSB;
}
/** \brief Set PWM clock divider in a PWM configuration using an 8:4 fractional value /** \brief Set PWM clock divider in a PWM configuration using an 8:4 fractional value
* \ingroup hardware_pwm * \ingroup hardware_pwm
* *
@ -146,10 +133,26 @@ static inline void pwm_config_set_clkdiv_int(pwm_config *c, uint div) {
* before passing them on to the PWM counter. * before passing them on to the PWM counter.
*/ */
static inline void pwm_config_set_clkdiv_int_frac(pwm_config *c, uint8_t integer, uint8_t fract) { static inline void pwm_config_set_clkdiv_int_frac(pwm_config *c, uint8_t integer, uint8_t fract) {
valid_params_if(PWM, integer >= 1);
valid_params_if(PWM, fract < 16); valid_params_if(PWM, fract < 16);
c->div = (((uint)integer) << PWM_CH0_DIV_INT_LSB) | (((uint)fract) << PWM_CH0_DIV_FRAC_LSB); c->div = (((uint)integer) << PWM_CH0_DIV_INT_LSB) | (((uint)fract) << PWM_CH0_DIV_FRAC_LSB);
} }
/** \brief Set PWM clock divider in a PWM configuration
* \ingroup hardware_pwm
*
* \param c PWM configuration struct to modify
* \param div Integer value to reduce counting rate by. Must be greater than or equal to 1.
*
* If the divide mode is free-running, the PWM counter runs at clk_sys / div.
* Otherwise, the divider reduces the rate of events seen on the B pin input (level or edge)
* before passing them on to the PWM counter.
*/
static inline void pwm_config_set_clkdiv_int(pwm_config *c, uint div) {
valid_params_if(PWM, div >= 1 && div < 256);
pwm_config_set_clkdiv_int_frac(c, (uint8_t)div, 0);
}
/** \brief Set PWM counting mode in a PWM configuration /** \brief Set PWM counting mode in a PWM configuration
* \ingroup hardware_pwm * \ingroup hardware_pwm
* *
@ -392,6 +395,7 @@ static inline void pwm_retard_count(uint slice_num) {
*/ */
static inline void pwm_set_clkdiv_int_frac(uint slice_num, uint8_t integer, uint8_t fract) { static inline void pwm_set_clkdiv_int_frac(uint slice_num, uint8_t integer, uint8_t fract) {
check_slice_num_param(slice_num); check_slice_num_param(slice_num);
valid_params_if(PWM, integer >= 1);
valid_params_if(PWM, fract < 16); valid_params_if(PWM, fract < 16);
pwm_hw->slice[slice_num].div = (((uint)integer) << PWM_CH0_DIV_INT_LSB) | (((uint)fract) << PWM_CH0_DIV_FRAC_LSB); pwm_hw->slice[slice_num].div = (((uint)integer) << PWM_CH0_DIV_INT_LSB) | (((uint)fract) << PWM_CH0_DIV_FRAC_LSB);
} }