diff options
| author | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2017-05-28 20:41:34 +0000 |
|---|---|---|
| committer | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2017-05-28 20:41:34 +0000 |
| commit | 685dc4e5f4803e914bdebf95ca8465724d4bc2c7 (patch) | |
| tree | a69290a5a6181c480d3681b906b7b958b67dd831 /testhal/STM32/STM32L4xx/GPT-ADC/main.c | |
| parent | 22b865a6309d72f37c2c03a655ca35ced80bb8b9 (diff) | |
| download | ChibiOS-685dc4e5f4803e914bdebf95ca8465724d4bc2c7.tar.gz ChibiOS-685dc4e5f4803e914bdebf95ca8465724d4bc2c7.tar.bz2 ChibiOS-685dc4e5f4803e914bdebf95ca8465724d4bc2c7.zip | |
Fixed Bug #842
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10222 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32/STM32L4xx/GPT-ADC/main.c')
| -rw-r--r-- | testhal/STM32/STM32L4xx/GPT-ADC/main.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/main.c b/testhal/STM32/STM32L4xx/GPT-ADC/main.c index bf843263c..80ad44189 100644 --- a/testhal/STM32/STM32L4xx/GPT-ADC/main.c +++ b/testhal/STM32/STM32L4xx/GPT-ADC/main.c @@ -68,23 +68,24 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) { /*
* ADC conversion group.
- * Mode: Continuous, 16 samples of 2 channels, HS triggered by
+ * Mode: Continuous, 16 samples of 2 channels, HW triggered by
* GPT4-TRGO.
- * Channels: VRef, PC1.
+ * Channels: VRef, PA0.
*/
static const ADCConversionGroup adcgrpcfg1 = {
true,
ADC_GRP1_NUM_CHANNELS,
adccallback,
adcerrorcallback,
- ADC_CFGR_CONT | ADC_CFGR_EXTEN_RISING | ADC_CFGR_EXTSEL_SRC(12), /* CFGR */
+ ADC_CFGR_EXTEN_RISING | ADC_CFGR_EXTSEL_SRC(12), /* CFGR */
ADC_TR(0, 4095), /* TR1 */
{ /* SMPR[2]*/
- ADC_SMPR1_SMP_AN0(ADC_SMPR_SMP_247P5),
- ADC_SMPR1_SMP_AN2(ADC_SMPR_SMP_247P5)
+ ADC_SMPR1_SMP_AN0(ADC_SMPR_SMP_247P5) |
+ ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_247P5),
+ 0
},
{ /* SQR[4] */
- ADC_SQR1_SQ1_N(ADC_CHANNEL_IN0) | ADC_SQR1_SQ2_N(ADC_CHANNEL_IN2),
+ ADC_SQR1_SQ1_N(ADC_CHANNEL_IN0) | ADC_SQR1_SQ2_N(ADC_CHANNEL_IN5),
0,
0,
0
@@ -145,9 +146,11 @@ int main(void) { adcSTM32EnableVREF(&ADCD1);
adcSTM32EnableTS(&ADCD1);
+ palSetLineMode(LINE_ARD_A0, PAL_MODE_INPUT_ANALOG);
+
/*
* Starts an ADC continuous conversion triggered with a period of
- * 1/1000000 second.
+ * 1/10000 second.
*/
adcStartConversion(&ADCD1, &adcgrpcfg1, samples1, ADC_GRP1_BUF_DEPTH);
gptStartContinuous(&GPTD4, 100);
|