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

pwmout - IMX - add read methods for period and pulsewidth

pull/13492/head
talorion 2020-08-25 23:46:11 +02:00 committed by Gregor Mayramhof
parent ea6e806a31
commit 9f83ce1cc7
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ static PWM_Type *const pwm_addrs[] = PWM_BASE_PTRS;
extern void pwm_setup(); extern void pwm_setup();
extern uint32_t pwm_get_clock(); extern uint32_t pwm_get_clock();
void pwmout_init(pwmout_t* obj, PinName pin) void pwmout_init(pwmout_t *obj, PinName pin)
{ {
PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM); PWMName pwm = (PWMName)pinmap_peripheral(pin, PinMap_PWM);
MBED_ASSERT(pwm != (PWMName)NC); MBED_ASSERT(pwm != (PWMName)NC);
@ -93,7 +93,7 @@ void pwmout_init(pwmout_t* obj, PinName pin)
pinmap_pinout(pin, PinMap_PWM); pinmap_pinout(pin, PinMap_PWM);
} }
void pwmout_free(pwmout_t* obj) void pwmout_free(pwmout_t *obj)
{ {
uint32_t instance = (obj->pwm_name >> PWM_SHIFT) & 0x7; uint32_t instance = (obj->pwm_name >> PWM_SHIFT) & 0x7;
uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3; uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
@ -101,7 +101,7 @@ void pwmout_free(pwmout_t* obj)
PWM_StopTimer(pwm_addrs[instance], (1 << module)); PWM_StopTimer(pwm_addrs[instance], (1 << module));
} }
void pwmout_write(pwmout_t* obj, float value) void pwmout_write(pwmout_t *obj, float value)
{ {
if (value < 0.0f) { if (value < 0.0f) {
value = 0.0f; value = 0.0f;
@ -130,7 +130,7 @@ void pwmout_write(pwmout_t* obj, float value)
PWM_SetPwmLdok(base, (1 << module), true); PWM_SetPwmLdok(base, (1 << module), true);
} }
float pwmout_read(pwmout_t* obj) float pwmout_read(pwmout_t *obj)
{ {
PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7]; PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7];
uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3; uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
@ -153,18 +153,18 @@ float pwmout_read(pwmout_t* obj)
return (v > 1.0f) ? (1.0f) : (v); return (v > 1.0f) ? (1.0f) : (v);
} }
void pwmout_period(pwmout_t* obj, float seconds) void pwmout_period(pwmout_t *obj, float seconds)
{ {
pwmout_period_us(obj, seconds * 1000000.0f); pwmout_period_us(obj, seconds * 1000000.0f);
} }
void pwmout_period_ms(pwmout_t* obj, int ms) void pwmout_period_ms(pwmout_t *obj, int ms)
{ {
pwmout_period_us(obj, ms * 1000); pwmout_period_us(obj, ms * 1000);
} }
// Set the PWM period, keeping the duty cycle the same. // Set the PWM period, keeping the duty cycle the same.
void pwmout_period_us(pwmout_t* obj, int us) void pwmout_period_us(pwmout_t *obj, int us)
{ {
PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7]; PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7];
uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3; uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
@ -194,17 +194,22 @@ void pwmout_period_us(pwmout_t* obj, int us)
pwmout_write(obj, dc); pwmout_write(obj, dc);
} }
void pwmout_pulsewidth(pwmout_t* obj, float seconds) int pwmout_read_period_us(pwmout_t *obj)
{
return (base->SM[module].VAL1) & PWM_VAL1_VAL1_MASK;
}
void pwmout_pulsewidth(pwmout_t *obj, float seconds)
{ {
pwmout_pulsewidth_us(obj, seconds * 1000000.0f); pwmout_pulsewidth_us(obj, seconds * 1000000.0f);
} }
void pwmout_pulsewidth_ms(pwmout_t* obj, int ms) void pwmout_pulsewidth_ms(pwmout_t *obj, int ms)
{ {
pwmout_pulsewidth_us(obj, ms * 1000); pwmout_pulsewidth_us(obj, ms * 1000);
} }
void pwmout_pulsewidth_us(pwmout_t* obj, int us) void pwmout_pulsewidth_us(pwmout_t *obj, int us)
{ {
PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7]; PWM_Type *base = pwm_addrs[(obj->pwm_name >> PWM_SHIFT) & 0x7];
uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3; uint32_t module = (obj->pwm_name >> PWM_MODULE_SHIFT) & 0x3;
@ -223,6 +228,18 @@ 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 {
uint16_t count;
if (pwmchannel == 0)
{
count = (base->SM[module].VAL3) & PWM_VAL3_VAL3_MASK;
} else
{
count = (base->SM[module].VAL5) & PWM_VAL5_VAL5_MASK;
}
}
const PinMap *pwmout_pinmap() const PinMap *pwmout_pinmap()
{ {
return PinMap_PWM; return PinMap_PWM;