From: Keith Packard <keithp@keithp.com>
Date: Sun, 8 Apr 2012 03:33:27 +0000 (-0700)
Subject: altos: Use 384 cycle ADC sample time
X-Git-Tag: 1.0.9.5~67
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=98aa481741b8fbc617545beda3d295b53de90716

altos: Use 384 cycle ADC sample time

This is plenty fast, and provides nice stable readings.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

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;