Skip to content

Commit

Permalink
Merge #557
Browse files Browse the repository at this point in the history
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 <19dallen@gmail.com>
  • Loading branch information
bors[bot] and DavidTheFighter committed Dec 12, 2022
2 parents 5928819 + 191358d commit 07148a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/dma/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -870,8 +870,8 @@ dma_map!(
(Stream2<DMA2>, 1, pac::ADC2, PeripheralToMemory), //ADC2
(Stream3<DMA2>, 1, pac::ADC2, PeripheralToMemory), //ADC2
(Stream7<DMA2>, 1, pac::DCMI, PeripheralToMemory), //DCMI
(Stream2<DMA2>, 1, Adc<pac::ADC3>, PeripheralToMemory), //ADC2
(Stream3<DMA2>, 1, Adc<pac::ADC3>, PeripheralToMemory), //ADC2
(Stream2<DMA2>, 1, Adc<pac::ADC2>, PeripheralToMemory), //ADC2
(Stream3<DMA2>, 1, Adc<pac::ADC2>, PeripheralToMemory), //ADC2
(Stream0<DMA2>, 2, Adc<pac::ADC3>, PeripheralToMemory), //ADC3
(Stream1<DMA2>, 2, Adc<pac::ADC3>, PeripheralToMemory), //ADC3
);
Expand Down

0 comments on commit 07148a1

Please sign in to comment.