diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-08-18 08:46:45 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-18 08:46:45 +0000 |
| commit | ad72b40c2106b8da9a3021bca9b344e1bf95faf3 (patch) | |
| tree | 3722710ee5d5684aa06b4cd48d79734584e11712 | |
| parent | cd4e199065bef50637d61622318c6dd1b5443f9f (diff) | |
| parent | 8884766450e49e4557a2b5babed1ccf93058680a (diff) | |
Merge pull request #3268 from embassy-rs/update-metapac-32985
stm32: update metapac
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/adc/f3.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/adc/f3_v1_1.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index ac9e9644c..54abd0799 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -72,7 +72,7 @@ rand_core = "0.6.3" | |||
| 72 | sdio-host = "0.5.0" | 72 | sdio-host = "0.5.0" |
| 73 | critical-section = "1.1" | 73 | critical-section = "1.1" |
| 74 | #stm32-metapac = { version = "15" } | 74 | #stm32-metapac = { version = "15" } |
| 75 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-e0cfd165fd8fffaa0df66a35eeca83b228496645" } | 75 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-5ef354f3e49f790e47f5c818f243459742c9b83b" } |
| 76 | 76 | ||
| 77 | vcell = "0.1.3" | 77 | vcell = "0.1.3" |
| 78 | nb = "1.0.0" | 78 | nb = "1.0.0" |
| @@ -97,7 +97,7 @@ proc-macro2 = "1.0.36" | |||
| 97 | quote = "1.0.15" | 97 | quote = "1.0.15" |
| 98 | 98 | ||
| 99 | #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} | 99 | #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} |
| 100 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-e0cfd165fd8fffaa0df66a35eeca83b228496645", default-features = false, features = ["metadata"] } | 100 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-5ef354f3e49f790e47f5c818f243459742c9b83b", default-features = false, features = ["metadata"] } |
| 101 | 101 | ||
| 102 | [features] | 102 | [features] |
| 103 | default = ["rt"] | 103 | default = ["rt"] |
diff --git a/embassy-stm32/src/adc/f3.rs b/embassy-stm32/src/adc/f3.rs index ac88c9742..0ebeb8a9e 100644 --- a/embassy-stm32/src/adc/f3.rs +++ b/embassy-stm32/src/adc/f3.rs | |||
| @@ -42,7 +42,7 @@ impl<T: Instance> super::SealedAdcChannel<T> for Vref { | |||
| 42 | impl Vref { | 42 | impl Vref { |
| 43 | /// The value that vref would be if vdda was at 3300mv | 43 | /// The value that vref would be if vdda was at 3300mv |
| 44 | pub fn value(&self) -> u16 { | 44 | pub fn value(&self) -> u16 { |
| 45 | crate::pac::VREFINTCAL.data().read().value() | 45 | crate::pac::VREFINTCAL.data().read() |
| 46 | } | 46 | } |
| 47 | } | 47 | } |
| 48 | 48 | ||
diff --git a/embassy-stm32/src/adc/f3_v1_1.rs b/embassy-stm32/src/adc/f3_v1_1.rs index 689c2871d..291a3861e 100644 --- a/embassy-stm32/src/adc/f3_v1_1.rs +++ b/embassy-stm32/src/adc/f3_v1_1.rs | |||
| @@ -74,7 +74,7 @@ impl<T: Instance> super::SealedAdcChannel<T> for Vref<T> { | |||
| 74 | impl<T: Instance> Vref<T> { | 74 | impl<T: Instance> Vref<T> { |
| 75 | /// The value that vref would be if vdda was at 3000mv | 75 | /// The value that vref would be if vdda was at 3000mv |
| 76 | pub fn calibrated_value(&self) -> u16 { | 76 | pub fn calibrated_value(&self) -> u16 { |
| 77 | crate::pac::VREFINTCAL.data().read().value() | 77 | crate::pac::VREFINTCAL.data().read() |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | pub async fn calibrate(&mut self, adc: &mut Adc<'_, T>) -> Calibration { | 80 | pub async fn calibrate(&mut self, adc: &mut Adc<'_, T>) -> Calibration { |
