Skip to content

Commit 07148a1

Browse files
Merge #557
557: Fixed typo in DMA2/ADCx traits r=burrbull a=DavidTheFighter I was working with the ADC and DMA and noticed there was a typo. I've verified this on the reference manual and with my hardware setup. Co-authored-by: David <[email protected]>
2 parents 5928819 + 191358d commit 07148a1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
3737
- add missing generic param for Spi::release implementation.
3838
- build rtic-usb-cdc-echo example [#554]
3939
- reset timer cnt register when changing pwm period [#555]
40+
- Trait typo preventing ADC2 being used with DMA2 [#557]
4041

4142
### Added
4243

src/dma/traits.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,8 @@ dma_map!(
870870
(Stream2<DMA2>, 1, pac::ADC2, PeripheralToMemory), //ADC2
871871
(Stream3<DMA2>, 1, pac::ADC2, PeripheralToMemory), //ADC2
872872
(Stream7<DMA2>, 1, pac::DCMI, PeripheralToMemory), //DCMI
873-
(Stream2<DMA2>, 1, Adc<pac::ADC3>, PeripheralToMemory), //ADC2
874-
(Stream3<DMA2>, 1, Adc<pac::ADC3>, PeripheralToMemory), //ADC2
873+
(Stream2<DMA2>, 1, Adc<pac::ADC2>, PeripheralToMemory), //ADC2
874+
(Stream3<DMA2>, 1, Adc<pac::ADC2>, PeripheralToMemory), //ADC2
875875
(Stream0<DMA2>, 2, Adc<pac::ADC3>, PeripheralToMemory), //ADC3
876876
(Stream1<DMA2>, 2, Adc<pac::ADC3>, PeripheralToMemory), //ADC3
877877
);

0 commit comments

Comments
 (0)