max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set resolution directly

Browse Source
This commit is contained in:
Grant Miller
2022-10-26 16:45:12 -05:00
parent 2cfe2439c9
commit 88bbc238b7
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
embassy-stm32/src/adc/v3.rs
View File

@ -62,7 +62,6 @@ impl<T: Instance> super::sealed::AdcPin<T> for Vbat {
pub struct Adc<'d, T: Instance> {
sample_time: SampleTime,
resolution: Resolution,
phantom: PhantomData<&'d mut T>,
}
@ -99,7 +98,6 @@ impl<'d, T: Instance> Adc<'d, T> {
Self {
sample_time: Default::default(),
resolution: Resolution::default(),
phantom: PhantomData,
}
}
@ -145,7 +143,12 @@ impl<'d, T: Instance> Adc<'d, T> {
}
pub fn set_resolution(&mut self, resolution: Resolution) {
self.resolution = resolution;
unsafe {
#[cfg(not(stm32g0))]
T::regs().cfgr().modify(|reg| reg.set_res(resolution.into()));
#[cfg(stm32g0)]
T::regs().cfgr1().modify(|reg| reg.set_res(resolution.into()));
}
}
/*
@ -197,12 +200,6 @@ impl<'d, T: Instance> Adc<'d, T> {
// spin
}
// Configure ADC
#[cfg(not(stm32g0))]
T::regs().cfgr().modify(|reg| reg.set_res(self.resolution.into()));
#[cfg(stm32g0)]
T::regs().cfgr1().modify(|reg| reg.set_res(self.resolution.into()));
// Configure channel
Self::set_channel_sample_time(pin.channel(), self.sample_time);