setting sampling rate from T1 working - finally.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1321 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/stm32/src/stm32f4_adc.c b/codec2-dev/stm32/src/stm32f4_adc.c
index fcce409dd65f1390d3f807707e902f6d07647016..6bc93b587689cea4da9d71e64b513cc94ca652aa 100644 (file)
--- 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;