diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-11-16 18:58:09 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-11-16 18:58:09 +0000 |
| commit | 759a95a23a2e41651f46d25dfdface09525760d1 (patch) | |
| tree | e88e42c816c5d17da7773ae168cf83e155efcfc2 /testhal | |
| parent | cef04f5f4b8ea66ad3ab5a628a4aad8da509039e (diff) | |
| download | ChibiOS-759a95a23a2e41651f46d25dfdface09525760d1.tar.gz ChibiOS-759a95a23a2e41651f46d25dfdface09525760d1.tar.bz2 ChibiOS-759a95a23a2e41651f46d25dfdface09525760d1.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3501 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal')
| -rw-r--r-- | testhal/STM32F1xx/ADC/main.c | 9 | ||||
| -rw-r--r-- | testhal/STM32F4xx/ADC/main.c | 2 | ||||
| -rw-r--r-- | testhal/STM32L1xx/ADC/main.c | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/testhal/STM32F1xx/ADC/main.c b/testhal/STM32F1xx/ADC/main.c index 9cc316fa8..bfe8997f9 100644 --- a/testhal/STM32F1xx/ADC/main.c +++ b/testhal/STM32F1xx/ADC/main.c @@ -53,8 +53,8 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) { /*
* ADC conversion group.
- * Mode: Linear buffer, 16 samples of 8 channels, SW triggered.
- * Channels: IN10, IN11, IN10, IN11, IN10, IN11, Sensor, VRef.
+ * Mode: Linear buffer, 8 samples of 1 channel, SW triggered.
+ * Channels: IN10.
*/
static const ADCConversionGroup adcgrpcfg1 = {
FALSE,
@@ -80,9 +80,8 @@ static const ADCConversionGroup adcgrpcfg2 = { adccallback,
adcerrorcallback,
0, ADC_CR2_TSVREFE, /* CR1, CR2 */
- ADC_SMPR1_SMP_AN10(ADC_SAMPLE_41P5) |
- ADC_SMPR1_SMP_SENSOR(ADC_SAMPLE_239P5) |
- ADC_SMPR1_SMP_VREF(ADC_SAMPLE_239P5),
+ ADC_SMPR1_SMP_AN11(ADC_SAMPLE_41P5) | ADC_SMPR1_SMP_AN10(ADC_SAMPLE_41P5) |
+ ADC_SMPR1_SMP_SENSOR(ADC_SAMPLE_239P5) | ADC_SMPR1_SMP_VREF(ADC_SAMPLE_239P5),
0, /* SMPR2 */
ADC_SQR1_NUM_CH(ADC_GRP2_NUM_CHANNELS),
ADC_SQR2_SQ8_N(ADC_CHANNEL_SENSOR) | ADC_SQR2_SQ7_N(ADC_CHANNEL_VREFINT),
diff --git a/testhal/STM32F4xx/ADC/main.c b/testhal/STM32F4xx/ADC/main.c index 80dab61b2..103c05b89 100644 --- a/testhal/STM32F4xx/ADC/main.c +++ b/testhal/STM32F4xx/ADC/main.c @@ -53,7 +53,7 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) { /*
* ADC conversion group.
- * Mode: Linear buffer, 16 samples of 1 channel, SW triggered.
+ * Mode: Linear buffer, 8 samples of 1 channel, SW triggered.
* Channels: IN10.
*/
static const ADCConversionGroup adcgrpcfg1 = {
diff --git a/testhal/STM32L1xx/ADC/main.c b/testhal/STM32L1xx/ADC/main.c index b9890100e..c13ebfe2a 100644 --- a/testhal/STM32L1xx/ADC/main.c +++ b/testhal/STM32L1xx/ADC/main.c @@ -53,8 +53,8 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) { /*
* ADC conversion group.
- * Mode: Linear buffer, 16 samples of 8 channels, SW triggered.
- * Channels: IN10, IN11, IN10, IN11, IN10, IN11, Sensor, VRef.
+ * Mode: Linear buffer, 8 samples of 1 channel, SW triggered.
+ * Channels: IN10.
*/
static const ADCConversionGroup adcgrpcfg1 = {
FALSE,
@@ -82,8 +82,8 @@ static const ADCConversionGroup adcgrpcfg2 = { adcerrorcallback,
0, 0, /* CR1, CR2 */
0, /* SMPR1 */
- ADC_SMPR2_SMP_AN10(ADC_SAMPLE_48) | ADC_SMPR2_SMP_SENSOR(ADC_SAMPLE_192) |
- ADC_SMPR2_SMP_VREF(ADC_SAMPLE_192),
+ ADC_SMPR2_SMP_AN11(ADC_SAMPLE_48) | ADC_SMPR2_SMP_AN10(ADC_SAMPLE_48) |
+ ADC_SMPR2_SMP_SENSOR(ADC_SAMPLE_192) | ADC_SMPR2_SMP_VREF(ADC_SAMPLE_192),
0, /* SMPR3 */
ADC_SQR1_NUM_CH(ADC_GRP2_NUM_CHANNELS),
0, 0, /* SQR2, SQR3 */
|