EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timer_reset -> rcc_periph_reset_pulse() replace

Browse Source 
timer_reset wasn't fully implemented for all timers on all series, and
was simply a wrapper of the RST bits in the RCC registers anyway.

First part of https://github.com/libopencm3/libopencm3/issues/709
This commit is contained in:
Karl Palsson
2016-12-14 15:15:17 +00:00
committed by Karl Palsson
parent 833da68c18
commit 1260b16772
11 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
View File

@@ -70,7 +70,7 @@ static void timer_setup(void)
rcc_periph_clock_enable(RCC_TIM2); rcc_periph_clock_enable(RCC_TIM2);
/* Time Base configuration */ /* Time Base configuration */
timer_reset(timer); rcc_periph_reset_pulse(RST_TIM2);
timer_set_mode(timer, TIM_CR1_CKD_CK_INT, timer_set_mode(timer, TIM_CR1_CKD_CK_INT,
TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP); TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
timer_set_period(timer, 0xFF); timer_set_period(timer, 0xFF);

2
examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
View File

@@ -73,7 +73,7 @@ static void timer_setup(void)
rcc_periph_clock_enable(RCC_TIM2); rcc_periph_clock_enable(RCC_TIM2);
/* Time Base configuration */ /* Time Base configuration */
timer_reset(timer); rcc_periph_reset_pulse(RST_TIM2);
timer_set_mode(timer, TIM_CR1_CKD_CK_INT, timer_set_mode(timer, TIM_CR1_CKD_CK_INT,
TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP); TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
timer_set_period(timer, 0xFF); timer_set_period(timer, 0xFF);

2
examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
View File

@@ -81,7 +81,7 @@ static void timer_setup(void)
rcc_periph_clock_enable(RCC_TIM2); rcc_periph_clock_enable(RCC_TIM2);
/* Time Base configuration */ /* Time Base configuration */
timer_reset(timer); rcc_periph_reset_pulse(RST_TIM2);
timer_set_mode(timer, TIM_CR1_CKD_CK_INT, timer_set_mode(timer, TIM_CR1_CKD_CK_INT,
TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP); TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
timer_set_period(timer, 0xFF); timer_set_period(timer, 0xFF);

2
examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
View File

@@ -110,7 +110,7 @@ static void tim_setup(void)
nvic_enable_irq(NVIC_TIM1_TRG_COM_IRQ); nvic_enable_irq(NVIC_TIM1_TRG_COM_IRQ);
/* Reset TIM1 peripheral. */ /* Reset TIM1 peripheral. */
timer_reset(TIM1); rcc_periph_reset_pulse(RST_TIM1);
/* Timer global mode: /* Timer global mode:
* - No divider * - No divider

2
examples/stm32/f1/stm32-h103/timer/timer.c
View File

@@ -77,7 +77,7 @@ static void tim_setup(void)
nvic_enable_irq(NVIC_TIM2_IRQ); nvic_enable_irq(NVIC_TIM2_IRQ);
/* Reset TIM2 peripheral. */ /* Reset TIM2 peripheral. */
timer_reset(TIM2); rcc_periph_reset_pulse(RST_TIM2);
/* Timer global mode: /* Timer global mode:
* - No divider * - No divider

2
examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c
View File

@@ -54,7 +54,7 @@ static void timer_setup(void)
{ {
/* Enable TIM2 clock. */ /* Enable TIM2 clock. */
rcc_periph_clock_enable(RCC_TIM2); rcc_periph_clock_enable(RCC_TIM2);
timer_reset(TIM2); rcc_periph_reset_pulse(RST_TIM2);
/* Timer global mode: - No divider, Alignment edge, Direction up */ /* Timer global mode: - No divider, Alignment edge, Direction up */
timer_set_mode(TIM2, TIM_CR1_CKD_CK_INT, timer_set_mode(TIM2, TIM_CR1_CKD_CK_INT,
TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP); TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);

2
examples/stm32/f4/stm32f4-discovery/timer/timer.c
View File

@@ -81,7 +81,7 @@ static void tim_setup(void)
nvic_enable_irq(NVIC_TIM2_IRQ); nvic_enable_irq(NVIC_TIM2_IRQ);
/* Reset TIM2 peripheral. */ /* Reset TIM2 peripheral. */
timer_reset(TIM2); rcc_periph_reset_pulse(RST_TIM2);
/* Timer global mode: /* Timer global mode:
* - No divider * - No divider

2
examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c
View File

@@ -55,7 +55,7 @@ static void timer_setup(void)
{ {
/* Enable TIM2 clock. */ /* Enable TIM2 clock. */
rcc_periph_clock_enable(RCC_TIM2); rcc_periph_clock_enable(RCC_TIM2);
timer_reset(TIM2); rcc_periph_reset_pulse(RST_TIM2);
/* Timer global mode: - No divider, Alignment edge, Direction up */ /* Timer global mode: - No divider, Alignment edge, Direction up */
timer_set_mode(TIM2, TIM_CR1_CKD_CK_INT, timer_set_mode(TIM2, TIM_CR1_CKD_CK_INT,
TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP); TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);

2
examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c
View File

@@ -131,7 +131,7 @@ int _write(int file, char *ptr, int len)
*/ */
static void setup_button_press_timer(void) static void setup_button_press_timer(void)
{ {
timer_reset(TIMER_BUTTON_PRESS); rcc_periph_reset_pulse(TIMER_BUTTON_PRESS_RST);
timer_set_prescaler(TIMER_BUTTON_PRESS, 3999); /* 4Mhz/1000hz - 1 */ timer_set_prescaler(TIMER_BUTTON_PRESS, 3999); /* 4Mhz/1000hz - 1 */
timer_set_period(TIMER_BUTTON_PRESS, 0xffff); timer_set_period(TIMER_BUTTON_PRESS, 0xffff);
timer_enable_counter(TIMER_BUTTON_PRESS); timer_enable_counter(TIMER_BUTTON_PRESS);

1
examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/syscfg.h
View File

@@ -44,6 +44,7 @@ extern "C" {
#define BUTTON_DISCO_USER_isr exti0_isr #define BUTTON_DISCO_USER_isr exti0_isr
#define BUTTON_DISCO_USER_NVIC NVIC_EXTI0_IRQ #define BUTTON_DISCO_USER_NVIC NVIC_EXTI0_IRQ
#define TIMER_BUTTON_PRESS TIM7 #define TIMER_BUTTON_PRESS TIM7
#define TIMER_BUTTON_PRESS_RST RST_TIM7
struct state_t { struct state_t {
bool falling; bool falling;

4
examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c
View File

@@ -137,7 +137,7 @@ void tim6_isr(void)
*/ */
static void setup_tim6(void) static void setup_tim6(void)
{ {
timer_reset(TIM6); rcc_periph_reset_pulse(RST_TIM6);
/* 24Mhz / 10khz -1. */ /* 24Mhz / 10khz -1. */
timer_set_prescaler(TIM6, 2399); /* 24Mhz/10000hz - 1 */ timer_set_prescaler(TIM6, 2399); /* 24Mhz/10000hz - 1 */
/* 10khz for 10 ticks = 1 khz overflow = 1ms overflow interrupts */ /* 10khz for 10 ticks = 1 khz overflow = 1ms overflow interrupts */
@@ -154,7 +154,7 @@ static void setup_tim6(void)
*/ */
static void setup_tim7(void) static void setup_tim7(void)
{ {
timer_reset(TIM7); rcc_periph_reset_pulse(RST_TIM7);
timer_set_prescaler(TIM7, 23999); /* 24Mhz/1000hz - 1 */ timer_set_prescaler(TIM7, 23999); /* 24Mhz/1000hz - 1 */
timer_set_period(TIM7, 0xffff); timer_set_period(TIM7, 0xffff);
timer_enable_counter(TIM7); timer_enable_counter(TIM7);