From 191358d3f38eb83a54e8e2377584a736e7ecbb2c Mon Sep 17 00:00:00 2001 From: David <19dallen@gmail.com> Date: Sun, 11 Dec 2022 15:54:18 -0500 Subject: [PATCH] Fixed typo in DMA2/ADCx traits Updated changelog --- CHANGELOG.md | 1 + src/dma/traits.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6e583e..88d945eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - add missing generic param for Spi::release implementation. - build rtic-usb-cdc-echo example [#554] - reset timer cnt register when changing pwm period [#555] + - Trait typo preventing ADC2 being used with DMA2 [#557] ### Added diff --git a/src/dma/traits.rs b/src/dma/traits.rs index c46432d8..bab90956 100644 --- a/src/dma/traits.rs +++ b/src/dma/traits.rs @@ -870,8 +870,8 @@ dma_map!( (Stream2, 1, pac::ADC2, PeripheralToMemory), //ADC2 (Stream3, 1, pac::ADC2, PeripheralToMemory), //ADC2 (Stream7, 1, pac::DCMI, PeripheralToMemory), //DCMI - (Stream2, 1, Adc, PeripheralToMemory), //ADC2 - (Stream3, 1, Adc, PeripheralToMemory), //ADC2 + (Stream2, 1, Adc, PeripheralToMemory), //ADC2 + (Stream3, 1, Adc, PeripheralToMemory), //ADC2 (Stream0, 2, Adc, PeripheralToMemory), //ADC3 (Stream1, 2, Adc, PeripheralToMemory), //ADC3 );