mirror of
https://gitee.com/dlmu-cone/bf_original_balance_chassis
synced 2026-07-24 03:27:45 +08:00
Merge branch 'master' of gitee.com:hnuyuelurm/basic_framework
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
#include "bsp_log.h"
|
||||
#include "bsp_dwt.h"
|
||||
#include "bsp_usb.h"
|
||||
#include "buzzer.h"
|
||||
#include "bsp_led.h"
|
||||
#include "bsp_temperature.h"
|
||||
|
||||
@@ -15,5 +14,4 @@ void BSPInit()
|
||||
// legacy support,待删除,将在实现了led/tempctrl/buzzer的module之后移动到app层进行XXXRegister()
|
||||
LEDInit();
|
||||
IMUTempInit();
|
||||
buzzer_init();
|
||||
}
|
||||
@@ -5,12 +5,10 @@
|
||||
// 配合中断以及初始化
|
||||
static uint8_t idx;
|
||||
static PWMInstance *pwm_instance[PWM_DEVICE_CNT] = {NULL}; // 所有的pwm instance保存于此,用于callback时判断中断来源
|
||||
|
||||
static uint32_t PWMSelectTclk(TIM_HandleTypeDef *htim );
|
||||
/**
|
||||
* @brief pwm dma传输完成回调函数
|
||||
* @attention 由于HAL库的设计问题,当一个pulse完成(即tim的计数超过比较寄存器)也会调用此函数
|
||||
* 故对于那些开启了PWM的TIM,务必关闭其全局中断,仅保持DMA传输完成中断打开
|
||||
*
|
||||
*
|
||||
* @param htim 发生中断的定时器句柄
|
||||
*/
|
||||
void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim)
|
||||
@@ -37,13 +35,14 @@ PWMInstance *PWMRegister(PWM_Init_Config_s *config)
|
||||
pwm->htim = config->htim;
|
||||
pwm->channel = config->channel;
|
||||
pwm->period = config->period;
|
||||
pwm->pulse = config->pulse;
|
||||
pwm->dutyratio = config->dutyratio;
|
||||
pwm->callback = config->callback;
|
||||
pwm->id = config->id;
|
||||
pwm->tclk = PWMSelectTclk(pwm->htim);
|
||||
// 启动PWM
|
||||
HAL_TIM_PWM_Start_IT(pwm->htim, pwm->channel);
|
||||
__HAL_TIM_SetCompare(pwm->htim, pwm->channel, pwm->pulse); // 设置占空比
|
||||
|
||||
HAL_TIM_PWM_Start(pwm->htim, pwm->channel);
|
||||
PWMSetPeriod(pwm, pwm->period);
|
||||
PWMSetDutyRatio(pwm, pwm->dutyratio);
|
||||
pwm_instance[idx++] = pwm;
|
||||
return pwm;
|
||||
}
|
||||
@@ -52,7 +51,6 @@ PWMInstance *PWMRegister(PWM_Init_Config_s *config)
|
||||
void PWMStart(PWMInstance *pwm)
|
||||
{
|
||||
HAL_TIM_PWM_Start(pwm->htim, pwm->channel);
|
||||
__HAL_TIM_SetCompare(pwm->htim, pwm->channel, pwm->pulse);
|
||||
}
|
||||
|
||||
/* 只是对HAL的函数进行了形式上的封装 */
|
||||
@@ -61,19 +59,51 @@ void PWMStop(PWMInstance *pwm)
|
||||
HAL_TIM_PWM_Stop(pwm->htim, pwm->channel);
|
||||
}
|
||||
|
||||
/* 只是对HAL的函数进行了形式上的封装 */
|
||||
void PWMSetPulse(PWMInstance *pwm, uint32_t pulse)
|
||||
/*
|
||||
* @brief 设置pwm周期
|
||||
*
|
||||
* @param pwm pwm实例
|
||||
* @param period 周期 单位 s
|
||||
*/
|
||||
void PWMSetPeriod(PWMInstance *pwm, float period)
|
||||
{
|
||||
pwm->pulse = pulse;
|
||||
__HAL_TIM_SetCompare(pwm->htim, pwm->channel, pwm->pulse);
|
||||
__HAL_TIM_SetAutoreload(pwm->htim, period*((pwm->tclk)/(pwm->htim->Init.Prescaler+1)));
|
||||
}
|
||||
void PWMSetPeriod(PWMInstance *pwm, uint32_t period)
|
||||
/*
|
||||
* @brief 设置pwm占空比
|
||||
*
|
||||
* @param pwm pwm实例
|
||||
* @param dutyratio 占空比 0~1
|
||||
*/
|
||||
void PWMSetDutyRatio(PWMInstance *pwm, float dutyratio)
|
||||
{
|
||||
pwm->period = period;
|
||||
__HAL_TIM_PRESCALER(pwm->htim, pwm->period);
|
||||
__HAL_TIM_SetCompare(pwm->htim, pwm->channel, dutyratio * (pwm->htim->Instance->ARR));
|
||||
}
|
||||
|
||||
/* 只是对HAL的函数进行了形式上的封装 */
|
||||
void PWMStartDMA(PWMInstance *pwm, uint32_t *pData, uint32_t Size)
|
||||
{
|
||||
HAL_TIM_PWM_Start_DMA(pwm->htim, pwm->channel, pData, Size);
|
||||
}
|
||||
|
||||
// 设置pwm对应定时器时钟源频率
|
||||
//tim2~7,12~14:APB1 tim1,8~11:APB2
|
||||
static uint32_t PWMSelectTclk(TIM_HandleTypeDef *htim )
|
||||
{
|
||||
uintptr_t tclk_temp = ((uintptr_t)((htim)->Instance));
|
||||
if (
|
||||
(tclk_temp <= (APB1PERIPH_BASE + 0x2000UL)) &&
|
||||
(tclk_temp >= (APB1PERIPH_BASE + 0x0000UL)))
|
||||
{
|
||||
return (HAL_RCC_GetPCLK1Freq() * (APBPrescTable[(RCC->CFGR & RCC_CFGR_PPRE1)>> RCC_CFGR_PPRE1_Pos] == 0 ? 1 : 2));
|
||||
}
|
||||
else if (
|
||||
((tclk_temp <= (APB2PERIPH_BASE + 0x0400UL)) &&
|
||||
(tclk_temp >= (APB2PERIPH_BASE + 0x0000UL))) ||
|
||||
((tclk_temp <= (APB2PERIPH_BASE + 0x4800UL)) &&
|
||||
(tclk_temp >= (APB2PERIPH_BASE + 0x4000UL))))
|
||||
{
|
||||
return (HAL_RCC_GetPCLK2Freq() * (APBPrescTable[(RCC->CFGR & RCC_CFGR_PPRE1)>> RCC_CFGR_PPRE1_Pos] == 0 ? 1 : 2));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -4,7 +4,6 @@
|
||||
* @brief
|
||||
* @version 0.1
|
||||
* @date 2023-02-14
|
||||
* @todo 目前的实现有比较大的问题,是否允许module修改tim的分频器和自动重装载寄存器?
|
||||
*
|
||||
* @copyright Copyright (c) 2023
|
||||
*
|
||||
@@ -15,7 +14,8 @@
|
||||
|
||||
#include "tim.h"
|
||||
#include "stdint.h"
|
||||
|
||||
#include "stm32f4xx_hal_rcc.h"
|
||||
#include "stm32f407xx.h"
|
||||
#define PWM_DEVICE_CNT 16 // 最大支持的PWM实例数量
|
||||
|
||||
/* pwm实例结构体 */
|
||||
@@ -23,21 +23,19 @@ typedef struct pwm_ins_temp
|
||||
{
|
||||
TIM_HandleTypeDef *htim; // TIM句柄
|
||||
uint32_t channel; // 通道
|
||||
uint32_t period; // 周期
|
||||
uint32_t pulse; // 脉宽
|
||||
uint32_t tclk; // 时钟频率
|
||||
float period; // 周期
|
||||
float dutyratio; // 占空比
|
||||
void (*callback)(struct pwm_ins_temp *); // DMA传输完成回调函数
|
||||
void *id; // 实例ID
|
||||
|
||||
// 后续还要添加更多的参数,以提供更直观的封装,比如直接按照百分比设置占空比,直接设置频率等
|
||||
// ...
|
||||
} PWMInstance;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
TIM_HandleTypeDef *htim; // TIM句柄
|
||||
uint32_t channel; // 通道
|
||||
uint32_t period; // 周期
|
||||
uint32_t pulse; // 脉宽
|
||||
float period; // 周期
|
||||
float dutyratio; // 占空比
|
||||
void (*callback)(PWMInstance*); // DMA传输完成回调函数
|
||||
void *id; // 实例ID
|
||||
} PWM_Init_Config_s;
|
||||
@@ -56,7 +54,14 @@ PWMInstance *PWMRegister(PWM_Init_Config_s *config);
|
||||
* @param pwm pwm实例
|
||||
*/
|
||||
void PWMStart(PWMInstance *pwm);
|
||||
/**
|
||||
* @brief 设置pwm占空比
|
||||
*
|
||||
* @param pwm pwm实例
|
||||
* @param dutyratio 占空比 0~1
|
||||
*/
|
||||
|
||||
void PWMSetDutyRatio(PWMInstance *pwm, float dutyratio);
|
||||
/**
|
||||
* @brief 停止pwm
|
||||
*
|
||||
@@ -64,17 +69,13 @@ void PWMStart(PWMInstance *pwm);
|
||||
*/
|
||||
void PWMStop(PWMInstance *pwm);
|
||||
|
||||
|
||||
// @todo 这三个函数还需要进一步封装,务必协调好三者之间的关系
|
||||
/**
|
||||
* @brief 设置pwm脉宽
|
||||
* @brief 设置pwm周期
|
||||
*
|
||||
* @param pwm pwm实例
|
||||
* @param pulse 脉宽
|
||||
* @param period 周期 单位 s
|
||||
*/
|
||||
void PWMSetPulse(PWMInstance *pwm, uint32_t pulse);
|
||||
void PWMSetPeriod(PWMInstance *pwm, uint32_t period); // 未实现
|
||||
void PWMSetPrescaler(PWMInstance *pwm, uint32_t prescaler); // 未实现
|
||||
void PWMSetPeriod(PWMInstance *pwm, float period);
|
||||
|
||||
/**
|
||||
* @brief 启动pwm dma传输
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# bsp pwm
|
||||
|
||||
当前模块的实现有较大问题,是否应该允许多个使用相同tim的channel修改预分频计数器和重装载计数器?
|
||||
|
||||
以及,是否给用户权限修改脉宽?
|
||||
同一定时器下的pwm通道更改周期时请注意该定时器下是否有其他pwm示例,如果有请注意不要影响其他pwm通道的周期。
|
||||
使用pwm dma传输中断时注意占空比的设置,设为0将不会进入中断函数
|
||||
默认tim psc已在cubemx设置好,详情可参考cubemx配置文件
|
||||
|
||||
Reference in New Issue
Block a user