diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-08-26 08:41:04 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-08-26 08:41:04 +0000 |
| commit | 3262155f7d3afa5f69ae98b4744018dec03484eb (patch) | |
| tree | c9445b08e3f734f150b0120c7c2e0616b135090b /testhal/STM32/STM32F4xx | |
| parent | 5c969f63735eae2c813969bf41ee062c47b1da1b (diff) | |
| download | ChibiOS-3262155f7d3afa5f69ae98b4744018dec03484eb.tar.gz ChibiOS-3262155f7d3afa5f69ae98b4744018dec03484eb.tar.bz2 ChibiOS-3262155f7d3afa5f69ae98b4744018dec03484eb.zip | |
Added automatic number of channels initialization for ADCv2.
Implemented IRQ hooks for ADC drivers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9741 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32/STM32F4xx')
| -rw-r--r-- | testhal/STM32/STM32F4xx/ADC/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testhal/STM32/STM32F4xx/ADC/main.c b/testhal/STM32/STM32F4xx/ADC/main.c index 00fdd29d7..e452a3e38 100644 --- a/testhal/STM32/STM32F4xx/ADC/main.c +++ b/testhal/STM32/STM32F4xx/ADC/main.c @@ -61,7 +61,7 @@ static const ADCConversionGroup adcgrpcfg1 = { ADC_CR2_SWSTART, /* CR2 */
ADC_SMPR1_SMP_AN11(ADC_SAMPLE_3),
0, /* SMPR2 */
- ADC_SQR1_NUM_CH(ADC_GRP1_NUM_CHANNELS),
+ 0, /* SQR1 */
0, /* SQR2 */
ADC_SQR3_SQ1_N(ADC_CHANNEL_IN11)
};
@@ -81,7 +81,7 @@ static const ADCConversionGroup adcgrpcfg2 = { ADC_SMPR1_SMP_AN12(ADC_SAMPLE_56) | ADC_SMPR1_SMP_AN11(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, /* SQR1 */
ADC_SQR2_SQ8_N(ADC_CHANNEL_SENSOR) | ADC_SQR2_SQ7_N(ADC_CHANNEL_VREFINT),
ADC_SQR3_SQ6_N(ADC_CHANNEL_IN12) | ADC_SQR3_SQ5_N(ADC_CHANNEL_IN11) |
ADC_SQR3_SQ4_N(ADC_CHANNEL_IN12) | ADC_SQR3_SQ3_N(ADC_CHANNEL_IN11) |
|