diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-01-01 17:09:22 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-01-01 17:09:22 +0000 |
| commit | 60c04d66ec3c383febd9c9324e166aec2adb6e38 (patch) | |
| tree | 57718e12cef2f2a9d3703b137edf087446ac85d5 /testhal/STM32/STM32F4xx | |
| parent | de7b311986e639eec1d8e808ea80bdf0b9989f09 (diff) | |
| download | ChibiOS-60c04d66ec3c383febd9c9324e166aec2adb6e38.tar.gz ChibiOS-60c04d66ec3c383febd9c9324e166aec2adb6e38.tar.bz2 ChibiOS-60c04d66ec3c383febd9c9324e166aec2adb6e38.zip | |
Fixed small errors caused by recent changes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12520 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'testhal/STM32/STM32F4xx')
| -rw-r--r-- | testhal/STM32/STM32F4xx/DMA_STORM/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testhal/STM32/STM32F4xx/DMA_STORM/main.c b/testhal/STM32/STM32F4xx/DMA_STORM/main.c index 1eecad767..fa5ac83ea 100644 --- a/testhal/STM32/STM32F4xx/DMA_STORM/main.c +++ b/testhal/STM32/STM32F4xx/DMA_STORM/main.c @@ -38,11 +38,9 @@ static virtual_timer_t adcvt; static adcsample_t samples2[ADC_GRP2_NUM_CHANNELS * ADC_GRP2_BUF_DEPTH];
-static void adccallback(ADCDriver *adcp, adcsample_t *buffer, size_t n) {
+static void adccallback(ADCDriver *adcp) {
(void)adcp;
- (void)buffer;
- (void)n;
chSysLockFromISR();
chVTSetI(&adcvt, TIME_MS2I(10), tmo, (void *)"ADC timeout");
@@ -62,7 +60,7 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) { * Channels: IN11, IN12, IN11, IN12, IN11, IN12, Sensor, VRef.
*/
static const ADCConversionGroup adcgrpcfg2 = {
- TRUE,
+ true,
ADC_GRP2_NUM_CHANNELS,
adccallback,
adcerrorcallback,
@@ -71,7 +69,9 @@ 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, /* HTR */
+ 0, /* LTR */
+ 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) |
|