1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #6256 from haukepetersen/fix_stm32f1_timerconfigs

boards/stm32f1-based: fixed timer configuration
This commit is contained in:
Peter Kietzmann 2017-01-10 09:27:59 +01:00 committed by GitHub
commit d21ede60ce
2 changed files with 9 additions and 5 deletions

View File

@ -61,12 +61,17 @@ extern "C" {
* @{
*/
static const timer_conf_t timer_config[] = {
/* device, RCC bit, IRQ bit */
{TIM5, 3, TIM5_IRQn},
{
.dev = TIM5,
.max = 0x0000ffff,
.rcc_mask = RCC_APB1ENR_TIM5EN,
.bus = APB1,
.irqn = TIM5_IRQn
}
};
/* interrupt routines */
#define TIMER_0_ISR (isr_tim5)
/* number of defined timers */
#define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0]))
/** @} */

View File

@ -76,7 +76,6 @@ static const timer_conf_t timer_config[] = {
{
.dev = TIM3,
.max = 0x0000ffff,
.rcc_mask = RCC_APB1ENR_TIM3EN,
.bus = APB1,
.irqn = TIM3_IRQn