From 792b359a3676256053a86881df272e015aa5e1a1 Mon Sep 17 00:00:00 2001 From: neilt6 Date: Thu, 3 Mar 2016 15:28:59 -0700 Subject: [PATCH 1/2] [LPC11U68, LPC1549] Fixed PwmOut SCT Bugs * 0% duty cycle now reads back correctly * Period & pulse-width changes now take effect immediately if the timer is halted --- .../TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c | 24 ++++++++++++++----- .../TARGET_NXP/TARGET_LPC15XX/pwmout_api.c | 24 ++++++++++++++----- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c index 4e775914839..a8263f7090b 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c @@ -137,7 +137,10 @@ void pwmout_write(pwmout_t* obj, float value) { uint32_t t_on = (uint32_t)((float)(pwm->MATCHREL0 + 1) * value); if (t_on > 0) { pwm->MATCHREL1 = t_on - 1; - pwm->CTRL &= ~(1 << 2); + if (pwm->CTRL & (1 << 2)) { + pwm->MATCH1 = pwm->MATCHREL1; + pwm->CTRL &= ~(1 << 2); + } } else { pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; @@ -145,8 +148,9 @@ void pwmout_write(pwmout_t* obj, float value) { } float pwmout_read(pwmout_t* obj) { - uint32_t t_off = obj->pwm->MATCHREL0 + 1; - uint32_t t_on = obj->pwm->MATCHREL1 + 1; + LPC_SCT0_Type* pwm = obj->pwm; + uint32_t t_off = pwm->MATCHREL0 + 1; + uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0; float v = (float)t_on/(float)t_off; return (v > 1.0f) ? (1.0f) : (v); } @@ -163,16 +167,21 @@ void pwmout_period_ms(pwmout_t* obj, int ms) { void pwmout_period_us(pwmout_t* obj, int us) { LPC_SCT0_Type* pwm = obj->pwm; uint32_t t_off = pwm->MATCHREL0 + 1; - uint32_t t_on = pwm->MATCHREL1 + 1; + uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0; float v = (float)t_on/(float)t_off; uint32_t period_ticks = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000); uint32_t pulsewidth_ticks = period_ticks * v; pwm->MATCHREL0 = period_ticks - 1; if (pulsewidth_ticks > 0) { pwm->MATCHREL1 = pulsewidth_ticks - 1; - pwm->CTRL &= ~(1 << 2); + if (pwm->CTRL & (1 << 2)) { + pwm->MATCH0 = pwm->MATCHREL0; + pwm->MATCH1 = pwm->MATCHREL1; + pwm->CTRL &= ~(1 << 2); + } } else { pwm->CTRL |= (1 << 2) | (1 << 3); + pwm->MATCH0 = pwm->MATCHREL0; pwm->OUTPUT = 0x00000000; } } @@ -189,7 +198,10 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) { LPC_SCT0_Type* pwm = obj->pwm; if (us > 0) { pwm->MATCHREL1 = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000) - 1; - pwm->CTRL &= ~(1 << 2); + if (pwm->CTRL & (1 << 2)) { + pwm->MATCH1 = pwm->MATCHREL1; + pwm->CTRL &= ~(1 << 2); + } } else { pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c index 323e5834254..a8f0c06659f 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c @@ -118,7 +118,10 @@ void pwmout_write(pwmout_t* obj, float value) { uint32_t t_on = (uint32_t)((float)(pwm->MATCHREL0 + 1) * value); if (t_on > 0) { pwm->MATCHREL1 = t_on - 1; - pwm->CTRL &= ~(1 << 2); + if (pwm->CTRL & (1 << 2)) { + pwm->MATCH1 = pwm->MATCHREL1; + pwm->CTRL &= ~(1 << 2); + } } else { pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; @@ -126,8 +129,9 @@ void pwmout_write(pwmout_t* obj, float value) { } float pwmout_read(pwmout_t* obj) { - uint32_t t_off = obj->pwm->MATCHREL0 + 1; - uint32_t t_on = obj->pwm->MATCHREL1 + 1; + LPC_SCT0_Type* pwm = obj->pwm; + uint32_t t_off = pwm->MATCHREL0 + 1; + uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0; float v = (float)t_on/(float)t_off; return (v > 1.0f) ? (1.0f) : (v); } @@ -144,16 +148,21 @@ void pwmout_period_ms(pwmout_t* obj, int ms) { void pwmout_period_us(pwmout_t* obj, int us) { LPC_SCT0_Type* pwm = obj->pwm; uint32_t t_off = pwm->MATCHREL0 + 1; - uint32_t t_on = pwm->MATCHREL1 + 1; + uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0; float v = (float)t_on/(float)t_off; uint32_t period_ticks = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000); uint32_t pulsewidth_ticks = period_ticks * v; pwm->MATCHREL0 = period_ticks - 1; if (pulsewidth_ticks > 0) { pwm->MATCHREL1 = pulsewidth_ticks - 1; - pwm->CTRL &= ~(1 << 2); + if (pwm->CTRL & (1 << 2)) { + pwm->MATCH0 = pwm->MATCHREL0; + pwm->MATCH1 = pwm->MATCHREL1; + pwm->CTRL &= ~(1 << 2); + } } else { pwm->CTRL |= (1 << 2) | (1 << 3); + pwm->MATCH0 = pwm->MATCHREL0; pwm->OUTPUT = 0x00000000; } } @@ -170,7 +179,10 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) { LPC_SCT0_Type* pwm = obj->pwm; if (us > 0) { pwm->MATCHREL1 = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000) - 1; - pwm->CTRL &= ~(1 << 2); + if (pwm->CTRL & (1 << 2)) { + pwm->MATCH1 = pwm->MATCHREL1; + pwm->CTRL &= ~(1 << 2); + } } else { pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; From b3e2763784bc2936917e4bfaa293f0ecfdcd9ee0 Mon Sep 17 00:00:00 2001 From: neilt6 Date: Fri, 4 Mar 2016 09:23:23 -0700 Subject: [PATCH 2/2] [LPC11U68, LPC1549] Improved PwmOut Documentation Improved commenting in pwmout_write(), pwmout_period_us(), and pwmout_pulsewidth_us(). --- .../hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c | 13 ++++++++++++- .../hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c index a8263f7090b..942e950ade1 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c @@ -137,11 +137,14 @@ void pwmout_write(pwmout_t* obj, float value) { uint32_t t_on = (uint32_t)((float)(pwm->MATCHREL0 + 1) * value); if (t_on > 0) { pwm->MATCHREL1 = t_on - 1; + + // Un-halt the timer and ensure the new pulse-width takes immediate effect if necessary if (pwm->CTRL & (1 << 2)) { pwm->MATCH1 = pwm->MATCHREL1; pwm->CTRL &= ~(1 << 2); } } else { + // Halt the timer and force the output low pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; } @@ -174,15 +177,20 @@ void pwmout_period_us(pwmout_t* obj, int us) { pwm->MATCHREL0 = period_ticks - 1; if (pulsewidth_ticks > 0) { pwm->MATCHREL1 = pulsewidth_ticks - 1; + + // Un-halt the timer and ensure the new period & pulse-width take immediate effect if necessary if (pwm->CTRL & (1 << 2)) { pwm->MATCH0 = pwm->MATCHREL0; pwm->MATCH1 = pwm->MATCHREL1; pwm->CTRL &= ~(1 << 2); } } else { + // Halt the timer and force the output low pwm->CTRL |= (1 << 2) | (1 << 3); - pwm->MATCH0 = pwm->MATCHREL0; pwm->OUTPUT = 0x00000000; + + // Ensure the new period will take immediate effect when the timer is un-halted + pwm->MATCH0 = pwm->MATCHREL0; } } @@ -198,11 +206,14 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) { LPC_SCT0_Type* pwm = obj->pwm; if (us > 0) { pwm->MATCHREL1 = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000) - 1; + + // Un-halt the timer and ensure the new pulse-width takes immediate effect if necessary if (pwm->CTRL & (1 << 2)) { pwm->MATCH1 = pwm->MATCHREL1; pwm->CTRL &= ~(1 << 2); } } else { + // Halt the timer and force the output low pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; } diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c index a8f0c06659f..150823a6098 100644 --- a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c +++ b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c @@ -118,11 +118,14 @@ void pwmout_write(pwmout_t* obj, float value) { uint32_t t_on = (uint32_t)((float)(pwm->MATCHREL0 + 1) * value); if (t_on > 0) { pwm->MATCHREL1 = t_on - 1; + + // Un-halt the timer and ensure the new pulse-width takes immediate effect if necessary if (pwm->CTRL & (1 << 2)) { pwm->MATCH1 = pwm->MATCHREL1; pwm->CTRL &= ~(1 << 2); } } else { + // Halt the timer and force the output low pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; } @@ -155,15 +158,20 @@ void pwmout_period_us(pwmout_t* obj, int us) { pwm->MATCHREL0 = period_ticks - 1; if (pulsewidth_ticks > 0) { pwm->MATCHREL1 = pulsewidth_ticks - 1; + + // Un-halt the timer and ensure the new period & pulse-width take immediate effect if necessary if (pwm->CTRL & (1 << 2)) { pwm->MATCH0 = pwm->MATCHREL0; pwm->MATCH1 = pwm->MATCHREL1; pwm->CTRL &= ~(1 << 2); } } else { + // Halt the timer and force the output low pwm->CTRL |= (1 << 2) | (1 << 3); - pwm->MATCH0 = pwm->MATCHREL0; pwm->OUTPUT = 0x00000000; + + // Ensure the new period will take immediate effect when the timer is un-halted + pwm->MATCH0 = pwm->MATCHREL0; } } @@ -179,11 +187,14 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) { LPC_SCT0_Type* pwm = obj->pwm; if (us > 0) { pwm->MATCHREL1 = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000) - 1; + + // Un-halt the timer and ensure the new pulse-width takes immediate effect if necessary if (pwm->CTRL & (1 << 2)) { pwm->MATCH1 = pwm->MATCHREL1; pwm->CTRL &= ~(1 << 2); } } else { + // Halt the timer and force the output low pwm->CTRL |= (1 << 2) | (1 << 3); pwm->OUTPUT = 0x00000000; }