kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

[SQUASH] Tested HSI

Browse Source
This commit is contained in:
DipSwitch 2016-04-05 23:38:32 +02:00
parent 50fda7e07f
commit edae42281b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/nucleo-f103/dist/openocd.cfg vendored
View File

@ -1 +1,2 @@
#source [find board/st_nucleo_f1.cfg]
source [find board/st_nucleo_f103rb.cfg]

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

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

8
boards/nucleo-f103/include/periph_conf.h
View File

@ -29,12 +29,12 @@ extern "C" {
* @name Clock system configuration
* @{
*/
#define CLOCK_HSI (8000000U) /* external oscillator */
#define CLOCK_CORECLOCK (64000000U) /* desired core clock frequency */
#define CLOCK_HSE (8000000U) /* external oscillator */
#define CLOCK_CORECLOCK (72000000U) /* desired core clock frequency */
/* the actual PLL values are automatically generated */
#define CLOCK_PLL_DIV (0)
#define CLOCK_PLL_MUL (16)
#define CLOCK_PLL_MUL (9)
/* AHB, APB1, APB2 dividers */
#define CLOCK_AHB_DIV RCC_CFGR_HPRE_DIV1
@ -44,8 +44,6 @@ extern "C" {
/* resulting bus clocks */
#define CLOCK_APB1 (CLOCK_CORECLOCK / 2)
#define CLOCK_APB2 (CLOCK_CORECLOCK)
#define CLOCK_APB1_TIMERS ((CLOCK_APB1_DIV > 0) ? (CLOCK_APB1 << 1) : (CLOCK_APB1))
#define CLOCK_APB2_TIMERS ((CLOCK_APB2_DIV > 0) ? (CLOCK_APB2 << 1) : (CLOCK_APB2))
/* Flash latency */
#define CLOCK_FLASH_LATENCY FLASH_ACR_LATENCY_2 /* for >= 72 MHz */

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)->ARR = TIMER_MAXVAL;
/* set prescaler */
dev(tim)->PSC = ((((timer_config[tim].bus == APB1) ? CLOCK_APB1_TIMERS : CLOCK_APB2_TIMERS) / freq) - 1);
dev(tim)->PSC = (((CLOCK_CORECLOCK) / freq) - 1);
/* generate an update event to apply our configuration */
dev(tim)->EGR = TIM_EGR_UG;