diff --git a/embassy-stm32/src/adc/v2.rs b/embassy-stm32/src/adc/v2.rs index 9244e5d8..25b7ba96 100644 --- a/embassy-stm32/src/adc/v2.rs +++ b/embassy-stm32/src/adc/v2.rs @@ -153,7 +153,7 @@ impl Prescaler { pub struct Adc<'d, T: Instance> { sample_time: SampleTime, - vref: u32, + vref_mv: u32, resolution: Resolution, phantom: PhantomData<&'d mut T>, } @@ -183,7 +183,7 @@ where Self { sample_time: Default::default(), resolution: Resolution::default(), - vref: VREF_DEFAULT_MV, + vref_mv: VREF_DEFAULT_MV, phantom: PhantomData, } } @@ -199,13 +199,13 @@ where /// Set VREF value in millivolts. This value is used for [to_millivolts()] sample conversion. /// /// Use this if you have a known precise VREF (VDDA) pin reference voltage. - pub fn set_vref(&mut self, vref: u32) { - self.vref = vref; + pub fn set_vref_mv(&mut self, vref_mv: u32) { + self.vref_mv = vref_mv; } /// Convert a measurement to millivolts pub fn to_millivolts(&self, sample: u16) -> u16 { - ((u32::from(sample) * self.vref) / self.resolution.to_max_count()) as u16 + ((u32::from(sample) * self.vref_mv) / self.resolution.to_max_count()) as u16 } /// Perform a single conversion. diff --git a/embassy-stm32/src/adc/v3.rs b/embassy-stm32/src/adc/v3.rs index d8cac072..0f109088 100644 --- a/embassy-stm32/src/adc/v3.rs +++ b/embassy-stm32/src/adc/v3.rs @@ -205,7 +205,7 @@ pub use sample_time::SampleTime; pub struct Adc<'d, T: Instance> { sample_time: SampleTime, - vref: u32, + vref_mv: u32, resolution: Resolution, phantom: PhantomData<&'d mut T>, } @@ -244,7 +244,7 @@ impl<'d, T: Instance> Adc<'d, T> { Self { sample_time: Default::default(), resolution: Resolution::default(), - vref: VREF_DEFAULT_MV, + vref_mv: VREF_DEFAULT_MV, phantom: PhantomData, } } @@ -307,7 +307,7 @@ impl<'d, T: Instance> Adc<'d, T> { self.sample_time = old_sample_time; - self.vref = (VREF_CALIB_MV * u32::from(vrefint_cal)) / u32::from(vrefint_samp); + self.vref_mv = (VREF_CALIB_MV * u32::from(vrefint_cal)) / u32::from(vrefint_samp); } pub fn set_sample_time(&mut self, sample_time: SampleTime) { @@ -321,13 +321,13 @@ impl<'d, T: Instance> Adc<'d, T> { /// Set VREF value in millivolts. This value is used for [to_millivolts()] sample conversion. /// /// Use this if you have a known precise VREF (VDDA) pin reference voltage. - pub fn set_vref(&mut self, vref: u32) { - self.vref = vref; + pub fn set_vref_mv(&mut self, vref_mv: u32) { + self.vref_mv = vref_mv; } /// Convert a measurement to millivolts pub fn to_millivolts(&self, sample: u16) -> u16 { - ((u32::from(sample) * self.vref) / self.resolution.to_max_count()) as u16 + ((u32::from(sample) * self.vref_mv) / self.resolution.to_max_count()) as u16 } /* diff --git a/embassy-stm32/src/adc/v4.rs b/embassy-stm32/src/adc/v4.rs index cc210a6d..d356d7b6 100644 --- a/embassy-stm32/src/adc/v4.rs +++ b/embassy-stm32/src/adc/v4.rs @@ -322,7 +322,7 @@ impl Prescaler { pub struct Adc<'d, T: Instance> { sample_time: SampleTime, - vref: u32, + vref_mv: u32, resolution: Resolution, phantom: PhantomData<&'d mut T>, } @@ -360,7 +360,7 @@ impl<'d, T: Instance + crate::rcc::RccPeripheral> Adc<'d, T> { let mut s = Self { sample_time: Default::default(), - vref: VREF_DEFAULT_MV, + vref_mv: VREF_DEFAULT_MV, resolution: Resolution::default(), phantom: PhantomData, }; @@ -470,13 +470,13 @@ impl<'d, T: Instance + crate::rcc::RccPeripheral> Adc<'d, T> { /// Set VREF value in millivolts. This value is used for [to_millivolts()] sample conversion. /// /// Use this if you have a known precise VREF (VDDA) pin reference voltage. - pub fn set_vref(&mut self, vref: u32) { - self.vref = vref; + pub fn set_vref_mv(&mut self, vref_mv: u32) { + self.vref_mv = vref_mv; } /// Convert a measurement to millivolts pub fn to_millivolts(&self, sample: u16) -> u16 { - ((u32::from(sample) * self.vref) / self.resolution.to_max_count()) as u16 + ((u32::from(sample) * self.vref_mv) / self.resolution.to_max_count()) as u16 } /// Perform a single conversion.