libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[bsp][stm32][driver][drv_pulse_encoder.c] code style

Browse Source
This commit is contained in:
tangweikang 2019-09-24 13:36:09 +08:00
parent f1fe6479b1
commit c11686751e
2 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp/stm32/libraries/HAL_Drivers/config/f1/pulse_encoder_config.h
View File

@ -22,6 +22,7 @@ extern "C" {
#define PULSE_ENCODER1_CONFIG \ #define PULSE_ENCODER1_CONFIG \
{ \ { \
.tim_handler.Instance = TIM1, \ .tim_handler.Instance = TIM1, \
.encoder_irqn = TIM1_UP_IRQn, \
.name = "pulse1" \ .name = "pulse1" \
} }
#endif /* PULSE_ENCODER1_CONFIG */ #endif /* PULSE_ENCODER1_CONFIG */
@ -32,6 +33,7 @@ extern "C" {
#define PULSE_ENCODER2_CONFIG \ #define PULSE_ENCODER2_CONFIG \
{ \ { \
.tim_handler.Instance = TIM2, \ .tim_handler.Instance = TIM2, \
.encoder_irqn = TIM2_IRQn, \
.name = "pulse2" \ .name = "pulse2" \
} }
#endif /* PULSE_ENCODER2_CONFIG */ #endif /* PULSE_ENCODER2_CONFIG */
@ -42,6 +44,7 @@ extern "C" {
#define PULSE_ENCODER3_CONFIG \ #define PULSE_ENCODER3_CONFIG \
{ \ { \
.tim_handler.Instance = TIM3, \ .tim_handler.Instance = TIM3, \
.encoder_irqn = TIM3_IRQn, \
.name = "pulse3" \ .name = "pulse3" \
} }
#endif /* PULSE_ENCODER3_CONFIG */ #endif /* PULSE_ENCODER3_CONFIG */
@ -52,6 +55,7 @@ extern "C" {
#define PULSE_ENCODER4_CONFIG \ #define PULSE_ENCODER4_CONFIG \
{ \ { \
.tim_handler.Instance = TIM4, \ .tim_handler.Instance = TIM4, \
.encoder_irqn = TIM4_IRQn, \
.name = "pulse4" \ .name = "pulse4" \
} }
#endif /* PULSE_ENCODER4_CONFIG */ #endif /* PULSE_ENCODER4_CONFIG */

16
bsp/stm32/libraries/HAL_Drivers/drv_pulse_encoder.c
View File

@ -51,7 +51,7 @@ struct stm32_pulse_encoder_device
struct rt_pulse_encoder_device pulse_encoder; struct rt_pulse_encoder_device pulse_encoder;
TIM_HandleTypeDef tim_handler; TIM_HandleTypeDef tim_handler;
IRQn_Type encoder_irqn; IRQn_Type encoder_irqn;
volatile rt_int32_t over_under_flowcount; rt_int32_t over_under_flowcount;
char *name; char *name;
}; };
@ -82,7 +82,7 @@ rt_err_t pulse_encoder_init(struct rt_pulse_encoder_device *pulse_encoder)
TIM_Encoder_InitTypeDef sConfig; TIM_Encoder_InitTypeDef sConfig;
TIM_MasterConfigTypeDef sMasterConfig; TIM_MasterConfigTypeDef sMasterConfig;
struct stm32_pulse_encoder_device *stm32_device; struct stm32_pulse_encoder_device *stm32_device;
stm32_device = rt_container_of(pulse_encoder, struct stm32_pulse_encoder_device, pulse_encoder); stm32_device = (struct stm32_pulse_encoder_device*)pulse_encoder;
stm32_device->tim_handler.Init.Prescaler = 0; stm32_device->tim_handler.Init.Prescaler = 0;
stm32_device->tim_handler.Init.CounterMode = TIM_COUNTERMODE_UP; stm32_device->tim_handler.Init.CounterMode = TIM_COUNTERMODE_UP;
@ -133,7 +133,7 @@ rt_err_t pulse_encoder_init(struct rt_pulse_encoder_device *pulse_encoder)
rt_err_t pulse_encoder_clear_count(struct rt_pulse_encoder_device *pulse_encoder) rt_err_t pulse_encoder_clear_count(struct rt_pulse_encoder_device *pulse_encoder)
{ {
struct stm32_pulse_encoder_device *stm32_device; struct stm32_pulse_encoder_device *stm32_device;
stm32_device = rt_container_of(pulse_encoder, struct stm32_pulse_encoder_device, pulse_encoder); stm32_device = (struct stm32_pulse_encoder_device*)pulse_encoder;
stm32_device->over_under_flowcount = 0; stm32_device->over_under_flowcount = 0;
__HAL_TIM_SET_COUNTER(&stm32_device->tim_handler, 0); __HAL_TIM_SET_COUNTER(&stm32_device->tim_handler, 0);
return RT_EOK; return RT_EOK;
@ -142,7 +142,7 @@ rt_err_t pulse_encoder_clear_count(struct rt_pulse_encoder_device *pulse_encoder
rt_int32_t pulse_encoder_get_count(struct rt_pulse_encoder_device *pulse_encoder) rt_int32_t pulse_encoder_get_count(struct rt_pulse_encoder_device *pulse_encoder)
{ {
struct stm32_pulse_encoder_device *stm32_device; struct stm32_pulse_encoder_device *stm32_device;
stm32_device = rt_container_of(pulse_encoder, struct stm32_pulse_encoder_device, pulse_encoder); stm32_device = (struct stm32_pulse_encoder_device*)pulse_encoder;
return (rt_int32_t)((rt_int16_t)__HAL_TIM_GET_COUNTER(&stm32_device->tim_handler) + stm32_device->over_under_flowcount * AUTO_RELOAD_VALUE); return (rt_int32_t)((rt_int16_t)__HAL_TIM_GET_COUNTER(&stm32_device->tim_handler) + stm32_device->over_under_flowcount * AUTO_RELOAD_VALUE);
} }
@ -150,7 +150,7 @@ rt_err_t pulse_encoder_control(struct rt_pulse_encoder_device *pulse_encoder, rt
{ {
rt_err_t result; rt_err_t result;
struct stm32_pulse_encoder_device *stm32_device; struct stm32_pulse_encoder_device *stm32_device;
stm32_device = rt_container_of(pulse_encoder, struct stm32_pulse_encoder_device, pulse_encoder); stm32_device = (struct stm32_pulse_encoder_device*)pulse_encoder;
result = RT_EOK; result = RT_EOK;
@ -225,7 +225,13 @@ void pulse_encoder_update_isr(struct stm32_pulse_encoder_device *device)
} }
#ifdef BSP_USING_PULSE_ENCODER1 #ifdef BSP_USING_PULSE_ENCODER1
#if defined(SOC_SERIES_STM32F4)
void TIM1_UP_TIM10_IRQHandler(void) void TIM1_UP_TIM10_IRQHandler(void)
#elif defined(SOC_SERIES_STM32F1)
void TIM1_UP_IRQHandler(void)
#else
#error "Please check TIM1's IRQHandler"
#endif
{ {
/* enter interrupt */ /* enter interrupt */
rt_interrupt_enter(); rt_interrupt_enter();