Added datetime back, this time with a nice type cehcking on Date & time objects, simply use 1.seconds() to convert an into the 'Seconds type etc'

Author: MabezDev

examples/rtc.rs

@@ -19,9 +19,8 @@ use hal::stm32l4::stm32l4x2;
 
 use hal::delay::Delay;
 use hal::rtc::Rtc;
-use hal::rtc::Time;
-use hal::rtc::Date;
 use hal::pwr::Pwr;
+use hal::datetime::{Date,Time};
 use rt::ExceptionFrame;
 
 use core::fmt::Write;
@@ -51,8 +50,8 @@ fn main() -> ! {
     let mut pwr = Pwr::pwr(&mut rcc.apb1r1);
     let rtc = Rtc::rtc(dp.RTC, &mut rcc.apb1r1, &mut rcc.bdcr, &mut pwr.cr1);
 
-    let mut time = Time::new(21, 57, 32, false);
-    let mut date = Date::new(1, 24, 4, 2018);
+    let mut time = Time::new(21.hours(), 57.minutes(), 32.seconds(), false);
+    let mut date = Date::new(1.day(), 24.date(), 4.month(), 2018.year());
 
     rtc.set_time(&time);
     rtc.set_date(&date);

src/datetime.rs

@@ -1,74 +1,74 @@
 /// Date and timer units & helper functions
 
 /// Seconds
-#[derive(Clone, Copy)]
-pub struct Seconds(pub u32);
+#[derive(Clone, Copy, Debug)]
+pub struct Second(pub u32);
 
 /// Minutes
-#[derive(Clone, Copy)]
-pub struct Minutes(pub u32);
+#[derive(Clone, Copy, Debug)]
+pub struct Minute(pub u32);
 
 /// Hours
-#[derive(Clone, Copy)]
-pub struct Hours(pub u32);
+#[derive(Clone, Copy, Debug)]
+pub struct Hour(pub u32);
 
 /// Day (1-7)
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct Day(pub u32);
 
 /// Date (1-31)
-#[derive(Clone, Copy)]
-pub struct Date(pub u32);
+#[derive(Clone, Copy, Debug)]
+pub struct DateInMonth(pub u32);
 
 /// Week (1-52)
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct Week(pub u32);
 
 /// Month (1-12)
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct Month(pub u32);
 
 /// Year
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct Year(pub u32);
 
 /// Extension trait that adds convenience methods to the `u32` type
 pub trait U32Ext {
     /// Seconds
-    fn seconds(self) -> Seconds;
+    fn seconds(self) -> Second;
     /// Minutes
-    fn minutes(self) -> Minutes;
+    fn minutes(self) -> Minute;
     /// Hours
-    fn hours(self) -> Hours;
+    fn hours(self) -> Hour;
     /// Day
     fn day(self) -> Day;
     /// Seconds
-    fn date(self) -> Date;
+    fn date(self) -> DateInMonth;
     /// Month
     fn month(self) -> Month;
     /// Year
     fn year(self) -> Year;
 }
 
 impl U32Ext for u32 {
-    fn seconds(self) -> Seconds {
-        Seconds(self)
+    fn seconds(self) -> Second {
+        Second(self)
     }
 
-    fn minutes(self) -> Minutes {
-        Minutes(self)
+    fn minutes(self) -> Minute {
+        Minute(self)
     }
 
-    fn hours(self) -> Hours {
-        Hours(self)
+    fn hours(self) -> Hour {
+        Hour(self)
     }
 
     fn day(self) -> Day {
         Day(self)
     }
 
-    fn date(self) -> Date {
-        Date(self)
+    fn date(self) -> DateInMonth {
+        DateInMonth(self)
     }
 
     fn month(self) -> Month {
@@ -80,32 +80,100 @@ impl U32Ext for u32 {
     }
 }
 
-impl Into<Seconds> for Minutes {
-    fn into(self) -> Seconds {
-        Seconds(self.0 * 60)
+#[derive(Clone,Copy,Debug)]
+pub struct Time {
+    pub hours: Hour,
+    pub minutes: Minute,
+    pub seconds: Second,
+    pub daylight_savings: bool
+}
+
+impl Time {
+    pub fn new(hours: Hour, minutes: Minute, seconds: Second, daylight_savings: bool) -> Self {
+        Self {
+            hours: hours,
+            minutes: minutes,
+            seconds: seconds,
+            daylight_savings: daylight_savings
+        }
+    }
+}
+
+#[derive(Clone,Copy, Debug)]
+pub struct Date {
+    pub day: Day,
+    pub date: DateInMonth,
+    pub month: Month,
+    pub year: Year,
+}
+
+impl Date {
+    pub fn new(day: Day, date: DateInMonth, month: Month, year: Year) -> Self {
+        Self {
+            day: day,
+            date: date,
+            month: month,
+            year: year
+        }
     }
 }
 
-impl Into<Seconds> for Hours {
-    fn into(self) -> Seconds {
-        Seconds(self.0 * 3600)
+impl Into<Second> for Minute {
+    fn into(self) -> Second {
+        Second(self.0 * 60)
     }
 }
 
-impl From <u32> for Seconds {
-    fn from(inner: u32) -> Seconds {
-        Seconds(inner)
+impl Into<Second> for Hour {
+    fn into(self) -> Second {
+        Second(self.0 * 3600)
     }
 }
 
-impl From <u32> for Minutes {
-    fn from(inner: u32) -> Minutes {
-        Minutes(inner)
+macro_rules! impl_from_struct {
+    ($(
+        $type:ident: [ $($to:ident),+ ],
+    )+) => {
+        $(
+            $(
+                impl From <$type> for $to {
+                    fn from(inner: $type) -> $to {
+                        inner.0 as $to
+                    }
+                }
+            )+
+        )+
     }
 }
 
-impl From <u32> for Hours {
-    fn from(inner: u32) -> Hours {
-        Hours(inner)
+macro_rules! impl_to_struct {
+    ($(
+        $type:ident: [ $($to:ident),+ ],
+    )+) => {
+        $(
+            $(
+                impl From <$type> for $to {
+                    fn from(inner: $type) -> $to {
+                        $to(inner as u32)
+                    }
+                }
+            )+
+        )+
     }
 }
+
+impl_from_struct!(
+    Hour: [u32, u16, u8],
+    Second: [u32, u16, u8],
+    Minute: [u32, u16, u8],
+    Day: [u32, u16, u8],
+    DateInMonth: [u32, u16, u8],
+    Month: [u32, u16, u8],
+    Year: [u32, u16, u8],
+);
+
+impl_to_struct!(
+    u32: [Hour, Minute, Second, Day, DateInMonth, Month, Year],
+    u16: [Hour, Minute, Second, Day, DateInMonth, Month, Year],
+    u8: [Hour, Minute, Second, Day, DateInMonth, Month, Year],
+);

src/lib.rs

@@ -24,7 +24,7 @@ pub mod timer;
 pub mod spi;
 pub mod rtc;
 pub mod pwr;
-// pub mod datetime;
+pub mod datetime;
 
 
 #[cfg(test)]

src/prelude.rs

@@ -5,5 +5,5 @@ pub use flash::FlashExt as _FlashExtHal;
 pub use gpio::GpioExt as _GpioExtHal;
 pub use hal::prelude::*; // embedded hal traits
 pub use time::U32Ext as _stm32f30x_hal_time_U32Ext;
-// pub use datetime::U32Ext as _stm32f30x_hal_datetime;
+pub use datetime::U32Ext as _stm32f30x_hal_datetime;
 pub use dma::DmaExt as _DmaExtHal;

src/rtc.rs

@@ -1,48 +1,10 @@
 /// RTC peripheral abstraction
 
-// use datetime::*;
+use datetime::*;
 use rcc::{BDCR, APB1R1};
 use pwr;
 use stm32l4::stm32l4x2::{RTC};
 
-#[derive(Clone,Copy,Debug)]
-pub struct Time {
-    pub hours: u8,
-    pub minutes: u8,
-    pub seconds: u8,
-    pub daylight_savings: bool
-}
-
-impl Time {
-    pub fn new(hours: u8, minutes: u8, seconds: u8, daylight_savings: bool) -> Self {
-        Self {
-            hours: hours,
-            minutes: minutes,
-            seconds: seconds,
-            daylight_savings: daylight_savings
-        }
-    }
-}
-
-#[derive(Clone,Copy,Debug)]
-pub struct Date {
-    pub day: u8,
-    pub date: u8,
-    pub month: u8,
-    pub year: u16,
-}
-
-impl Date {
-    pub fn new(day: u8, date: u8, month: u8, year: u16) -> Self {
-        Self {
-            day: day,
-            date: date,
-            month: month,
-            year: year
-        }
-    }
-}
-
 /// RTC Abstraction
 pub struct Rtc {
     rtc: RTC
@@ -124,9 +86,10 @@ impl Rtc {
         {
             init_mode(&self.rtc, true);
             {
-                let (ht, hu) = byte_to_bcd2(time.hours);
-                let (mnt, mnu) = byte_to_bcd2(time.minutes);
-                let (st, su) = byte_to_bcd2(time.seconds);
+                
+                let (ht, hu) = byte_to_bcd2(time.hours.into());
+                let (mnt, mnu) = byte_to_bcd2(time.minutes.into());
+                let (st, su) = byte_to_bcd2(time.seconds.into());
                 self.rtc.tr.write(|w| unsafe {
                     w.ht().bits(ht)
                         .hu().bits(hu)
@@ -155,9 +118,9 @@ impl Rtc {
 
         let timer = self.rtc.tr.read();
         let cr = self.rtc.cr.read();
-        time = Time::new(bcd2_to_byte((timer.ht().bits(), timer.hu().bits())), 
-                        bcd2_to_byte((timer.mnt().bits(), timer.mnu().bits())),
-                        bcd2_to_byte((timer.st().bits(), timer.su().bits())),
+        time = Time::new(bcd2_to_byte((timer.ht().bits(), timer.hu().bits())).into(), 
+                        bcd2_to_byte((timer.mnt().bits(), timer.mnu().bits())).into(),
+                        bcd2_to_byte((timer.st().bits(), timer.su().bits())).into(),
                         cr.fmt().bit());
 
         write_protection(&self.rtc, true);
@@ -170,9 +133,11 @@ impl Rtc {
         {
             init_mode(&self.rtc, true);
             {
-                let (dt, du) = byte_to_bcd2(date.date);
-                let (mt, mu) = byte_to_bcd2(date.month);
-                let (yt, yu) = byte_to_bcd2((date.year - 1970_u16) as u8);
+                let (dt, du) = byte_to_bcd2(date.date.into());
+                let (mt, mu) = byte_to_bcd2(date.month.into());
+                let yr: u16 = date.year.into();
+                let yr_offset = (yr - 1970_u16) as u8;
+                let (yt, yu) = byte_to_bcd2(yr_offset);
 
                 self.rtc.dr.write(|w| unsafe {
                     w.dt().bits(dt)
@@ -181,7 +146,7 @@ impl Rtc {
                         .mu().bits(mu)
                         .yt().bits(yt)
                         .yu().bits(yu)
-                        .wdu().bits(date.day)
+                        .wdu().bits(date.day.into())
                 });
 
 
@@ -195,10 +160,10 @@ impl Rtc {
         let date;
 
         let dater = self.rtc.dr.read();
-        date = Date::new(dater.wdu().bits(), 
-                        bcd2_to_byte((dater.dt().bits(), dater.du().bits())),
-                        bcd2_to_byte((dater.mt().bit() as u8, dater.mu().bits())),
-                        (bcd2_to_byte((dater.yt().bits(), dater.yu().bits())) as u16 + 1970_u16) as u16);
+        date = Date::new(dater.wdu().bits().into(), 
+                        bcd2_to_byte((dater.dt().bits(), dater.du().bits())).into(),
+                        bcd2_to_byte((dater.mt().bit() as u8, dater.mu().bits())).into(),
+                        (bcd2_to_byte((dater.yt().bits(), dater.yu().bits())) as u16 + 1970_u16).into());
         date
     }