diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-02-25 00:47:12 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-25 00:47:12 +0000 |
| commit | 6da4b6636435b350b21f0b30e7175a2a6899acdc (patch) | |
| tree | e2c2375e187f078dc7f003674b43ced9b083bf14 | |
| parent | 5163de6094455c230f84fa064c96da7987f5e3f8 (diff) | |
| parent | f6bbb987c86d095fda6039464bd9e1ce0f668666 (diff) | |
Merge #644
644: stm32 misc fixes r=Dirbaio a=Dirbaio
- Fix build when no DBGMCU is present (wl55 cm0 core)
- Fix multicore 2nd core having the wrong NVIC.
Co-authored-by: Dario Nieuwenhuis <[email protected]>
| -rw-r--r-- | embassy-stm32/src/lib.rs | 3 | ||||
| m--------- | stm32-data | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs index 9c94e5f3f..79221e600 100644 --- a/embassy-stm32/src/lib.rs +++ b/embassy-stm32/src/lib.rs | |||
| @@ -76,6 +76,7 @@ pub use generated::{peripherals, Peripherals}; | |||
| 76 | #[non_exhaustive] | 76 | #[non_exhaustive] |
| 77 | pub struct Config { | 77 | pub struct Config { |
| 78 | pub rcc: rcc::Config, | 78 | pub rcc: rcc::Config, |
| 79 | #[cfg(dbgmcu)] | ||
| 79 | pub enable_debug_during_sleep: bool, | 80 | pub enable_debug_during_sleep: bool, |
| 80 | } | 81 | } |
| 81 | 82 | ||
| @@ -83,6 +84,7 @@ impl Default for Config { | |||
| 83 | fn default() -> Self { | 84 | fn default() -> Self { |
| 84 | Self { | 85 | Self { |
| 85 | rcc: Default::default(), | 86 | rcc: Default::default(), |
| 87 | #[cfg(dbgmcu)] | ||
| 86 | enable_debug_during_sleep: true, | 88 | enable_debug_during_sleep: true, |
| 87 | } | 89 | } |
| 88 | } | 90 | } |
| @@ -93,6 +95,7 @@ pub fn init(config: Config) -> Peripherals { | |||
| 93 | let p = Peripherals::take(); | 95 | let p = Peripherals::take(); |
| 94 | 96 | ||
| 95 | unsafe { | 97 | unsafe { |
| 98 | #[cfg(dbgmcu)] | ||
| 96 | if config.enable_debug_during_sleep { | 99 | if config.enable_debug_during_sleep { |
| 97 | crate::pac::DBGMCU.cr().modify(|cr| { | 100 | crate::pac::DBGMCU.cr().modify(|cr| { |
| 98 | crate::pac::dbgmcu! { | 101 | crate::pac::dbgmcu! { |
diff --git a/stm32-data b/stm32-data | |||
| Subproject cb78ac90ba8607d6bb38296607c02e28c60391f | Subproject 5fcc7795c880c7b19bb7b6226cd6d7db0b5cd95 | ||
