pwmout - LPC11U6X - add read methods for period and pulsewidth

pull/13492/head
talorion 2020-08-25 23:44:59 +02:00 committed by Gregor Mayramhof
parent a6f9c5b84f
commit fabd906534
1 changed files with 56 additions and 35 deletions

View File

@ -45,16 +45,19 @@ static LPC_SCT0_Type *SCTs[SCT_CHANNELS] = {
// bit flags for used SCTs // bit flags for used SCTs
static unsigned char sct_used = 0; static unsigned char sct_used = 0;
static int get_available_sct(void) { static int get_available_sct(void)
{
int i; int i;
for (i = 0; i < SCT_CHANNELS; i++) { for (i = 0; i < SCT_CHANNELS; i++) {
if ((sct_used & (1 << i)) == 0) if ((sct_used & (1 << i)) == 0) {
return i; return i;
} }
}
return -1; return -1;
} }
void pwmout_init(pwmout_t* obj, PinName pin) { void pwmout_init(pwmout_t *obj, PinName pin)
{
// determine the SPI to use // determine the SPI to use
PWMName pwm_mapped = (PWMName)pinmap_peripheral(pin, PinMap_PWM); PWMName pwm_mapped = (PWMName)pinmap_peripheral(pin, PinMap_PWM);
if (pwm_mapped == (PWMName)NC) { if (pwm_mapped == (PWMName)NC) {
@ -119,7 +122,8 @@ void pwmout_init(pwmout_t* obj, PinName pin) {
pwmout_write(obj, 0); pwmout_write(obj, 0);
} }
void pwmout_free(pwmout_t* obj) { void pwmout_free(pwmout_t *obj)
{
sct_used &= ~(1 << obj->pwm_ch); sct_used &= ~(1 << obj->pwm_ch);
if (sct_used == 0) { if (sct_used == 0) {
// Disable the SCT clock // Disable the SCT clock
@ -127,7 +131,8 @@ void pwmout_free(pwmout_t* obj) {
} }
} }
void pwmout_write(pwmout_t* obj, float value) { void pwmout_write(pwmout_t *obj, float value)
{
LPC_SCT0_Type *pwm = obj->pwm; LPC_SCT0_Type *pwm = obj->pwm;
if (value < 0.0f) { if (value < 0.0f) {
value = 0.0; value = 0.0;
@ -150,7 +155,8 @@ void pwmout_write(pwmout_t* obj, float value) {
} }
} }
float pwmout_read(pwmout_t* obj) { float pwmout_read(pwmout_t *obj)
{
LPC_SCT0_Type *pwm = obj->pwm; LPC_SCT0_Type *pwm = obj->pwm;
uint32_t t_off = pwm->MATCHREL0 + 1; uint32_t t_off = pwm->MATCHREL0 + 1;
uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0; uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0;
@ -158,16 +164,19 @@ 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)
{
LPC_SCT0_Type *pwm = obj->pwm; LPC_SCT0_Type *pwm = obj->pwm;
uint32_t t_off = pwm->MATCHREL0 + 1; uint32_t t_off = pwm->MATCHREL0 + 1;
uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0; uint32_t t_on = (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0;
@ -194,15 +203,23 @@ void pwmout_period_us(pwmout_t* obj, int us) {
} }
} }
void pwmout_pulsewidth(pwmout_t* obj, float seconds) { int pwmout_read_period_us(pwmout_t *obj)
{
return pwm->MATCHREL0 + 1;
}
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)
{
LPC_SCT0_Type *pwm = obj->pwm; LPC_SCT0_Type *pwm = obj->pwm;
if (us > 0) { if (us > 0) {
pwm->MATCHREL1 = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000) - 1; pwm->MATCHREL1 = (uint32_t)(((uint64_t)SystemCoreClock * (uint64_t)us) / (uint64_t)1000000) - 1;
@ -219,6 +236,10 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
} }
} }
int pwmout_read_pulsewidth_us(pwmout_t *obj {
return (!(pwm->CTRL & (1 << 2))) ? pwm->MATCHREL1 + 1 : 0;
}
const PinMap *pwmout_pinmap() const PinMap *pwmout_pinmap()
{ {
return PinMap_PWM; return PinMap_PWM;