Use ObservationLock

Author: usbalbin

src/comparator.rs

@@ -34,7 +34,7 @@ use crate::gpio::{
 use crate::gpio::gpioc::{PC0, PC1};
 use crate::gpio::gpioe::{PE7, PE8};
 use crate::gpio::gpiof::PF1;
-use crate::observable::IntoObservationToken;
+use crate::observable::ObservationLock;
 use crate::rcc::{Clocks, Rcc};
 use crate::stm32::{COMP, EXTI};
 
@@ -398,8 +398,8 @@ pub trait ComparatorExt<COMP> {
     where
         PP: PositiveInput<COMP>,
         NP: NegativeInput<COMP>,
-        P: IntoObservationToken<Peripheral = PP>,
-        N: IntoObservationToken<Peripheral = NP>;
+        P: ObservationLock<Peripheral = PP>,
+        N: ObservationLock<Peripheral = NP>;
 }
 
 macro_rules! impl_comparator {
@@ -415,8 +415,8 @@ macro_rules! impl_comparator {
             where
                 PP: PositiveInput<$COMP>,
                 NP: NegativeInput<$COMP>,
-                P: IntoObservationToken<Peripheral = PP>,
-                N: IntoObservationToken<Peripheral = NP>,
+                P: ObservationLock<Peripheral = PP>,
+                N: ObservationLock<Peripheral = NP>,
             {
                 PP::setup(&mut self);
                 PP::setup(&mut self);
@@ -453,8 +453,8 @@ macro_rules! impl_comparator {
             where
                 PP: PositiveInput<$COMP>,
                 NP: NegativeInput<$COMP>,
-                P: IntoObservationToken<Peripheral = PP>,
-                N: IntoObservationToken<Peripheral = NP>,
+                P: ObservationLock<Peripheral = PP>,
+                N: ObservationLock<Peripheral = NP>,
             {
                 comp.comparator(positive_input, negative_input, config, clocks)
             }

src/observable.rs

@@ -1,9 +1,8 @@
 use crate::Sealed;
 use core::marker::PhantomData;
 
-pub trait IntoObservationToken: Sized + crate::Sealed {
-    type Peripheral;
-    fn into_ot(self) -> ObservationToken<Self::Peripheral>;
+pub trait ObservationLock: Sized + crate::Sealed {
+    type Peripheral: Observable;
 }
 
 /// A struct to hold peripherals which are to be observed.
@@ -16,7 +15,7 @@ pub struct Observed<P, const OBSERVER_COUNT: usize> {
     peripheral: P,
 }
 
-impl<P, const OBSERVER_COUNT: usize> Observed<P, OBSERVER_COUNT> {
+impl<P: Observable, const OBSERVER_COUNT: usize> Observed<P, OBSERVER_COUNT> {
     /// Release the observation of this peripheral
     ///
     /// This returns the underlaying perpheral type. Since it is no longer
@@ -46,20 +45,13 @@ pub trait Observable: Sized {
     }
 }
 
-impl<P: Observable + Sealed> IntoObservationToken for P {
+impl<P: Observable + Sealed> ObservationLock for P {
     type Peripheral = P;
-    fn into_ot(self) -> ObservationToken<Self::Peripheral> {
-        let (_peripheral, [ot]) = self.observe();
-        ot
-    }
 }
 
 impl<P: Observable + Sealed> Sealed for ObservationToken<P> {}
-impl<P: Observable + Sealed> IntoObservationToken for ObservationToken<P> {
+impl<P: Observable + Sealed> ObservationLock for ObservationToken<P> {
     type Peripheral = P;
-    fn into_ot(self) -> Self {
-        self
-    }
 }
 
 impl<P, const N: usize> AsRef<P> for Observed<P, N> {