diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-11-16 18:55:34 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-11-16 18:55:34 +0000 |
| commit | cef04f5f4b8ea66ad3ab5a628a4aad8da509039e (patch) | |
| tree | 4b5e4f8b06c5703f1c0c61db560c76e7ea975352 /testhal/STM32F4xx | |
| parent | 0435bb5b4e1435924490f4a268dba5f75e998951 (diff) | |
| download | ChibiOS-cef04f5f4b8ea66ad3ab5a628a4aad8da509039e.tar.gz ChibiOS-cef04f5f4b8ea66ad3ab5a628a4aad8da509039e.tar.bz2 ChibiOS-cef04f5f4b8ea66ad3ab5a628a4aad8da509039e.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3500 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32F4xx')
| -rw-r--r-- | testhal/STM32F4xx/ADC/main.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/testhal/STM32F4xx/ADC/main.c b/testhal/STM32F4xx/ADC/main.c index b9890100e..80dab61b2 100644 --- a/testhal/STM32F4xx/ADC/main.c +++ b/testhal/STM32F4xx/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, 16 samples of 1 channel, SW triggered.
+ * Channels: IN10.
*/
static const ADCConversionGroup adcgrpcfg1 = {
FALSE,
@@ -62,12 +62,11 @@ static const ADCConversionGroup adcgrpcfg1 = { NULL,
adcerrorcallback,
0, 0, /* CR1, CR2 */
- 0, /* SMPR1 */
- ADC_SMPR2_SMP_AN10(ADC_SAMPLE_4),
- 0, /* SMPR3 */
+ ADC_SMPR1_SMP_AN10(ADC_SAMPLE_3),
+ 0, /* SMPR2 */
ADC_SQR1_NUM_CH(ADC_GRP1_NUM_CHANNELS),
- 0, 0, 0, /* SQR2, SQR3, SQR4 */
- ADC_SQR5_SQ1_N(ADC_CHANNEL_IN10)
+ 0, /* SQR2 */
+ ADC_SQR3_SQ1_N(ADC_CHANNEL_IN10)
};
/*
@@ -81,16 +80,14 @@ static const ADCConversionGroup adcgrpcfg2 = { adccallback,
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),
- 0, /* SMPR3 */
+ ADC_SMPR1_SMP_AN11(ADC_SAMPLE_56) | ADC_SMPR1_SMP_AN10(ADC_SAMPLE_56) |
+ ADC_SMPR1_SMP_SENSOR(ADC_SAMPLE_144) | ADC_SMPR1_SMP_VREF(ADC_SAMPLE_144),
+ 0, /* SMPR2 */
ADC_SQR1_NUM_CH(ADC_GRP2_NUM_CHANNELS),
- 0, 0, /* SQR2, SQR3 */
- ADC_SQR4_SQ8_N(ADC_CHANNEL_SENSOR) | ADC_SQR4_SQ7_N(ADC_CHANNEL_VREFINT),
- ADC_SQR5_SQ6_N(ADC_CHANNEL_IN11) | ADC_SQR5_SQ5_N(ADC_CHANNEL_IN10) |
- ADC_SQR5_SQ4_N(ADC_CHANNEL_IN11) | ADC_SQR5_SQ3_N(ADC_CHANNEL_IN10) |
- ADC_SQR5_SQ2_N(ADC_CHANNEL_IN11) | ADC_SQR5_SQ1_N(ADC_CHANNEL_IN10)
+ ADC_SQR2_SQ8_N(ADC_CHANNEL_SENSOR) | ADC_SQR2_SQ7_N(ADC_CHANNEL_VREFINT),
+ ADC_SQR3_SQ6_N(ADC_CHANNEL_IN11) | ADC_SQR3_SQ5_N(ADC_CHANNEL_IN10) |
+ ADC_SQR3_SQ4_N(ADC_CHANNEL_IN11) | ADC_SQR3_SQ3_N(ADC_CHANNEL_IN10) |
+ ADC_SQR3_SQ2_N(ADC_CHANNEL_IN11) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN10)
};
/*
@@ -102,9 +99,9 @@ static msg_t Thread1(void *arg) { (void)arg;
chRegSetThreadName("blinker");
while (TRUE) {
- palSetPad(GPIOB, GPIOB_LED4);
+ palSetPad(GPIOD, GPIOD_LED5);
chThdSleepMilliseconds(500);
- palClearPad(GPIOB, GPIOB_LED4);
+ palClearPad(GPIOD, GPIOD_LED5);
chThdSleepMilliseconds(500);
}
}
|