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

STM32: Disable opamp when OpAmpOutput is dropped, not when the parent OpAmp is dropped

Browse Source
This commit is contained in:
Adam Greig 2023-11-20 21:17:09 +00:00
parent 814e096d22
commit 2386619f1f
No known key found for this signature in database
GPG Key ID: 8B3FE5477B1DD9A0
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
embassy-stm32/src/opamp.rs
View File

@ -74,7 +74,8 @@ impl<'d, T: Instance> OpAmp<'d, T> {
/// ///
/// The output pin is held within the returned [`OpAmpOutput`] struct, /// The output pin is held within the returned [`OpAmpOutput`] struct,
/// preventing it being used elsewhere. The `OpAmpOutput` can then be /// preventing it being used elsewhere. The `OpAmpOutput` can then be
/// directly used as an ADC input. /// directly used as an ADC input. The opamp will be disabled when the
/// [`OpAmpOutput`] is dropped.
pub fn buffer_ext<'a, 'b, IP, OP>( pub fn buffer_ext<'a, 'b, IP, OP>(
&'a mut self, &'a mut self,
in_pin: &IP, in_pin: &IP,
@ -128,6 +129,7 @@ impl<'d, T: Instance> OpAmp<'d, T> {
/// so it may be subsequently used for ADC or comparator inputs. /// so it may be subsequently used for ADC or comparator inputs.
/// ///
/// The returned `OpAmpInternalOutput` struct may be used as an ADC input. /// The returned `OpAmpInternalOutput` struct may be used as an ADC input.
/// The opamp output will be disabled when it is dropped.
#[cfg(opamp_g4)] #[cfg(opamp_g4)]
pub fn buffer_int<'a, P>(&'a mut self, pin: &P, gain: OpAmpGain) -> OpAmpInternalOutput<'a, T> pub fn buffer_int<'a, P>(&'a mut self, pin: &P, gain: OpAmpGain) -> OpAmpInternalOutput<'a, T>
where where
@ -156,7 +158,21 @@ impl<'d, T: Instance> OpAmp<'d, T> {
} }
} }
impl<'d, T: Instance> Drop for OpAmp<'d, T> { impl<'d, 'p, T: Instance, P: OutputPin<T>> Drop for OpAmpOutput<'d, 'p, T, P> {
fn drop(&mut self) {
#[cfg(opamp_f3)]
T::regs().opampcsr().modify(|w| {
w.set_opampen(false);
});
#[cfg(opamp_g4)]
T::regs().opamp_csr().modify(|w| {
w.set_opaen(false);
});
}
}
impl<'d, T: Instance> Drop for OpAmpInternalOutput<'d, T> {
fn drop(&mut self) { fn drop(&mut self) {
#[cfg(opamp_f3)] #[cfg(opamp_f3)]
T::regs().opampcsr().modify(|w| { T::regs().opampcsr().modify(|w| {