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 #2899 from TomoYamanaka/master 

Fix bugs of PWM driver.
pull/2958/head
Sam Grove 2016-10-06 15:54:29 -05:00 committed by GitHub
parent 76fb1f8c3f 762d47e6c8
commit 3aca6fdd86
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
targets/TARGET_RENESAS/TARGET_RZ_A1H/pwmout_api.c
View File

@ -401,8 +401,6 @@ void pwmout_period_us(pwmout_t* obj, int us) {
if (obj->pwm >= MTU2_PWM_OFFSET) {
/* PWM by MTU2 */
int tmp_pwm;
uint16_t tmp_tgra;
uint16_t tmp_tgrc;
uint8_t tmp_tcr_up;
uint8_t tmp_tstr_sp;
uint8_t tmp_tstr_st;
@ -459,12 +457,10 @@ void pwmout_period_us(pwmout_t* obj, int us) {
*MTU2_PWM_MATCH[tmp_pwm][MTU2_PERIOD] = (uint16_t)wk_cycle; // Set period
// Set duty again(TGRA)
tmp_tgra = *TGRA_MATCH[obj->ch];
set_mtu2_duty_again(&tmp_tgra, wk_last_cycle, wk_cycle);
set_mtu2_duty_again(TGRA_MATCH[obj->ch], wk_last_cycle, wk_cycle);
if ((obj->ch == 0) || (obj->ch == 3) || (obj->ch == 4)) {
// Set duty again(TGRC)
tmp_tgrc = *TGRC_MATCH[obj->ch];
set_mtu2_duty_again(&tmp_tgrc, wk_last_cycle, wk_cycle);
set_mtu2_duty_again(TGRC_MATCH[obj->ch], wk_last_cycle, wk_cycle);
}
*TMDR_MATCH[obj->ch] = 0x02; // PWM mode 1
@ -558,7 +554,6 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
value = (float)us / (float)period_ch1;
}
}
pwmout_write(obj, value);
}
pwmout_write(obj, value);
}

11
targets/TARGET_RENESAS/TARGET_VK_RZ_A1H/pwmout_api.c
View File

@ -542,8 +542,6 @@ void pwmout_period_us(pwmout_t* obj, int us) {
if (pwm_mode == MODE_MTU2) {
/* PWM by MTU2 */
int tmp_pwm;
uint16_t tmp_tgra;
uint16_t tmp_tgrc;
uint8_t tmp_tcr_up;
uint8_t tmp_tstr_sp;
uint8_t tmp_tstr_st;
@ -600,12 +598,10 @@ void pwmout_period_us(pwmout_t* obj, int us) {
*MTU2_PWM_MATCH[tmp_pwm][MTU2_PERIOD] = (uint16_t)wk_cycle; // Set period
// Set duty again(TGRA)
tmp_tgra = *TGRA_MATCH[obj->ch];
set_mtu2_duty_again(&tmp_tgra, wk_last_cycle, wk_cycle);
set_mtu2_duty_again(TGRA_MATCH[obj->ch], wk_last_cycle, wk_cycle);
if ((obj->ch == 0) || (obj->ch == 3) || (obj->ch == 4)) {
// Set duty again(TGRC)
tmp_tgrc = *TGRC_MATCH[obj->ch];
set_mtu2_duty_again(&tmp_tgrc, wk_last_cycle, wk_cycle);
set_mtu2_duty_again(TGRC_MATCH[obj->ch], wk_last_cycle, wk_cycle);
}
*TMDR_MATCH[obj->ch] = 0x02; // PWM mode 1
@ -699,7 +695,6 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
value = (float)us / (float)period_ch1;
}
}
pwmout_write(obj, value);
}
pwmout_write(obj, value);
}