diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-12-14 14:04:55 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-14 14:04:55 +0000 |
| commit | 7b9b22d7f83b44d509be31ab51fa4385d73512f6 (patch) | |
| tree | 46d5ce4400a3edaa7cdd9afde1108268ada63914 | |
| parent | 2c3d3992200939f71708c8b47d839328dcb12098 (diff) | |
| parent | 879c0ad9890e80f2e7c19c715347b86b61eb432a (diff) | |
Merge pull request #2286 from eZioPan/update-metapac5
after stm32-metapac update, TIM CR1 ARPE enum to bool
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/timer/mod.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 074538d3b..f54d5608f 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -58,7 +58,7 @@ rand_core = "0.6.3" | |||
| 58 | sdio-host = "0.5.0" | 58 | sdio-host = "0.5.0" |
| 59 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } | 59 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } |
| 60 | critical-section = "1.1" | 60 | critical-section = "1.1" |
| 61 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8f5fcae8c289c1ad481cc3a2bb37db023a61599c" } | 61 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-91cee0d1fdcb4e447b65a09756b506f4af91b7e2" } |
| 62 | vcell = "0.1.3" | 62 | vcell = "0.1.3" |
| 63 | bxcan = "0.7.0" | 63 | bxcan = "0.7.0" |
| 64 | nb = "1.0.0" | 64 | nb = "1.0.0" |
| @@ -76,7 +76,7 @@ critical-section = { version = "1.1", features = ["std"] } | |||
| 76 | [build-dependencies] | 76 | [build-dependencies] |
| 77 | proc-macro2 = "1.0.36" | 77 | proc-macro2 = "1.0.36" |
| 78 | quote = "1.0.15" | 78 | quote = "1.0.15" |
| 79 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-8f5fcae8c289c1ad481cc3a2bb37db023a61599c", default-features = false, features = ["metadata"]} | 79 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-91cee0d1fdcb4e447b65a09756b506f4af91b7e2", default-features = false, features = ["metadata"]} |
| 80 | 80 | ||
| 81 | 81 | ||
| 82 | [features] | 82 | [features] |
diff --git a/embassy-stm32/src/timer/mod.rs b/embassy-stm32/src/timer/mod.rs index 2313a5b94..9f93c6425 100644 --- a/embassy-stm32/src/timer/mod.rs +++ b/embassy-stm32/src/timer/mod.rs | |||
| @@ -77,7 +77,7 @@ pub(crate) mod sealed { | |||
| 77 | Self::regs().dier().write(|r| r.set_uie(enable)); | 77 | Self::regs().dier().write(|r| r.set_uie(enable)); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | fn set_autoreload_preload(&mut self, enable: vals::Arpe) { | 80 | fn set_autoreload_preload(&mut self, enable: bool) { |
| 81 | Self::regs().cr1().modify(|r| r.set_arpe(enable)); | 81 | Self::regs().cr1().modify(|r| r.set_arpe(enable)); |
| 82 | } | 82 | } |
| 83 | 83 | ||
