X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm32f1%2Fao_adc_single_stm.c;h=feaba42d42a56222ca507131daf432331378e8de;hb=abfa580ad700415f5ea240450a1621f9de35de82;hp=ac0342b51402acb005eb46f2261ad8505e3916b1;hpb=37de458faea5f67870b80e3549e37130bf43b11b;p=fw%2Faltos

diff --git a/src/stm32f1/ao_adc_single_stm.c b/src/stm32f1/ao_adc_single_stm.c
index ac0342b5..feaba42d 100644
--- a/src/stm32f1/ao_adc_single_stm.c
+++ b/src/stm32f1/ao_adc_single_stm.c
@@ -22,12 +22,12 @@
 
 static uint8_t			ao_adc_ready;
 
-#define AO_ADC_CR2_VAL		((HAS_ADC_TEMP << STM_ADC_CR2_TSVREF) | \
-				 (0 << STM_ADC_CR2_SWSTART) |		\
+#define AO_ADC_CR2_VAL(start)	((HAS_ADC_TEMP << STM_ADC_CR2_TSVREFE) |\
+				 ((start) << STM_ADC_CR2_SWSTART) |	\
 				 (0 << STM_ADC_CR2_JWSTART) |		\
 				 (0 << STM_ADC_CR2_EXTTRIG) |		\
-				 (0 << STM_ADC_CR2_EXTSEL) |		\
-				 (0 << STM_ADC_CR2_JEXTTRIG) | \
+				 (STM_ADC_CR2_EXTSEL_SWSTART << STM_ADC_CR2_EXTSEL) | \
+				 (0 << STM_ADC_CR2_JEXTTRIG) |		\
 				 (0 << STM_ADC_CR2_JEXTSEL) |		\
 				 (0 << STM_ADC_CR2_ALIGN) |		\
 				 (1 << STM_ADC_CR2_DMA) |		\
@@ -44,6 +44,8 @@ static void ao_adc_done(int index)
 	(void) index;
 	ao_dma_done_transfer(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC1));
 	ao_adc_ready = 1;
+	/* Turn the ADC back off */
+	stm_adc1.cr2 = 0;
 	ao_wakeup((void *) &ao_adc_ready);
 }
 
@@ -54,9 +56,9 @@ static void
 ao_adc_poll(struct ao_adc *packet)
 {
 	ao_adc_ready = 0;
-	stm_adc.sr = 0;
+	stm_adc1.sr = 0;
 	ao_dma_set_transfer(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC1),
-			    &stm_adc.dr,
+			    &stm_adc1.dr,
 			    (void *) packet,
 			    AO_NUM_ADC,
 			    (0 << STM_DMA_CCR_MEM2MEM) |
@@ -70,7 +72,11 @@ ao_adc_poll(struct ao_adc *packet)
 	ao_dma_set_isr(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC1), ao_adc_done);
 	ao_dma_start(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC1));
 
-	stm_adc.cr2 = AO_ADC_CR2_VAL | (1 << STM_ADC_CR2_SWSTART);
+	stm_adc1.cr2 = AO_ADC_CR2_VAL(0);
+	ao_delay(AO_MS_TO_TICKS(10));
+	stm_adc1.cr2 = AO_ADC_CR2_VAL(0);
+	ao_delay(AO_MS_TO_TICKS(10));
+	stm_adc1.cr2 = AO_ADC_CR2_VAL(1);
 }
 
 /*
@@ -190,9 +196,9 @@ ao_adc_single_init(void)
 	stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_ADC1EN);
 
 	/* Turn off ADC during configuration */
-	stm_adc.cr2 = 0;
+	stm_adc1.cr2 = 0;
 
-	stm_adc.cr1 = ((0 << STM_ADC_CR1_AWDEN ) |
+	stm_adc1.cr1 = ((0 << STM_ADC_CR1_AWDEN ) |
 		       (0 << STM_ADC_CR1_JAWDEN ) |
 		       (STM_ADC_CR1_DUALMOD_INDEPENDENT << STM_ADC_CR1_DUALMOD ) |
 		       (0 << STM_ADC_CR1_DISCNUM ) |
@@ -207,71 +213,64 @@ ao_adc_single_init(void)
 		       (0 << STM_ADC_CR1_AWDCH ));
 
 	/* 384 cycle sample time for everyone */
-	stm_adc.smpr1 = 0x3ffff;
-	stm_adc.smpr2 = 0x3fffffff;
+	stm_adc1.smpr1 = 0x00ffffff;
+	stm_adc1.smpr2 = 0x3fffffff;
 
-	stm_adc.sqr1 = ((AO_NUM_ADC - 1) << 20);
+	stm_adc1.sqr1 = ((AO_NUM_ADC - 1) << 20);
 #if AO_NUM_ADC > 0
-	stm_adc.sqr3 |= (AO_ADC_SQ1 << 0);
+	stm_adc1.sqr3 |= (AO_ADC_SQ1 << 0);
 #endif
 #if AO_NUM_ADC > 1
-	stm_adc.sqr3 |= (AO_ADC_SQ2 << 5);
+	stm_adc1.sqr3 |= (AO_ADC_SQ2 << 5);
 #endif
 #if AO_NUM_ADC > 2
-	stm_adc.sqr3 |= (AO_ADC_SQ3 << 10);
+	stm_adc1.sqr3 |= (AO_ADC_SQ3 << 10);
 #endif
 #if AO_NUM_ADC > 3
-	stm_adc.sqr3 |= (AO_ADC_SQ4 << 15);
+	stm_adc1.sqr3 |= (AO_ADC_SQ4 << 15);
 #endif
 #if AO_NUM_ADC > 4
-	stm_adc.sqr3 |= (AO_ADC_SQ5 << 20);
+	stm_adc1.sqr3 |= (AO_ADC_SQ5 << 20);
 #endif
 #if AO_NUM_ADC > 5
-	stm_adc.sqr3 |= (AO_ADC_SQ6 << 25);
+	stm_adc1.sqr3 |= (AO_ADC_SQ6 << 25);
 #endif
 #if AO_NUM_ADC > 6
-	stm_adc.sqr2 |= (AO_ADC_SQ7 << 0);
+	stm_adc1.sqr2 |= (AO_ADC_SQ7 << 0);
 #endif
 #if AO_NUM_ADC > 7
-	stm_adc.sqr2 |= (AO_ADC_SQ8 << 5);
+	stm_adc1.sqr2 |= (AO_ADC_SQ8 << 5);
 #endif
 #if AO_NUM_ADC > 8
-	stm_adc.sqr2 |= (AO_ADC_SQ9 << 10);
+	stm_adc1.sqr2 |= (AO_ADC_SQ9 << 10);
 #endif
 #if AO_NUM_ADC > 9
-	stm_adc.sqr2 |= (AO_ADC_SQ10 << 15);
+	stm_adc1.sqr2 |= (AO_ADC_SQ10 << 15);
 #endif
 #if AO_NUM_ADC > 10
-	stm_adc.sqr2 |= (AO_ADC_SQ11 << 20);
+	stm_adc1.sqr2 |= (AO_ADC_SQ11 << 20);
 #endif
 #if AO_NUM_ADC > 11
-	stm_adc.sqr2 |= (AO_ADC_SQ12 << 25);
+	stm_adc1.sqr2 |= (AO_ADC_SQ12 << 25);
 #endif
 #if AO_NUM_ADC > 12
-	stm_adc.sqr1 |= (AO_ADC_SQ13 << 0);
+	stm_adc1.sqr1 |= (AO_ADC_SQ13 << 0);
 #endif
 #if AO_NUM_ADC > 13
-	stm_adc.sqr1 |= (AO_ADC_SQ14 << 5);
+	stm_adc1.sqr1 |= (AO_ADC_SQ14 << 5);
 #endif
 #if AO_NUM_ADC > 14
-	stm_adc.sqr1 |= (AO_ADC_SQ15 << 10);
+	stm_adc1.sqr1 |= (AO_ADC_SQ15 << 10);
 #endif
 #if AO_NUM_ADC > 15
-	stm_adc.sqr1 |= (AO_ADC_SQ16 << 15);
+	stm_adc1.sqr1 |= (AO_ADC_SQ16 << 15);
 #endif
 #if AO_NUM_ADC > 15
 #error "too many ADC channels"
 #endif
 
-#ifndef HAS_ADC_TEMP
-#error Please define HAS_ADC_TEMP
-#endif
-#if HAS_ADC_TEMP
-	stm_adc.cr2 |= ((1 << STM_ADC_CR2_TSVREFE));
-#endif
-
 	/* Clear any stale status bits */
-	stm_adc.sr = 0;
+	stm_adc1.sr = 0;
 
 	ao_dma_alloc(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC1));