riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[SQUASH] Remove unrelevant changes

Browse Source
This commit is contained in:
DipSwitch 2016-04-05 23:54:01 +02:00
parent a259cc42b0
commit 945f01f7e0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/nucleo-f103/include/board.h
View File

@ -35,9 +35,8 @@ extern "C" {
/** /**
* @name xtimer configuration * @name xtimer configuration
*/ */
#define XTIMER_MASK (0xffff0000) #define XTIMER_MASK (0xffff0000)
#define XTIMER_BACKOFF 5 #define XTIMER_BACKOFF 5
#define XTIMER_SHIFT_ON_COMPARE (1)
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus

2
cpu/stm32f1/periph/timer.c
View File

@ -56,7 +56,7 @@ int timer_init(tim_t tim, unsigned long freq, timer_cb_t cb, void *arg)
dev(tim)->CR2 = 0; dev(tim)->CR2 = 0;
dev(tim)->ARR = TIMER_MAXVAL; dev(tim)->ARR = TIMER_MAXVAL;
/* set prescaler */ /* set prescaler */
dev(tim)->PSC = (((CLOCK_CORECLOCK) / freq) - 1); dev(tim)->PSC = ((CLOCK_CORECLOCK / freq) - 1);
/* generate an update event to apply our configuration */ /* generate an update event to apply our configuration */
dev(tim)->EGR = TIM_EGR_UG; dev(tim)->EGR = TIM_EGR_UG;