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

pwmout - fixed compile errors

pull/13492/head
talorion 2020-08-26 14:08:52 +02:00 committed by Gregor Mayramhof
parent 6625bdb9f3
commit b03d80fd08
20 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/pwmout_api.c
View File

@ -134,6 +134,7 @@ int pwmout_read_period_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = ((base->MOD) + 1) / pwm_clock_mhz; tmp = ((base->MOD) + 1) / pwm_clock_mhz;
} }
return tmp; return tmp;
@ -164,6 +165,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz; tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
} }
return tmp; return tmp;

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/pwmout_api.c
View File

@ -134,6 +134,7 @@ int pwmout_read_period_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = ((base->MOD) + 1) / pwm_clock_mhz; tmp = ((base->MOD) + 1) / pwm_clock_mhz;
} }
return tmp; return tmp;
@ -164,6 +165,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz; tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
} }
return tmp; return tmp;

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/pwmout_api.c
View File

@ -131,6 +131,7 @@ int pwmout_read_period_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = ((base->MOD) + 1) / pwm_clock_mhz; tmp = ((base->MOD) + 1) / pwm_clock_mhz;
} }
return tmp; return tmp;
@ -159,6 +160,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz; tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
} }
return tmp; return tmp;

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/pwmout_api.c
View File

@ -131,6 +131,7 @@ int pwmout_read_period_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = ((base->MOD) + 1) / pwm_clock_mhz; tmp = ((base->MOD) + 1) / pwm_clock_mhz;
} }
return tmp; return tmp;
@ -159,6 +160,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz; tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
} }
return tmp; return tmp;

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/pwmout_api.c
View File

@ -131,6 +131,7 @@ int pwmout_read_period_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = ((base->MOD) + 1) / pwm_clock_mhz; tmp = ((base->MOD) + 1) / pwm_clock_mhz;
} }
return tmp; return tmp;
@ -159,6 +160,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
TPM_Type *base = tpm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz; tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
} }
return tmp; return tmp;

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/pwmout_api.c
View File

@ -134,6 +134,7 @@ int pwmout_read_period_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];;
tmp = ((base->MOD) + 1) / pwm_clock_mhz; tmp = ((base->MOD) + 1) / pwm_clock_mhz;
} }
return tmp; return tmp;
@ -164,6 +165,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz; tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
} }
return tmp; return tmp;

2
targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/pwmout_api.c
View File

@ -162,6 +162,7 @@ int pwmout_read_period_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
uint16_t mod = base->MOD & FTM_MOD_MOD_MASK; uint16_t mod = base->MOD & FTM_MOD_MOD_MASK;
tmp = ((mod) + 1) / pwm_clock_mhz; tmp = ((mod) + 1) / pwm_clock_mhz;
} }
@ -193,6 +194,7 @@ int pwmout_read_pulsewidth_us(pwmout_t *obj)
{ {
uint32_t tmp = 0; uint32_t tmp = 0;
if (pwm_clock_mhz > 0) { if (pwm_clock_mhz > 0) {
FTM_Type *base = ftm_addrs[obj->pwm_name >> TPM_SHIFT];
tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz; tmp = (base->CONTROLS[obj->pwm_name & 0xF].CnV) / pwm_clock_mhz;
} }
return tmp; return tmp;

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

@ -353,7 +353,7 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int pulse)
nordic_pwm_restart(obj); nordic_pwm_restart(obj);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj) {
return (obj->period) * (obj->percent); return (obj->period) * (obj->percent);
} }

3
targets/TARGET_NUVOTON/TARGET_M2351/pwmout_api.c
View File

@ -194,7 +194,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_config(obj, 1); pwmout_config(obj, 1);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
return obj->pulsewidth_us; return obj->pulsewidth_us;
} }

2
targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c
View File

@ -180,7 +180,7 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_config(obj, 1); pwmout_config(obj, 1);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj) {
return obj->pulsewidth_us; return obj->pulsewidth_us;
} }

3
targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c
View File

@ -179,7 +179,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_config(obj, 1); pwmout_config(obj, 1);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
return obj->pulsewidth_us; return obj->pulsewidth_us;
} }

3
targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c
View File

@ -184,7 +184,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_config(obj); pwmout_config(obj);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
return obj->pulsewidth_us; return obj->pulsewidth_us;
} }

3
targets/TARGET_NUVOTON/TARGET_M480/pwmout_api.c
View File

@ -182,7 +182,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_config(obj, 1); pwmout_config(obj, 1);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
return obj->pulsewidth_us; return obj->pulsewidth_us;
} }

3
targets/TARGET_NUVOTON/TARGET_NANO100/pwmout_api.c
View File

@ -187,7 +187,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_config(obj); pwmout_config(obj);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
return obj->pulsewidth_us; return obj->pulsewidth_us;
} }

3
targets/TARGET_NUVOTON/TARGET_NUC472/pwmout_api.c
View File

@ -208,7 +208,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_config(obj); pwmout_config(obj);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
return obj->pulsewidth_us; return obj->pulsewidth_us;
} }

3
targets/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c
View File

@ -236,7 +236,8 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
} }
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
return (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0; return (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0;
} }

7
targets/TARGET_NXP/TARGET_LPC11XX_11CXX/pwmout_api.c
View File

@ -174,6 +174,8 @@ void pwmout_period_us(pwmout_t *obj, int us)
int pwmout_read_period_us(pwmout_t *obj) int pwmout_read_period_us(pwmout_t *obj)
{ {
timer_mr tid = pwm_timer_map[obj->pwm];
LPC_TMR_TypeDef *timer = Timers[tid.timer];
return (timer->MR3); return (timer->MR3);
} }
@ -202,7 +204,10 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
timer->TCR = TCR_CNT_EN; timer->TCR = TCR_CNT_EN;
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
timer_mr tid = pwm_timer_map[obj->pwm];
LPC_TMR_TypeDef *timer = Timers[tid.timer];
return (timer->MR3 - timer->MR[tid.mr]); return (timer->MR3 - timer->MR[tid.mr]);
} }

7
targets/TARGET_NXP/TARGET_LPC176X/pwmout_api.c
View File

@ -155,7 +155,7 @@ void pwmout_period_us(pwmout_t *obj, int us)
int pwmout_read_period_us(pwmout_t *obj) int pwmout_read_period_us(pwmout_t *obj)
{ {
return (float)(LPC_PWM1->MR0); return (LPC_PWM1->MR0);
} }
void pwmout_pulsewidth(pwmout_t *obj, float seconds) void pwmout_pulsewidth(pwmout_t *obj, float seconds)
@ -185,8 +185,9 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
LPC_PWM1->LER |= 1 << obj->pwm; LPC_PWM1->LER |= 1 << obj->pwm;
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
return (timer->MR3 - timer->MR[tid.mr]); {
return (*obj->MR);
} }
const PinMap *pwmout_pinmap() const PinMap *pwmout_pinmap()

8
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/pwmout_api.c
View File

@ -196,6 +196,8 @@ void pwmout_period_us(pwmout_t *obj, int us)
int pwmout_read_period_us(pwmout_t *obj) int pwmout_read_period_us(pwmout_t *obj)
{ {
PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7];
uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
return (base->SM[module].VAL1) & PWM_VAL1_VAL1_MASK; return (base->SM[module].VAL1) & PWM_VAL1_VAL1_MASK;
} }
@ -228,9 +230,11 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
PWM_SetPwmLdok(base, (1 << module), true); PWM_SetPwmLdok(base, (1 << module), true);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj) {
uint16_t count; uint16_t count;
PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7];
uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
uint32_t pwmchannel = obj->pwm_name & 0x1;
if (pwmchannel == 0) if (pwmchannel == 0)
{ {
count = (base->SM[module].VAL3) & PWM_VAL3_VAL3_MASK; count = (base->SM[module].VAL3) & PWM_VAL3_VAL3_MASK;

6
targets/TARGET_RENESAS/TARGET_RZ_A1XX/pwmout_api.c
View File

@ -567,11 +567,11 @@ void pwmout_pulsewidth_us(pwmout_t *obj, int us)
pwmout_write(obj, value); pwmout_write(obj, value);
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj { int pwmout_read_pulsewidth_us(pwmout_t *obj)
{
uint32_t wk_pulse = 0; uint32_t wk_pulse = 0;
if (obj->pwm >= MTU2_PWM_OFFSET) if (obj->pwm >= MTU2_PWM_OFFSET) {
{
#ifdef FUMC_MTU2_PWM #ifdef FUMC_MTU2_PWM
/* PWM by MTU2 */ /* PWM by MTU2 */