Skip to content

Commit c4559ba

Browse files
taloriontalorion
committed
pwmout - RZ_A1XX - add read methods for period and pulsewidth
1 parent 9f83ce1 commit c4559ba

File tree

1 file changed

+103
-48
lines changed

1 file changed

+103
-48
lines changed

‎targets/TARGET_RENESAS/TARGET_RZ_A1XX/pwmout_api.c

Lines changed: 103 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,22 @@ typedef enum {
4646
} PWMType;
4747

4848
static const PWMType PORT[] = {
49-
PWM1A, // PWM_PWM1A
50-
PWM1B, // PWM_PWM1B
51-
PWM1C, // PWM_PWM1C
52-
PWM1D, // PWM_PWM1D
53-
PWM1E, // PWM_PWM1E
54-
PWM1F, // PWM_PWM1F
55-
PWM1G, // PWM_PWM1G
56-
PWM1H, // PWM_PWM1H
57-
PWM2A, // PWM_PWM2A
58-
PWM2B, // PWM_PWM2B
59-
PWM2C, // PWM_PWM2C
60-
PWM2D, // PWM_PWM2D
61-
PWM2E, // PWM_PWM2E
62-
PWM2F, // PWM_PWM2F
63-
PWM2G, // PWM_PWM2G
64-
PWM2H, // PWM_PWM2H
49+
PWM1A, // PWM_PWM1A
50+
PWM1B, // PWM_PWM1B
51+
PWM1C, // PWM_PWM1C
52+
PWM1D, // PWM_PWM1D
53+
PWM1E, // PWM_PWM1E
54+
PWM1F, // PWM_PWM1F
55+
PWM1G, // PWM_PWM1G
56+
PWM1H, // PWM_PWM1H
57+
PWM2A, // PWM_PWM2A
58+
PWM2B, // PWM_PWM2B
59+
PWM2C, // PWM_PWM2C
60+
PWM2D, // PWM_PWM2D
61+
PWM2E, // PWM_PWM2E
62+
PWM2F, // PWM_PWM2F
63+
PWM2G, // PWM_PWM2G
64+
PWM2H, // PWM_PWM2H
6565
};
6666

6767
static __IO uint16_t *PWM_MATCH[] = {
@@ -111,23 +111,23 @@ typedef enum {
111111

112112
typedef struct {
113113
MTU2_PWMType port;
114-
__IO uint16_t * pulse1;
115-
__IO uint16_t * pulse2;
116-
__IO uint16_t * period1;
117-
__IO uint16_t * period2;
118-
__IO uint8_t * tior;
119-
__IO uint8_t * tcr;
120-
__IO uint8_t * tmdr;
114+
__IO uint16_t *pulse1;
115+
__IO uint16_t *pulse2;
116+
__IO uint16_t *period1;
117+
__IO uint16_t *period2;
118+
__IO uint8_t *tior;
119+
__IO uint8_t *tcr;
120+
__IO uint8_t *tmdr;
121121
int max_period;
122122
} st_mtu2_ctrl_t;
123123

124124
static st_mtu2_ctrl_t mtu2_ctl[] = {
125125
{ TIOC0A, &MTU2TGRA_0, &MTU2TGRC_0, &MTU2TGRB_0, &MTU2TGRD_0, &MTU2TIORH_0, &MTU2TCR_0, &MTU2TMDR_0, 125000 }, // PWM_TIOC0A
126126
{ TIOC0C, &MTU2TGRC_0, &MTU2TGRA_0, &MTU2TGRB_0, &MTU2TGRD_0, &MTU2TIORL_0, &MTU2TCR_0, &MTU2TMDR_0, 125000 }, // PWM_TIOC0C
127-
{ TIOC1A, &MTU2TGRA_1, NULL , &MTU2TGRB_1, NULL , &MTU2TIOR_1 , &MTU2TCR_1, &MTU2TMDR_1, 503000 }, // PWM_TIOC1A
128-
{ TIOC1B, &MTU2TGRB_1, NULL , &MTU2TGRA_1, NULL , &MTU2TIOR_1 , &MTU2TCR_1, &MTU2TMDR_1, 503000 }, // PWM_TIOC1B
129-
{ TIOC2A, &MTU2TGRA_2, NULL , &MTU2TGRB_2, NULL , &MTU2TIOR_2 , &MTU2TCR_2, &MTU2TMDR_2, 2000000 }, // PWM_TIOC2A
130-
{ TIOC2B, &MTU2TGRB_2, NULL , &MTU2TGRA_2, NULL , &MTU2TIOR_2 , &MTU2TCR_2, &MTU2TMDR_2, 2000000 }, // PWM_TIOC2B
127+
{ TIOC1A, &MTU2TGRA_1, NULL, &MTU2TGRB_1, NULL, &MTU2TIOR_1, &MTU2TCR_1, &MTU2TMDR_1, 503000 }, // PWM_TIOC1A
128+
{ TIOC1B, &MTU2TGRB_1, NULL, &MTU2TGRA_1, NULL, &MTU2TIOR_1, &MTU2TCR_1, &MTU2TMDR_1, 503000 }, // PWM_TIOC1B
129+
{ TIOC2A, &MTU2TGRA_2, NULL, &MTU2TGRB_2, NULL, &MTU2TIOR_2, &MTU2TCR_2, &MTU2TMDR_2, 2000000 }, // PWM_TIOC2A
130+
{ TIOC2B, &MTU2TGRB_2, NULL, &MTU2TGRA_2, NULL, &MTU2TIOR_2, &MTU2TCR_2, &MTU2TMDR_2, 2000000 }, // PWM_TIOC2B
131131
{ TIOC3A, &MTU2TGRA_3, &MTU2TGRC_3, &MTU2TGRB_3, &MTU2TGRD_3, &MTU2TIORH_3, &MTU2TCR_3, &MTU2TMDR_3, 2000000 }, // PWM_TIOC3A
132132
{ TIOC3C, &MTU2TGRC_3, &MTU2TGRA_3, &MTU2TGRB_3, &MTU2TGRD_3, &MTU2TIORL_3, &MTU2TCR_3, &MTU2TMDR_3, 2000000 }, // PWM_TIOC3C
133133
{ TIOC4A, &MTU2TGRA_4, &MTU2TGRC_4, &MTU2TGRB_4, &MTU2TGRD_4, &MTU2TIORH_4, &MTU2TCR_4, &MTU2TMDR_4, 2000000 }, // PWM_TIOC4A
@@ -138,7 +138,8 @@ static uint16_t init_mtu2_period_ch[5] = {0};
138138
static int32_t mtu2_period_ch[5] = {1, 1, 1, 1, 1};
139139
#endif
140140

141-
void pwmout_init(pwmout_t* obj, PinName pin) {
141+
void pwmout_init(pwmout_t *obj, PinName pin)
142+
{
142143
// determine the channel
143144
PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM);
144145
MBED_ASSERT(pwm != (PWMName)NC);
@@ -150,7 +151,7 @@ void pwmout_init(pwmout_t* obj, PinName pin) {
150151
mtu2_init();
151152

152153
obj->pwm = pwm;
153-
st_mtu2_ctrl_t * p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
154+
st_mtu2_ctrl_t *p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
154155

155156
obj->ch = (uint8_t)(((uint32_t)p_mtu2_ctl->port & 0x000000F0) >> 4);
156157
if (obj->ch == 4) {
@@ -208,18 +209,20 @@ void pwmout_init(pwmout_t* obj, PinName pin) {
208209
}
209210
}
210211

211-
void pwmout_free(pwmout_t* obj) {
212+
void pwmout_free(pwmout_t *obj)
213+
{
212214
pwmout_write(obj, 0);
213215
mtu2_free();
214216
}
215217

216-
void pwmout_write(pwmout_t* obj, float value) {
218+
void pwmout_write(pwmout_t *obj, float value)
219+
{
217220
uint32_t wk_cycle;
218221

219222
if (obj->pwm >= MTU2_PWM_OFFSET) {
220223
#ifdef FUMC_MTU2_PWM
221224
/* PWM by MTU2 */
222-
st_mtu2_ctrl_t * p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
225+
st_mtu2_ctrl_t *p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
223226
uint8_t tmp_tstr_st;
224227

225228
if (value < 0.0f) {
@@ -229,7 +232,7 @@ void pwmout_write(pwmout_t* obj, float value) {
229232
} else {
230233
// Do Nothing
231234
}
232-
wk_cycle = (uint32_t)*p_mtu2_ctl->period1;
235+
wk_cycle = (uint32_t) * p_mtu2_ctl->period1;
233236
if ((obj->ch == 4) || (obj->ch == 3)) {
234237
tmp_tstr_st = (1 << (obj->ch + 3));
235238
} else {
@@ -291,18 +294,19 @@ void pwmout_write(pwmout_t* obj, float value) {
291294
}
292295
}
293296

294-
float pwmout_read(pwmout_t* obj) {
297+
float pwmout_read(pwmout_t *obj)
298+
{
295299
uint32_t wk_cycle;
296300
float value;
297301

298302
if (obj->pwm >= MTU2_PWM_OFFSET) {
299303
#ifdef FUMC_MTU2_PWM
300304
/* PWM by MTU2 */
301305
uint32_t wk_pulse;
302-
st_mtu2_ctrl_t * p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
306+
st_mtu2_ctrl_t *p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
303307

304-
wk_cycle = (uint32_t)*p_mtu2_ctl->period1;
305-
wk_pulse = (uint32_t)*p_mtu2_ctl->pulse1;
308+
wk_cycle = (uint32_t) * p_mtu2_ctl->period1;
309+
wk_pulse = (uint32_t) * p_mtu2_ctl->pulse1;
306310
value = ((float)wk_pulse / (float)wk_cycle);
307311
#endif
308312
} else {
@@ -320,16 +324,19 @@ float pwmout_read(pwmout_t* obj) {
320324
return (value > 1.0f) ? (1.0f) : (value);
321325
}
322326

323-
void pwmout_period(pwmout_t* obj, float seconds) {
327+
void pwmout_period(pwmout_t *obj, float seconds)
328+
{
324329
pwmout_period_us(obj, seconds * 1000000.0f);
325330
}
326331

327-
void pwmout_period_ms(pwmout_t* obj, int ms) {
332+
void pwmout_period_ms(pwmout_t *obj, int ms)
333+
{
328334
pwmout_period_us(obj, ms * 1000);
329335
}
330336

331337
#ifdef FUNC_MOTOR_CTL_PWM
332-
static void set_duty_again(__IO uint16_t *p_pwmpbfr, uint16_t last_cycle, uint16_t new_cycle){
338+
static void set_duty_again(__IO uint16_t *p_pwmpbfr, uint16_t last_cycle, uint16_t new_cycle)
339+
{
333340
uint16_t wk_pwmpbfr;
334341
float value;
335342
uint16_t v;
@@ -342,7 +349,8 @@ static void set_duty_again(__IO uint16_t *p_pwmpbfr, uint16_t last_cycle, uint16
342349
#endif
343350

344351
#ifdef FUMC_MTU2_PWM
345-
static void set_mtu2_duty_again(__IO uint16_t *p_pwmpbfr, uint16_t last_cycle, uint16_t new_cycle){
352+
static void set_mtu2_duty_again(__IO uint16_t *p_pwmpbfr, uint16_t last_cycle, uint16_t new_cycle)
353+
{
346354
uint16_t wk_pwmpbfr;
347355
float value;
348356

@@ -353,7 +361,8 @@ static void set_mtu2_duty_again(__IO uint16_t *p_pwmpbfr, uint16_t last_cycle, u
353361
#endif
354362

355363
// Set the PWM period, keeping the duty cycle the same.
356-
void pwmout_period_us(pwmout_t* obj, int us) {
364+
void pwmout_period_us(pwmout_t *obj, int us)
365+
{
357366
uint32_t pclk_base;
358367
uint32_t wk_cycle;
359368
uint32_t wk_cks = 0;
@@ -365,7 +374,7 @@ void pwmout_period_us(pwmout_t* obj, int us) {
365374
int max_us = 0;
366375

367376
/* PWM by MTU2 */
368-
st_mtu2_ctrl_t * p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
377+
st_mtu2_ctrl_t *p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
369378
uint8_t tmp_tcr_up;
370379
uint8_t tmp_tstr_st;
371380

@@ -387,10 +396,10 @@ void pwmout_period_us(pwmout_t* obj, int us) {
387396
wk_cycle_mtu2 = (uint64_t)pclk_base * us;
388397
while (wk_cycle_mtu2 >= 65535000000) {
389398
if ((obj->ch == 1) && (wk_cks == 3)) {
390-
wk_cks+=2;
399+
wk_cks += 2;
391400
} else if ((obj->ch == 2) && (wk_cks == 3)) {
392401
wk_cycle_mtu2 >>= 2;
393-
wk_cks+=3;
402+
wk_cks += 3;
394403
}
395404
wk_cycle_mtu2 >>= 2;
396405
wk_cks++;
@@ -494,15 +503,44 @@ void pwmout_period_us(pwmout_t* obj, int us) {
494503
}
495504
}
496505

497-
void pwmout_pulsewidth(pwmout_t* obj, float seconds) {
506+
int pwmout_read_period_us(pwmout_t *obj)
507+
{
508+
uint32_t wk_cycle;
509+
float value;
510+
511+
if (obj->pwm >= MTU2_PWM_OFFSET) {
512+
#ifdef FUMC_MTU2_PWM
513+
/* PWM by MTU2 */
514+
st_mtu2_ctrl_t *p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
515+
516+
wk_cycle = (uint32_t) * p_mtu2_ctl->period1;
517+
#endif
518+
} else {
519+
#ifdef FUNC_MOTOR_CTL_PWM
520+
/* PWM */
521+
if (obj->ch == 2) {
522+
wk_cycle = PWMPWCYR_2 & 0x03ff;
523+
} else {
524+
wk_cycle = PWMPWCYR_1 & 0x03ff;
525+
}
526+
#endif
527+
}
528+
529+
return wk_cycle;
530+
}
531+
532+
void pwmout_pulsewidth(pwmout_t *obj, float seconds)
533+
{
498534
pwmout_pulsewidth_us(obj, seconds * 1000000.0f);
499535
}
500536

501-
void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) {
537+
void pwmout_pulsewidth_ms(pwmout_t *obj, int ms)
538+
{
502539
pwmout_pulsewidth_us(obj, ms * 1000);
503540
}
504541

505-
void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
542+
void pwmout_pulsewidth_us(pwmout_t *obj, int us)
543+
{
506544
float value = 0;
507545

508546
if (obj->pwm >= MTU2_PWM_OFFSET) {
@@ -529,6 +567,23 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
529567
pwmout_write(obj, value);
530568
}
531569

570+
int pwmout_read_pulsewidth_us(pwmout_t *obj {
571+
uint32_t wk_pulse = 0;
572+
573+
if (obj->pwm >= MTU2_PWM_OFFSET)
574+
{
575+
#ifdef FUMC_MTU2_PWM
576+
/* PWM by MTU2 */
577+
578+
st_mtu2_ctrl_t *p_mtu2_ctl = &mtu2_ctl[(int)(obj->pwm - MTU2_PWM_OFFSET)];
579+
580+
wk_pulse = (uint32_t) * p_mtu2_ctl->pulse1;
581+
#endif
582+
}
583+
584+
return wk_pulse;
585+
}
586+
532587
const PinMap *pwmout_pinmap()
533588
{
534589
return PinMap_PWM;

0 commit comments

Comments
 (0)