jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Indentation and style fix.

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2015-02-05 19:13:49 -08:00
parent d7c83348c0
commit 98855af279
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/stm32/common/timer_common_all.c
View File

@ -50,8 +50,8 @@ to alternate function push-pull outputs where the PWM output will appear.
@code @code
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_TIM1); rcc_periph_clock_enable(RCC_TIM1);
gpio_set_output_options(GPIOA, GPIO_OTYPE_PP, gpio_set_output_options(GPIOA, GPIO_OTYPE_PP,
GPIO_OSPEED_50MHZ, GPIO8 | GPIO9); GPIO_OSPEED_50MHZ, GPIO8 | GPIO9);
rcc_periph_clock_enable(RCC_TIM1); rcc_periph_clock_enable(RCC_TIM1);
timer_reset(TIM1); timer_reset(TIM1);
timer_set_mode(TIM1, TIM_CR1_CKD_CK_INT, TIM_CR1_CMS_CENTER_1, timer_set_mode(TIM1, TIM_CR1_CKD_CK_INT, TIM_CR1_CMS_CENTER_1,
@ -69,12 +69,12 @@ knob.
@code @code
rcc_periph_clock_enable(RCC_TIM3); rcc_periph_clock_enable(RCC_TIM3);
timer_set_period(TIM3, 1024); timer_set_period(TIM3, 1024);
timer_slave_set_mode(TIM3, 0x3); // encoder timer_slave_set_mode(TIM3, 0x3); // encoder
timer_ic_set_input(TIM3, TIM_IC1, TIM_IC_IN_TI1); timer_ic_set_input(TIM3, TIM_IC1, TIM_IC_IN_TI1);
timer_ic_set_input(TIM3, TIM_IC2, TIM_IC_IN_TI2); timer_ic_set_input(TIM3, TIM_IC2, TIM_IC_IN_TI2);
timer_enable_counter(TIM3); timer_enable_counter(TIM3);
... ...
int motor_pos = timer_get_count(TIM3); int motor_pos = timer_get_count(TIM3);
@endcode @endcode
@todo input capture example @todo input capture example