ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7779 from MateuszMaz/fix_for_NRF52_pwm_issues 

Fix for nrf52 pwm issues
pull/8014/head
Cruz Monrreal 2018-09-05 20:05:35 -05:00 committed by GitHub
parent 6c30b2f48d 2aa67b8c16
commit 201ec14d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pwmout_api.c
View File

@ -57,6 +57,9 @@
#define MAX_PWM_PERIOD_MS (MAX_PWM_PERIOD_US / 1000) #define MAX_PWM_PERIOD_MS (MAX_PWM_PERIOD_US / 1000)
#define MAX_PWM_PERIOD_S ((float) MAX_PWM_PERIOD_US / 1000000.0f) #define MAX_PWM_PERIOD_S ((float) MAX_PWM_PERIOD_US / 1000000.0f)
/* Sequence bit that denotes the polarity of the pwm waveform. */
#define SEQ_POLARITY_BIT (0x8000)
/* Allocate PWM instances. */ /* Allocate PWM instances. */
static nrf_drv_pwm_t nordic_nrf5_pwm_instance[] = { static nrf_drv_pwm_t nordic_nrf5_pwm_instance[] = {
#if PWM0_ENABLED #if PWM0_ENABLED
@ -98,9 +101,6 @@ static void nordic_pwm_init(pwmout_t *obj)
.step_mode = NRF_PWM_STEP_AUTO, .step_mode = NRF_PWM_STEP_AUTO,
}; };
/* Make sure PWM instance is not running before making changes. */
nrf_drv_pwm_uninit(&nordic_nrf5_pwm_instance[obj->instance]);
/* Initialize instance with new configuration. */ /* Initialize instance with new configuration. */
ret_code_t result = nrf_drv_pwm_init(&nordic_nrf5_pwm_instance[obj->instance], ret_code_t result = nrf_drv_pwm_init(&nordic_nrf5_pwm_instance[obj->instance],
&config, &config,
@ -114,6 +114,9 @@ static void nordic_pwm_restart(pwmout_t *obj)
{ {
MBED_ASSERT(obj); MBED_ASSERT(obj);
/* Uninitialize PWM instace */
nrf_drv_pwm_uninit(&nordic_nrf5_pwm_instance[obj->instance]);
/* (Re)initialize PWM instance. */ /* (Re)initialize PWM instance. */
nordic_pwm_init(obj); nordic_pwm_init(obj);
@ -153,6 +156,9 @@ void pwmout_init(pwmout_t *obj, PinName pin)
obj->sequence.repeats = 0; obj->sequence.repeats = 0;
obj->sequence.end_delay = 0; obj->sequence.end_delay = 0;
/* Set active low logic. */
obj->pulse |= SEQ_POLARITY_BIT;
/* Initialize PWM instance. */ /* Initialize PWM instance. */
nordic_pwm_init(obj); nordic_pwm_init(obj);
} }
@ -184,8 +190,11 @@ void pwmout_write(pwmout_t *obj, float percent)
/* Find counts based on period. */ /* Find counts based on period. */
uint16_t pulse = obj->period * percent; uint16_t pulse = obj->period * percent;
/* Clear sequence, but keep the polarity bit */
obj->pulse &= SEQ_POLARITY_BIT;
/* Ensure we don't overcount. */ /* Ensure we don't overcount. */
obj->pulse = (pulse > MAX_PWM_COUNTERTOP) ? MAX_PWM_COUNTERTOP : pulse; obj->pulse |= (pulse > MAX_PWM_COUNTERTOP) ? MAX_PWM_COUNTERTOP : pulse;
/* Store actual percentage passed as parameter to avoid floating point rounding errors. */ /* Store actual percentage passed as parameter to avoid floating point rounding errors. */
obj->percent = percent; obj->percent = percent;
@ -266,10 +275,11 @@ void pwmout_period_us(pwmout_t *obj, int period)
} }
/* Scale new count based on stored duty-cycle and new period. */ /* Scale new count based on stored duty-cycle and new period. */
uint32_t pulse = (period * obj->pulse) / obj->period; uint32_t pulse = (period * (obj->pulse & ~SEQ_POLARITY_BIT)) / obj->period;
/* Store new values in object. */ /* Store new values in object. */
obj->pulse = pulse; obj->pulse &= SEQ_POLARITY_BIT;
obj->pulse |= pulse;
obj->period = period; obj->period = period;
obj->percent = (float) pulse / (float) period; obj->percent = (float) pulse / (float) period;
@ -287,8 +297,9 @@ void pwmout_pulsewidth(pwmout_t *obj, float pulse)
DEBUG_PRINTF("pwmout_pulsewidt: %f\r\n", pulse); DEBUG_PRINTF("pwmout_pulsewidt: %f\r\n", pulse);
/* Cap pulsewidth to period before setting it. */ /* Cap pulsewidth to period before setting it. */
if ((pulse * 1000000) > (float) obj->pulse) { if ((pulse * 1000000) > (float) (obj->pulse & ~SEQ_POLARITY_BIT)) {
obj->pulse = obj->period; obj->pulse &= SEQ_POLARITY_BIT;
obj->pulse |= obj->period;
pwmout_pulsewidth_us(obj, obj->pulse); pwmout_pulsewidth_us(obj, obj->pulse);
} else { } else {
pwmout_pulsewidth_us(obj, pulse * 1000000); pwmout_pulsewidth_us(obj, pulse * 1000000);
@ -306,7 +317,8 @@ void pwmout_pulsewidth_ms(pwmout_t *obj, int pulse)
/* Cap pulsewidth to period before setting it. */ /* Cap pulsewidth to period before setting it. */
if ((pulse * 1000) > (int) obj->period) { if ((pulse * 1000) > (int) obj->period) {
obj->pulse = obj->period; obj->pulse &= SEQ_POLARITY_BIT;
obj->pulse |= obj->period;
pwmout_pulsewidth_us(obj, obj->pulse); pwmout_pulsewidth_us(obj, obj->pulse);
} else { } else {
pwmout_pulsewidth_us(obj, pulse * 1000); pwmout_pulsewidth_us(obj, pulse * 1000);
@ -328,7 +340,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int pulse)
} }
/* Store new values in object. */ /* Store new values in object. */
obj->pulse = pulse; obj->pulse &= SEQ_POLARITY_BIT;
obj->pulse |= pulse;
obj->percent = (float) pulse / (float) obj->period; obj->percent = (float) pulse / (float) obj->period;
/* Restart instance with new values. */ /* Restart instance with new values. */