X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_adc_stm.c;h=d758e629bac7461eae6ed52097f19e6d78afb620;hb=98aa481741b8fbc617545beda3d295b53de90716;hp=1722a9ecdf0698e555969891867f468ea8bf5451;hpb=0bce68e6a0abc19f49c573331164d13643c9bee5;p=fw%2Faltos

diff --git a/src/stm/ao_adc_stm.c b/src/stm/ao_adc_stm.c
index 1722a9ec..d758e629 100644
--- a/src/stm/ao_adc_stm.c
+++ b/src/stm/ao_adc_stm.c
@@ -28,11 +28,11 @@ static uint8_t			ao_adc_ready;
 				 (0 << STM_ADC_CR2_JWSTART) |		\
 				 (STM_ADC_CR2_JEXTEN_DISABLE << STM_ADC_CR2_JEXTEN) | \
 				 (0 << STM_ADC_CR2_JEXTSEL) |		\
-				 (1 << STM_ADC_CR2_ALIGN) |		\
+				 (0 << STM_ADC_CR2_ALIGN) |		\
 				 (0 << STM_ADC_CR2_EOCS) |		\
 				 (1 << STM_ADC_CR2_DDS) |		\
 				 (1 << STM_ADC_CR2_DMA) |		\
-				 (STM_ADC_CR2_DELS_NONE << STM_ADC_CR2_DELS) | \
+				 (STM_ADC_CR2_DELS_UNTIL_READ << STM_ADC_CR2_DELS) | \
 				 (0 << STM_ADC_CR2_CONT) |		\
 				 (1 << STM_ADC_CR2_ADON))
 
@@ -168,10 +168,10 @@ ao_adc_init(void)
 		       (0 << STM_ADC_CR1_EOCIE ) |
 		       (0 << STM_ADC_CR1_AWDCH ));
 
-	/* 4 cycle sample time for everyone */
-	stm_adc.smpr1 = 0;
-	stm_adc.smpr2 = 0;
-	stm_adc.smpr3 = 0;
+	/* 384 cycle sample time for everyone */
+	stm_adc.smpr1 = 0x3ffff;
+	stm_adc.smpr2 = 0x3fffffff;
+	stm_adc.smpr3 = 0x3fffffff;
 
 	stm_adc.sqr1 = ((AO_NUM_ADC - 1) << 20);
 	stm_adc.sqr2 = 0;