diff options
| author | Bob McWhirter <[email protected]> | 2021-06-30 14:58:28 -0400 |
|---|---|---|
| committer | Bob McWhirter <[email protected]> | 2021-07-01 11:30:54 -0400 |
| commit | 54ada5bae113dbff1f5b76fac2676734f6ddd8eb (patch) | |
| tree | 1f0c4b4fd2bece3bae0697169d61e5e59406369f /embassy-stm32/src | |
| parent | bf3bc925251bdd55cf853e3380cc012c7257eab8 (diff) | |
Stub in the DMA bits that aren't yet there.
Diffstat (limited to 'embassy-stm32/src')
| -rw-r--r-- | embassy-stm32/src/dma/mod.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/lib.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/usart/v3.rs | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/embassy-stm32/src/dma/mod.rs b/embassy-stm32/src/dma/mod.rs index 371741ffd..466cfa033 100644 --- a/embassy-stm32/src/dma/mod.rs +++ b/embassy-stm32/src/dma/mod.rs | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | #![macro_use] | 1 | #![macro_use] |
| 2 | 2 | ||
| 3 | #[cfg(dma)] | ||
| 3 | #[cfg_attr(dma_v1, path = "v1.rs")] | 4 | #[cfg_attr(dma_v1, path = "v1.rs")] |
| 4 | #[cfg_attr(dma_v2, path = "v2.rs")] | 5 | #[cfg_attr(dma_v2, path = "v2.rs")] |
| 5 | mod _version; | 6 | mod _version; |
| 6 | 7 | ||
| 8 | #[cfg(dma)] | ||
| 7 | #[allow(unused)] | 9 | #[allow(unused)] |
| 8 | pub use _version::*; | 10 | pub use _version::*; |
| 9 | 11 | ||
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs index 9ba7bbe4c..76a6ecd88 100644 --- a/embassy-stm32/src/lib.rs +++ b/embassy-stm32/src/lib.rs | |||
| @@ -26,7 +26,7 @@ pub mod adc; | |||
| 26 | pub mod clock; | 26 | pub mod clock; |
| 27 | #[cfg(dac)] | 27 | #[cfg(dac)] |
| 28 | pub mod dac; | 28 | pub mod dac; |
| 29 | #[cfg(dma)] | 29 | #[cfg(any(dma, dmamux))] |
| 30 | pub mod dma; | 30 | pub mod dma; |
| 31 | #[cfg(all(eth, feature = "net"))] | 31 | #[cfg(all(eth, feature = "net"))] |
| 32 | pub mod eth; | 32 | pub mod eth; |
diff --git a/embassy-stm32/src/usart/v3.rs b/embassy-stm32/src/usart/v3.rs index 32850c9c4..c45af0043 100644 --- a/embassy-stm32/src/usart/v3.rs +++ b/embassy-stm32/src/usart/v3.rs | |||
| @@ -21,7 +21,8 @@ impl<'d, T: Instance> Uart<'d, T> { | |||
| 21 | ) -> Self { | 21 | ) -> Self { |
| 22 | unborrow!(inner, rx, tx); | 22 | unborrow!(inner, rx, tx); |
| 23 | 23 | ||
| 24 | T::enable(); | 24 | // Uncomment once we find all of the H7's UART clocks. |
| 25 | //T::enable(); | ||
| 25 | let pclk_freq = T::frequency(); | 26 | let pclk_freq = T::frequency(); |
| 26 | 27 | ||
| 27 | // TODO: better calculation, including error checking and OVER8 if possible. | 28 | // TODO: better calculation, including error checking and OVER8 if possible. |
