yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

PWM:Add Channel mask to up_pwm_servo_arm & up_pwm_servo_deinit

Browse Source
This commit is contained in:
David Sidrane
2021-05-04 06:53:55 -07:00
committed by Lorenz Meier
parent 19fa5cfe25
commit 3d166d3279
7 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platforms/nuttx/src/px4/nxp/imxrt/io_pins/pwm_servo.c
View File

@@ -104,10 +104,10 @@ int up_pwm_servo_init(uint32_t channel_mask)
return OK;
}
void up_pwm_servo_deinit(void)
void up_pwm_servo_deinit(uint32_t channel_mask)
{
/* disable the timers */
up_pwm_servo_arm(false);
up_pwm_servo_arm(false, channel_mask);
}
int up_pwm_servo_set_rate_group_update(unsigned channel, unsigned rate)
@@ -154,8 +154,8 @@ uint32_t up_pwm_servo_get_rate_group(unsigned group)
}
void
up_pwm_servo_arm(bool armed)
up_pwm_servo_arm(bool armed, uint32_t channel_mask)
{
io_timer_set_enable(armed, IOTimerChanMode_OneShot, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_OneShot, channel_mask);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, channel_mask);
}

10
platforms/nuttx/src/px4/nxp/kinetis/io_pins/pwm_servo.c
View File

@@ -105,10 +105,10 @@ int up_pwm_servo_init(uint32_t channel_mask)
return OK;
}
void up_pwm_servo_deinit(void)
void up_pwm_servo_deinit(uint32_t channel_mask)
{
/* disable the timers */
up_pwm_servo_arm(false);
up_pwm_servo_arm(false, channel_mask);
}
int up_pwm_servo_set_rate_group_update(unsigned group, unsigned rate)
@@ -155,8 +155,8 @@ uint32_t up_pwm_servo_get_rate_group(unsigned group)
}
void
up_pwm_servo_arm(bool armed)
up_pwm_servo_arm(bool armed, uint32_t channel_mask)
{
io_timer_set_enable(armed, IOTimerChanMode_OneShot, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_OneShot, channel_mask);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, channel_mask);
}

10
platforms/nuttx/src/px4/nxp/s32k1xx/io_pins/pwm_servo.c
View File

@@ -102,10 +102,10 @@ int up_pwm_servo_init(uint32_t channel_mask)
return OK;
}
void up_pwm_servo_deinit(void)
void up_pwm_servo_deinit(uint32_t channel_mask)
{
/* disable the timers */
up_pwm_servo_arm(false);
up_pwm_servo_arm(false, channel_mask);
}
int up_pwm_servo_set_rate_group_update(unsigned group, unsigned rate)
@@ -152,8 +152,8 @@ uint32_t up_pwm_servo_get_rate_group(unsigned group)
}
void
up_pwm_servo_arm(bool armed)
up_pwm_servo_arm(bool armed, uint32_t channel_mask)
{
io_timer_set_enable(armed, IOTimerChanMode_OneShot, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_OneShot, channel_mask);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, channel_mask);
}

10
platforms/nuttx/src/px4/stm/stm32_common/io_pins/pwm_servo.c
View File

@@ -109,10 +109,10 @@ int up_pwm_servo_init(uint32_t channel_mask)
return OK;
}
void up_pwm_servo_deinit(void)
void up_pwm_servo_deinit(uint32_t channel_mask)
{
/* disable the timers */
up_pwm_servo_arm(false);
up_pwm_servo_arm(false, channel_mask);
}
int up_pwm_servo_set_rate_group_update(unsigned group, unsigned rate)
@@ -158,8 +158,8 @@ uint32_t up_pwm_servo_get_rate_group(unsigned group)
}
void
up_pwm_servo_arm(bool armed)
up_pwm_servo_arm(bool armed, uint32_t channel_mask)
{
io_timer_set_enable(armed, IOTimerChanMode_OneShot, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, IO_TIMER_ALL_MODES_CHANNELS);
io_timer_set_enable(armed, IOTimerChanMode_OneShot, channel_mask);
io_timer_set_enable(armed, IOTimerChanMode_PWMOut, channel_mask);
}