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

Add back timer_set_option for STM32F4, and document.

Browse Source
This commit is contained in:
Thomas Daede 2012-10-31 00:42:58 -05:00
parent a56764667c
commit 9468933735
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/stm32/timer.c
View File

@ -103,6 +103,7 @@ push-pull outputs where the PWM output will appear.
#elif defined(STM32F2) #elif defined(STM32F2)
# include <libopencm3/stm32/f2/rcc.h> # include <libopencm3/stm32/f2/rcc.h>
#elif defined(STM32F4) #elif defined(STM32F4)
# include <libopencm3/stm32/f4/timer.h>
# include <libopencm3/stm32/f4/rcc.h> # include <libopencm3/stm32/f4/rcc.h>
#else #else
# error "stm32 family not defined." # error "stm32 family not defined."
@ -1706,6 +1707,29 @@ u32 timer_get_counter(u32 timer_peripheral)
return TIM_CNT(timer_peripheral); return TIM_CNT(timer_peripheral);
} }
/*---------------------------------------------------------------------------*/
/** @brief Set Timer Option
Set timer options register on TIM2 or TIM5, used for oscillator calibration
on TIM5 and trigger remapping on TIM2. Only available on F4.
@param[in] timer_peripheral Unsigned int32. Timer register address base
@returns Unsigned int32. Option flags.
*/
#if (defined(STM32F4))
void timer_set_option(u32 timer_peripheral, u32 option)
{
if (timer_peripheral == TIM2) {
TIM_OR(timer_peripheral) &= ~TIM2_OR_ITR1_RMP_MASK;
TIM_OR(timer_peripheral) |= option;
} else if (timer_peripheral == TIM5) {
TIM_OR(timer_peripheral) &= ~TIM5_OR_TI4_RMP_MASK;
TIM_OR(timer_peripheral) |= option;
}
}
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Set Counter /** @brief Set Counter