From 3abd47494b386774305cdbf0e9e6491b28dab298 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Tue, 16 Feb 2021 14:12:13 +0100 Subject: [PATCH] Fixing DMA2 instantiation issue --- src/hardware/configuration.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/hardware/configuration.rs b/src/hardware/configuration.rs index 52db011..fba7048 100644 --- a/src/hardware/configuration.rs +++ b/src/hardware/configuration.rs @@ -134,6 +134,12 @@ pub fn setup( let dma_streams = hal::dma::dma::StreamsTuple::new(device.DMA1, ccdr.peripheral.DMA1); + #[cfg(feature = "pounder_v1_1")] + let dma2_streams = hal::dma::dma::StreamsTuple::new( + device.DMA2, + ccdr.peripheral.DMA2, + ); + // Configure timer 2 to trigger conversions for the ADC let mut sampling_timer = { // The timer frequency is manually adjusted below, so the 1KHz setting here is a @@ -740,11 +746,6 @@ pub fn setup( #[cfg(feature = "pounder_v1_1")] let pounder_stamper = { - let dma2_streams = hal::dma::dma::StreamsTuple::new( - device.DMA2, - ccdr.peripheral.DMA2, - ); - let etr_pin = gpioa.pa0.into_alternate_af3(); // The frequency in the constructor is dont-care, as we will modify the period + clock