Skip to content

Commit

Permalink
提交stm32 bsp drv_pwm.c里面的一个小建议 (RT-Thread#6517)
Browse files Browse the repository at this point in the history 
 在使用stm32的pwm驱动时，发现其初始化channel的时候是根据device->channel这个值去初始化的，device->channel这个值是在pwm_configh.h里面定义设置的，又根据rtt的pwm例程，和常规习惯，应该大多数人会更喜欢设置channel=1/2/3/4，而不是在pwm_configh.h中将channel设置为TIM_CHANNEL_1/2/3/4，因此建议drv_pwm.c做出PR中的修改。

在实际开发中，因pwm_configh.h的示例均是.channel=0，又没有做出解释说明要让.channel=TIM_CHANNEL_1/2/3/4的值，容易误操作导致没有成功输出PWM，这是我在实际开发中遇到的现实问题，因而提出此建议。
  • Loading branch information
@100ask-alen
100ask-alen authored Oct 28, 2022
1 parent 721c08d commit a4eb5a5
Show file tree
Hide file tree
Showing 16 changed files with 130 additions and 42 deletions.
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/f0/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM2
#ifndef PWM2_CONFIG
#define PWM2_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/f1/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/f2/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM2
#ifndef PWM2_CONFIG
#define PWM2_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/f3/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/f4/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/f7/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM2
#ifndef PWM2_CONFIG
#define PWM2_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/g0/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM2
#ifndef PWM2_CONFIG
#define PWM2_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/g4/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM2
#ifndef PWM2_CONFIG
#define PWM2_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/h7/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/l1/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM2
#ifndef PWM2_CONFIG
#define PWM2_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/l4/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/l5/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/mp1/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM2
#ifndef PWM2_CONFIG
#define PWM2_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/u5/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
6 changes: 6 additions & 0 deletions bsp/stm32/libraries/HAL_Drivers/config/wb/pwm_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
extern "C" {
#endif

/*
* .tim_handle.Instance = TIM1/2/3...,
* .name = "your pwm device name",
* .channel = 1/2/3/4
*/

#ifdef BSP_USING_PWM1
#ifndef PWM1_CONFIG
#define PWM1_CONFIG \
Expand Down
82 changes: 40 additions & 42 deletions bsp/stm32/libraries/HAL_Drivers/drv_pwm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,13 @@ static struct rt_pwm_ops drv_ops =
static rt_err_t drv_pwm_enable(TIM_HandleTypeDef *htim, struct rt_pwm_configuration *configuration, rt_bool_t enable)
{
/* Converts the channel number to the channel number of Hal library */
rt_uint32_t channel = 0x04 * (configuration->channel - 1);
rt_uint32_t channel = configuration->channel;
if(channel < 1 || channel > 4)
{
LOG_E("pwm channel %d is invalid, failed to enable", configuration->channel);
return -RT_ERROR;
}
channel = 0x04 * (configuration->channel - 1);

if (!configuration->complementary)
{
Expand Down Expand Up @@ -265,7 +271,13 @@ static rt_err_t drv_pwm_enable(TIM_HandleTypeDef *htim, struct rt_pwm_configurat
static rt_err_t drv_pwm_get(TIM_HandleTypeDef *htim, struct rt_pwm_configuration *configuration)
{
/* Converts the channel number to the channel number of Hal library */
rt_uint32_t channel = 0x04 * (configuration->channel - 1);
rt_uint32_t channel = configuration->channel;
if(channel < 1 || channel > 4)
{
LOG_E("pwm channel %d is invalid, failed to get", configuration->channel);
return -RT_ERROR;
}
channel = 0x04 * (configuration->channel - 1);
rt_uint64_t tim_clock;

tim_clock = tim_clock_get(htim);
Expand All @@ -291,7 +303,13 @@ static rt_err_t drv_pwm_set(TIM_HandleTypeDef *htim, struct rt_pwm_configuration
rt_uint32_t period, pulse;
rt_uint64_t tim_clock, psc;
/* Converts the channel number to the channel number of Hal library */
rt_uint32_t channel = 0x04 * (configuration->channel - 1);
rt_uint32_t channel = configuration->channel;
if(channel < 1 || channel > 4)
{
LOG_E("pwm channel %d is invalid, failed to set", configuration->channel);
return -RT_ERROR;
}
channel = 0x04 * (configuration->channel - 1);

tim_clock = tim_clock_get(htim);
/* Convert nanosecond to frequency and duty cycle. 1s = 1 * 1000 * 1000 * 1000 ns */
Expand Down Expand Up @@ -354,7 +372,13 @@ static rt_err_t drv_pwm_set_pulse(TIM_HandleTypeDef *htim, struct rt_pwm_configu
rt_uint32_t period, pulse;
rt_uint64_t tim_clock;
/* Converts the channel number to the channel number of Hal library */
rt_uint32_t channel = 0x04 * (configuration->channel - 1);
rt_uint32_t channel = configuration->channel;
if(channel < 1 || channel > 4)
{
LOG_E("pwm channel %d is invalid, failed to set pulse", configuration->channel);
return -RT_ERROR;
}
channel = 0x04 * (configuration->channel - 1);

tim_clock = tim_clock_get(htim);
/* Convert nanosecond to frequency and duty cycle. 1s = 1 * 1000 * 1000 * 1000 ns */
Expand Down Expand Up @@ -408,6 +432,14 @@ static rt_err_t stm32_hw_pwm_init(struct stm32_pwm *device)
TIM_MasterConfigTypeDef master_config = {0};
TIM_ClockConfigTypeDef clock_config = {0};

rt_uint32_t channel = device->channel;
if(channel < 1 || channel > 4)
{
LOG_E("%s pwm channel %d is invalid, failed to init", device->name, device->channel);
return -RT_ERROR;
}
channel = 0x04 * (device->channel - 1);

RT_ASSERT(device != RT_NULL);

tim = (TIM_HandleTypeDef *)&device->tim_handle;
Expand Down Expand Up @@ -458,45 +490,11 @@ static rt_err_t stm32_hw_pwm_init(struct stm32_pwm *device)
oc_config.OCNIdleState = TIM_OCNIDLESTATE_RESET;
oc_config.OCIdleState = TIM_OCIDLESTATE_RESET;

/* config pwm channel */
if (device->channel & 0x01)
{
if (HAL_TIM_PWM_ConfigChannel(tim, &oc_config, TIM_CHANNEL_1) != HAL_OK)
{
LOG_E("%s channel1 config failed", device->name);
result = -RT_ERROR;
goto __exit;
}
}

if (device->channel & 0x02)
{
if (HAL_TIM_PWM_ConfigChannel(tim, &oc_config, TIM_CHANNEL_2) != HAL_OK)
{
LOG_E("%s channel2 config failed", device->name);
result = -RT_ERROR;
goto __exit;
}
}

if (device->channel & 0x04)
if (HAL_TIM_PWM_ConfigChannel(tim, &oc_config, channel) != HAL_OK)
{
if (HAL_TIM_PWM_ConfigChannel(tim, &oc_config, TIM_CHANNEL_3) != HAL_OK)
{
LOG_E("%s channel3 config failed", device->name);
result = -RT_ERROR;
goto __exit;
}
}

if (device->channel & 0x08)
{
if (HAL_TIM_PWM_ConfigChannel(tim, &oc_config, TIM_CHANNEL_4) != HAL_OK)
{
LOG_E("%s channel4 config failed", device->name);
result = -RT_ERROR;
goto __exit;
}
LOG_E("%s %d config failed", device->name, device->channel);
result = -RT_ERROR;
goto __exit;
}

/* pwm pin configuration */
Expand Down

0 comments on commit a4eb5a5

Please sign in to comment.