From 55402e19db41f6c8a706782572a177f61b4e93ef Mon Sep 17 00:00:00 2001 From: Trisuborn <553070703@qq.com> Date: Wed, 20 Jan 2021 23:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=92=E8=A1=A5PWM?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=85=BC=E5=AE=B9=E5=8E=9F=E6=9C=AC?= =?UTF-8?q?API=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=92=E8=A1=A5PWM=E4=BD=BF?= =?UTF-8?q?=E8=83=BD/=E5=A4=B1=E8=83=BD=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32/libraries/HAL_Drivers/drv_pwm.c | 4 +++ .../drivers/include/drivers/rt_drv_pwm.h | 6 ++-- components/drivers/misc/rt_drv_pwm.c | 34 ++++++++++--------- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c b/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c index 38958dddd4..b6caafe05c 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_pwm.c @@ -309,8 +309,12 @@ static rt_err_t drv_pwm_control(struct rt_device_pwm *device, int cmd, void *arg switch (cmd) { + case PWMN_CMD_ENABLE: + configuration->complementary = RT_TRUE; case PWM_CMD_ENABLE: return drv_pwm_enable(htim, configuration, RT_TRUE); + case PWMN_CMD_DISABLE: + configuration->complementary = RT_FALSE; case PWM_CMD_DISABLE: return drv_pwm_enable(htim, configuration, RT_FALSE); case PWM_CMD_SET: diff --git a/components/drivers/include/drivers/rt_drv_pwm.h b/components/drivers/include/drivers/rt_drv_pwm.h index a4d64fbc12..59d670714d 100644 --- a/components/drivers/include/drivers/rt_drv_pwm.h +++ b/components/drivers/include/drivers/rt_drv_pwm.h @@ -18,6 +18,8 @@ #define PWM_CMD_DISABLE (128 + 1) #define PWM_CMD_SET (128 + 2) #define PWM_CMD_GET (128 + 3) +#define PWMN_CMD_ENABLE (128 + 4) +#define PWMN_CMD_DISABLE (128 + 5)/ struct rt_pwm_configuration { @@ -46,8 +48,8 @@ struct rt_device_pwm rt_err_t rt_device_pwm_register(struct rt_device_pwm *device, const char *name, const struct rt_pwm_ops *ops, const void *user_data); -rt_err_t rt_pwm_enable(struct rt_device_pwm *device, int channel, rt_uint8_t complementary); -rt_err_t rt_pwm_disable(struct rt_device_pwm *device, int channel, rt_uint8_t complementary); +rt_err_t rt_pwm_enable(struct rt_device_pwm *device, int channel); +rt_err_t rt_pwm_disable(struct rt_device_pwm *device, int channel); rt_err_t rt_pwm_set(struct rt_device_pwm *device, int channel, rt_uint32_t period, rt_uint32_t pulse); #endif /* __DRV_PWM_H_INCLUDE__ */ diff --git a/components/drivers/misc/rt_drv_pwm.c b/components/drivers/misc/rt_drv_pwm.c index 03ef3353a3..572580c45c 100644 --- a/components/drivers/misc/rt_drv_pwm.c +++ b/components/drivers/misc/rt_drv_pwm.c @@ -126,7 +126,7 @@ rt_err_t rt_device_pwm_register(struct rt_device_pwm *device, const char *name, return result; } -rt_err_t rt_pwm_enable(struct rt_device_pwm *device, int channel, rt_uint8_t complementary) +rt_err_t rt_pwm_enable(struct rt_device_pwm *device, int channel) { rt_err_t result = RT_EOK; struct rt_pwm_configuration configuration = {0}; @@ -136,14 +136,14 @@ rt_err_t rt_pwm_enable(struct rt_device_pwm *device, int channel, rt_uint8_t com return -RT_EIO; } - configuration.channel = channel; - configuration.complementary = complementary ? (RT_TRUE) : (RT_FALSE); + configuration.channel = (channel > 0) ? (channel) : (-channel); /* Make it is positive num forever */ + configuration.complementary = (channel > 0) ? (RT_FALSE) : (RT_TRUE); /* If nagetive, it's complementary */ result = rt_device_control(&device->parent, PWM_CMD_ENABLE, &configuration); return result; } -rt_err_t rt_pwm_disable(struct rt_device_pwm *device, int channel, rt_uint8_t complementary) +rt_err_t rt_pwm_disable(struct rt_device_pwm *device, int channel) { rt_err_t result = RT_EOK; struct rt_pwm_configuration configuration = {0}; @@ -153,8 +153,8 @@ rt_err_t rt_pwm_disable(struct rt_device_pwm *device, int channel, rt_uint8_t co return -RT_EIO; } - configuration.channel = channel; - configuration.complementary = complementary ? (RT_TRUE) : (RT_FALSE); + configuration.channel = (channel > 0) ? (channel) : (-channel); /* Make it is positive num forever */ + configuration.complementary = (channel > 0) ? (RT_FALSE) : (RT_TRUE); /* If nagetive, it's complementary */ result = rt_device_control(&device->parent, PWM_CMD_DISABLE, &configuration); return result; @@ -204,10 +204,10 @@ static int pwm_enable(int argc, char **argv) int result = 0; struct rt_device_pwm *device = RT_NULL; - if (argc != 4) + if (argc != 3) { - rt_kprintf("Usage: pwm_enable pwm1 1 1\n"); - rt_kprintf(" pwm_enable \n"); + rt_kprintf("Usage: pwm_enable pwm1 1\n"); + rt_kprintf(" pwm_enable \n"); result = -RT_ERROR; goto _exit; } @@ -219,22 +219,23 @@ static int pwm_enable(int argc, char **argv) goto _exit; } - result = rt_pwm_enable(device, atoi(argv[2]), atoi(argv[3])); + /* If channel is complementary(1), make the channel number to nagetive */ + result = rt_pwm_enable(device, atoi(argv[2])); _exit: return result; } -MSH_CMD_EXPORT(pwm_enable, pwm_enable ); +MSH_CMD_EXPORT(pwm_enable, pwm_enable ); static int pwm_disable(int argc, char **argv) { int result = 0; struct rt_device_pwm *device = RT_NULL; - if (argc != 4) + if (argc != 3) { - rt_kprintf("Usage: pwm_enable pwm1 1 1\n"); - rt_kprintf(" pwm_disable \n"); + rt_kprintf("Usage: pwm_disable pwm1 1\n"); + rt_kprintf(" pwm_disable \n"); result = -RT_ERROR; goto _exit; } @@ -246,12 +247,13 @@ static int pwm_disable(int argc, char **argv) goto _exit; } - result = rt_pwm_disable(device, atoi(argv[2]), atoi(argv[3])); + /* If channel is complementary(1), make the channel number to nagetive */ + result = rt_pwm_disable(device, atoi(argv[2])); _exit: return result; } -MSH_CMD_EXPORT(pwm_disable, pwm_disable ); +MSH_CMD_EXPORT(pwm_disable, pwm_disable ); static int pwm_set(int argc, char **argv) {