aboutsummaryrefslogtreecommitdiff
path: root/embassy-stm32
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2024-01-03 18:31:18 +0100
committerDario Nieuwenhuis <[email protected]>2024-01-03 18:39:22 +0100
commit03ba4ae3864d3cc38545dcf469944bafae5ca8a7 (patch)
treeb9f04d5376219027fc30a1072c5d716a30f986a3 /embassy-stm32
parent87ac51d6562e10990deda077a13acd0ca05a0221 (diff)
stm32: update metapac.
Diffstat (limited to 'embassy-stm32')
-rw-r--r--embassy-stm32/Cargo.toml4
-rw-r--r--embassy-stm32/src/adc/v2.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 938faa382..844a55cf8 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -57,7 +57,7 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa
57rand_core = "0.6.3" 57rand_core = "0.6.3"
58sdio-host = "0.5.0" 58sdio-host = "0.5.0"
59critical-section = "1.1" 59critical-section = "1.1"
60stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9ec9e0afb8fac2f5500a885e1cfd9c03f3a2ee30" } 60stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-f9f48b067be92fa9ea9dbdce0e85b5d0eb989790" }
61vcell = "0.1.3" 61vcell = "0.1.3"
62bxcan = "0.7.0" 62bxcan = "0.7.0"
63nb = "1.0.0" 63nb = "1.0.0"
@@ -75,7 +75,7 @@ critical-section = { version = "1.1", features = ["std"] }
75[build-dependencies] 75[build-dependencies]
76proc-macro2 = "1.0.36" 76proc-macro2 = "1.0.36"
77quote = "1.0.15" 77quote = "1.0.15"
78stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9ec9e0afb8fac2f5500a885e1cfd9c03f3a2ee30", default-features = false, features = ["metadata"]} 78stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-f9f48b067be92fa9ea9dbdce0e85b5d0eb989790", default-features = false, features = ["metadata"]}
79 79
80 80
81[features] 81[features]
diff --git a/embassy-stm32/src/adc/v2.rs b/embassy-stm32/src/adc/v2.rs
index eda1324de..4622b40a9 100644
--- a/embassy-stm32/src/adc/v2.rs
+++ b/embassy-stm32/src/adc/v2.rs
@@ -156,7 +156,7 @@ where
156 fn convert(&mut self) -> u16 { 156 fn convert(&mut self) -> u16 {
157 // clear end of conversion flag 157 // clear end of conversion flag
158 T::regs().sr().modify(|reg| { 158 T::regs().sr().modify(|reg| {
159 reg.set_eoc(crate::pac::adc::vals::Eoc::NOTCOMPLETE); 159 reg.set_eoc(false);
160 }); 160 });
161 161
162 // Start conversion 162 // Start conversion
@@ -164,10 +164,10 @@ where
164 reg.set_swstart(true); 164 reg.set_swstart(true);
165 }); 165 });
166 166
167 while T::regs().sr().read().strt() == crate::pac::adc::vals::Strt::NOTSTARTED { 167 while T::regs().sr().read().strt() == false {
168 // spin //wait for actual start 168 // spin //wait for actual start
169 } 169 }
170 while T::regs().sr().read().eoc() == crate::pac::adc::vals::Eoc::NOTCOMPLETE { 170 while T::regs().sr().read().eoc() == false {
171 // spin //wait for finish 171 // spin //wait for finish
172 } 172 }
173 173