nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3268 from embassy-rs/update-metapac-32985

Browse Source 
stm32: update metapac
This commit is contained in:
Dario Nieuwenhuis 2024-08-18 08:46:45 +00:00 committed by GitHub
commit ad72b40c21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-stm32/Cargo.toml
View File

@ -72,7 +72,7 @@ rand_core = "0.6.3"
sdio-host = "0.5.0" sdio-host = "0.5.0"
critical-section = "1.1" critical-section = "1.1"
#stm32-metapac = { version = "15" } #stm32-metapac = { version = "15" }
stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-e0cfd165fd8fffaa0df66a35eeca83b228496645" } stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-5ef354f3e49f790e47f5c818f243459742c9b83b" }
vcell = "0.1.3" vcell = "0.1.3"
nb = "1.0.0" nb = "1.0.0"
@ -97,7 +97,7 @@ proc-macro2 = "1.0.36"
quote = "1.0.15" quote = "1.0.15"
#stm32-metapac = { version = "15", default-features = false, features = ["metadata"]} #stm32-metapac = { version = "15", default-features = false, features = ["metadata"]}
stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-e0cfd165fd8fffaa0df66a35eeca83b228496645", default-features = false, features = ["metadata"] } stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-5ef354f3e49f790e47f5c818f243459742c9b83b", default-features = false, features = ["metadata"] }
[features] [features]
default = ["rt"] default = ["rt"]

2
embassy-stm32/src/adc/f3.rs
View File

@ -42,7 +42,7 @@ impl<T: Instance> super::SealedAdcChannel<T> for Vref {
impl Vref { impl Vref {
/// The value that vref would be if vdda was at 3300mv /// The value that vref would be if vdda was at 3300mv
pub fn value(&self) -> u16 { pub fn value(&self) -> u16 {
crate::pac::VREFINTCAL.data().read().value() crate::pac::VREFINTCAL.data().read()
} }
} }

2
embassy-stm32/src/adc/f3_v1_1.rs
View File

@ -74,7 +74,7 @@ impl<T: Instance> super::SealedAdcChannel<T> for Vref<T> {
impl<T: Instance> Vref<T> { impl<T: Instance> Vref<T> {
/// The value that vref would be if vdda was at 3000mv /// The value that vref would be if vdda was at 3000mv
pub fn calibrated_value(&self) -> u16 { pub fn calibrated_value(&self) -> u16 {
crate::pac::VREFINTCAL.data().read().value() crate::pac::VREFINTCAL.data().read()
} }
pub async fn calibrate(&mut self, adc: &mut Adc<'_, T>) -> Calibration { pub async fn calibrate(&mut self, adc: &mut Adc<'_, T>) -> Calibration {