Skip to content

Commit 1a9d857

Browse files
committed
pwmout - M261 - add read methods for period and pulsewidth
1 parent 1c75956 commit 1a9d857

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright (c) 2019-2020 Nuvoton Technology Corporation
33
* SPDX-License-Identifier: Apache-2.0
44
*
@@ -58,9 +58,9 @@ static const struct nu_modinit_s pwm_modinit_tab[] = {
5858
{NC, 0, 0, 0, 0, (IRQn_Type) 0, NULL}
5959
};
6060

61-
static void pwmout_config(pwmout_t* obj, int start);
61+
static void pwmout_config(pwmout_t *obj, int start);
6262

63-
void pwmout_init(pwmout_t* obj, PinName pin)
63+
void pwmout_init(pwmout_t *obj, PinName pin)
6464
{
6565
obj->pwm = (PWMName) pinmap_peripheral(pin, PinMap_PWM);
6666
MBED_ASSERT((int) obj->pwm != NC);
@@ -85,7 +85,7 @@ void pwmout_init(pwmout_t* obj, PinName pin)
8585
}
8686

8787
// NOTE: All channels (identified by PWMName) share a PWM module. This reset will also affect other channels of the same PWM module.
88-
if (! ((struct nu_pwm_var *) modinit->var)->en_msk) {
88+
if (!((struct nu_pwm_var *) modinit->var)->en_msk) {
8989
// Reset this module if no channel enabled
9090
SYS_ResetModule(modinit->rsetidx);
9191
}
@@ -102,7 +102,7 @@ void pwmout_init(pwmout_t* obj, PinName pin)
102102
pwm_modinit_mask |= 1 << i;
103103
}
104104

105-
void pwmout_free(pwmout_t* obj)
105+
void pwmout_free(pwmout_t *obj)
106106
{
107107
EPWM_T *pwm_base = (EPWM_T *) NU_MODBASE(obj->pwm);
108108
uint32_t chn = NU_MODSUBINDEX(obj->pwm);
@@ -127,29 +127,29 @@ void pwmout_free(pwmout_t* obj)
127127
obj->pin = NC;
128128
}
129129

130-
void pwmout_write(pwmout_t* obj, float value)
130+
void pwmout_write(pwmout_t *obj, float value)
131131
{
132-
obj->pulsewidth_us = NU_CLAMP((uint32_t) (value * obj->period_us), 0, obj->period_us);
132+
obj->pulsewidth_us = NU_CLAMP((uint32_t)(value * obj->period_us), 0, obj->period_us);
133133
pwmout_config(obj, 1);
134134
}
135135

136-
float pwmout_read(pwmout_t* obj)
136+
float pwmout_read(pwmout_t *obj)
137137
{
138138
return NU_CLAMP((((float) obj->pulsewidth_us) / obj->period_us), 0.0f, 1.0f);
139139
}
140140

141-
void pwmout_period(pwmout_t* obj, float seconds)
141+
void pwmout_period(pwmout_t *obj, float seconds)
142142
{
143143
pwmout_period_us(obj, seconds * 1000000.0f);
144144
}
145145

146-
void pwmout_period_ms(pwmout_t* obj, int ms)
146+
void pwmout_period_ms(pwmout_t *obj, int ms)
147147
{
148148
pwmout_period_us(obj, ms * 1000);
149149
}
150150

151151
// Set the PWM period, keeping the duty cycle the same.
152-
void pwmout_period_us(pwmout_t* obj, int us)
152+
void pwmout_period_us(pwmout_t *obj, int us)
153153
{
154154
uint32_t period_us_old = obj->period_us;
155155
uint32_t pulsewidth_us_old = obj->pulsewidth_us;
@@ -158,23 +158,32 @@ void pwmout_period_us(pwmout_t* obj, int us)
158158
pwmout_config(obj, 1);
159159
}
160160

161-
void pwmout_pulsewidth(pwmout_t* obj, float seconds)
161+
int pwmout_read_period_us(pwmout_t *obj)
162+
{
163+
return obj->period_us;
164+
}
165+
166+
void pwmout_pulsewidth(pwmout_t *obj, float seconds)
162167
{
163168
pwmout_pulsewidth_us(obj, seconds * 1000000.0f);
164169
}
165170

166-
void pwmout_pulsewidth_ms(pwmout_t* obj, int ms)
171+
void pwmout_pulsewidth_ms(pwmout_t *obj, int ms)
167172
{
168173
pwmout_pulsewidth_us(obj, ms * 1000);
169174
}
170175

171-
void pwmout_pulsewidth_us(pwmout_t* obj, int us)
176+
void pwmout_pulsewidth_us(pwmout_t *obj, int us)
172177
{
173178
obj->pulsewidth_us = NU_CLAMP(us, 0, obj->period_us);
174179
pwmout_config(obj, 1);
175180
}
176181

177-
static void pwmout_config(pwmout_t* obj, int start)
182+
int pwmout_read_pulsewidth_us(pwmout_t *obj {
183+
return obj->pulsewidth_us;
184+
}
185+
186+
static void pwmout_config(pwmout_t *obj, int start)
178187
{
179188
EPWM_T *pwm_base = (EPWM_T *) NU_MODBASE(obj->pwm);
180189
uint32_t chn = NU_MODSUBINDEX(obj->pwm);

0 commit comments

Comments
 (0)