both embedded-hals for Qei

Author: burrbull

src/qei.rs

@@ -1,10 +1,5 @@
 //! # Quadrature Encoder Interface
-use crate::{
-    hal::{self, Direction},
-    pac::RCC,
-    rcc,
-    timer::General,
-};
+use crate::{pac::RCC, rcc, timer::General};
 
 pub trait Pins<TIM> {}
 use crate::timer::{CPin, C1, C2};
@@ -48,22 +43,39 @@ impl<TIM: Instance, PINS> Qei<TIM, PINS> {
     }
 }
 
-impl<TIM: Instance, PINS> hal::Qei for Qei<TIM, PINS> {
+impl<TIM: Instance, PINS> embedded_hal::Qei for Qei<TIM, PINS> {
     type Count = TIM::Width;
 
     fn count(&self) -> Self::Count {
         self.tim.read_count() as Self::Count
     }
 
-    fn direction(&self) -> Direction {
+    fn direction(&self) -> embedded_hal::Direction {
         if self.tim.read_direction() {
-            hal::Direction::Upcounting
+            embedded_hal::Direction::Upcounting
         } else {
-            hal::Direction::Downcounting
+            embedded_hal::Direction::Downcounting
         }
     }
 }
 
+impl<TIM: Instance, PINS> embedded_hal_one::qei::blocking::Qei for Qei<TIM, PINS> {
+    type Error = core::convert::Infallible;
+    type Count = TIM::Width;
+
+    fn count(&self) -> Result<Self::Count, Self::Error> {
+        Ok(self.tim.read_count() as Self::Count)
+    }
+
+    fn direction(&self) -> Result<embedded_hal_one::qei::Direction, Self::Error> {
+        Ok(if self.tim.read_direction() {
+            embedded_hal_one::qei::Direction::Upcounting
+        } else {
+            embedded_hal_one::qei::Direction::Downcounting
+        })
+    }
+}
+
 pub trait Instance: crate::Sealed + rcc::Enable + rcc::Reset + General {
     fn setup_qei(&mut self);
 

src/rng.rs

@@ -23,13 +23,13 @@
 use core::cmp;
 use core::mem;
 
-use crate::hal::blocking::rng;
 use crate::pac;
 use crate::pac::RNG;
 use crate::rcc::{Clocks, Enable, Reset};
 use crate::time::U32Ext;
 use core::num::NonZeroU32;
 use core::ops::Shl;
+use embedded_hal::blocking::rng;
 use rand_core::RngCore;
 
 /// Random number generator specific errors

src/watchdog.rs

@@ -1,10 +1,10 @@
 //! Watchdog peripherals
 
 use crate::{
-    hal::watchdog::{Watchdog, WatchdogEnable},
     pac::{DBGMCU, IWDG},
     time::MilliSeconds,
 };
+use embedded_hal::watchdog::{Watchdog, WatchdogEnable};
 
 /// Wraps the Independent Watchdog (IWDG) peripheral
 pub struct IndependentWatchdog {