Merge pull request #49 from stm32-rs/debug-partial-eq-impls

Debug partial eq impls and pac compatability

Author: MabezDev

src/datetime.rs

@@ -1,35 +1,35 @@
 //! Date and timer units & helper functions
 
 /// Seconds
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Second(pub u32);
 
 /// Minutes
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Minute(pub u32);
 
 /// Hours
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Hour(pub u32);
 
 /// Day (1-7)
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Day(pub u32);
 
 /// Date (1-31)
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct DateInMonth(pub u32);
 
 /// Week (1-52)
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Week(pub u32);
 
 /// Month (1-12)
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Month(pub u32);
 
 /// Year
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Year(pub u32);
 
 /// Extension trait that adds convenience methods to the `u32` type
@@ -80,7 +80,7 @@ impl U32Ext for u32 {
     }
 }
 
-#[derive(Clone,Copy,Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Time {
     pub hours: u32,
     pub minutes: u32,
@@ -99,7 +99,7 @@ impl Time {
     }
 }
 
-#[derive(Clone,Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Date {
     pub day: u32,
     pub date: u32,

src/gpio.rs

@@ -1,6 +1,6 @@
 //! General Purpose Input / Output
 
-// Based on (ripped)
+// Based on
 // https://github.com/japaric/stm32f30x-hal/blob/master/src/gpio.rs
 
 use core::marker::PhantomData;

src/lib.rs

@@ -24,22 +24,25 @@ pub use embedded_hal as hal;
 
 pub use stm32l4;
 #[cfg(feature = "stm32l4x1")]
-pub use stm32l4::stm32l4x1 as stm32;
+pub use stm32l4::stm32l4x1 as pac;
 
 #[cfg(feature = "stm32l4x2")]
-pub use stm32l4::stm32l4x2 as stm32;
+pub use stm32l4::stm32l4x2 as pac;
 
 #[cfg(feature = "stm32l4x3")]
-pub use stm32l4::stm32l4x3 as stm32;
+pub use stm32l4::stm32l4x3 as pac;
 
 #[cfg(feature = "stm32l4x5")]
-pub use stm32l4::stm32l4x5 as stm32;
+pub use stm32l4::stm32l4x5 as pac;
 
 #[cfg(feature = "stm32l4x6")]
-pub use stm32l4::stm32l4x6 as stm32;
+pub use stm32l4::stm32l4x6 as pac;
 
 #[cfg(feature = "rt")]
-pub use self::stm32::interrupt;
+pub use self::pac::interrupt;
+
+pub use crate::pac as device;
+pub use crate::pac as stm32;
 
 pub mod datetime;
 #[cfg(any(

src/tsc.rs

@@ -12,15 +12,15 @@ use crate::stm32::{TSC};
 use crate::gpio::gpiob::{PB4, PB5, PB6, PB7};
 use crate::gpio::{AF9, Alternate, Output, OpenDrain, PushPull};
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Event {
     /// Max count error
     MaxCountError,
     /// End of acquisition
     EndOfAcquisition
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Error {
     /// Max count error
     MaxCountError,
@@ -70,21 +70,20 @@ impl ChannelPin<TSC> for PB7<Alternate<AF9, Output<PushPull>>> {
     const OFFSET: u32 = 3;
 }
 
-
 pub struct Tsc<SPIN> {
     sample_pin: SPIN,
     tsc: TSC
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Config {
     pub clock_prescale: Option<ClockPrescaler>,
     pub max_count_error: Option<MaxCountError>,
     pub charge_transfer_high: Option<ChargeDischargeTime>,
     pub charge_transfer_low: Option<ChargeDischargeTime>,
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum ClockPrescaler {
     Hclk = 0b000,
     HclkDiv2 = 0b001,
@@ -96,7 +95,7 @@ pub enum ClockPrescaler {
     HclkDiv128 = 0b111,
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum MaxCountError {
     /// 000: 255
     U255 = 000,
@@ -114,7 +113,7 @@ pub enum MaxCountError {
     U16383 = 110
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 /// How many tsc cycles are spent charging / discharging
 pub enum ChargeDischargeTime {
     C1 = 0b0000,