From 7f6a1af41653be63b3ac27a9c9813f426c8c949b Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 17 Jun 2013 20:53:50 +0000 Subject: [PATCH] setting sampling rate from T1 working - finally. git-svn-id: https://svn.code.sf.net/p/freetel/code@1321 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/stm32/src/stm32f4_adc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/codec2-dev/stm32/src/stm32f4_adc.c b/codec2-dev/stm32/src/stm32f4_adc.c index fcce409d..6bc93b58 100644 --- a/codec2-dev/stm32/src/stm32f4_adc.c +++ b/codec2-dev/stm32/src/stm32f4_adc.c @@ -164,6 +164,7 @@ void Timer1Config() { RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE); /* Time Base configuration */ + TIM_DeInit(TIM1); TIM_TimeBaseStructure.TIM_Prescaler = 0; TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up; TIM_TimeBaseStructure.TIM_Period = uhTimerPeriod; @@ -222,6 +223,7 @@ void adc_configure(){ ADC_init_structure.ADC_DataAlign = ADC_DataAlign_Right; ADC_init_structure.ADC_Resolution = ADC_Resolution_12b; +#define TMR1_SAMPLING #ifdef TMR1_SAMPLING ADC_init_structure.ADC_ContinuousConvMode = DISABLE; #else @@ -229,7 +231,7 @@ void adc_configure(){ #endif #ifdef TMR1_SAMPLING - ADC_init_structure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_CC1; + ADC_init_structure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_CC3; ADC_init_structure.ADC_ExternalTrigConvEdge = ADC_ExternalTrigConvEdge_Rising; #else ADC_init_structure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_CC1; -- 2.25.1