Added set_date & get_date for the RTC, now work on an ergonomic API for setting and getting time

Author: MabezDev

examples/rtc.rs

@@ -20,6 +20,7 @@ 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::*;
 use rt::ExceptionFrame;
@@ -51,13 +52,16 @@ 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 time = Time::new(21, 57, 32, false);
+    let date = Date::new(1, 24, 4, 2018);
     rtc.set_time(&time);
+    rtc.set_date(&date);
 
     timer.delay_ms(1000_u32);
     timer.delay_ms(1000_u32);
     timer.delay_ms(1000_u32);
 
     let _time = rtc.get_time();
+    let _date = rtc.get_date();
 
 
     writeln!(hstdout, "Good bye!").unwrap();

src/rtc.rs

@@ -24,6 +24,25 @@ impl Time {
     }
 }
 
+#[derive(Clone,Copy,Debug)]
+pub struct Date {
+    day: u8,
+    date: u8,
+    month: u8,
+    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
@@ -84,6 +103,7 @@ impl Rtc {
             }
             init_mode(&rtc, false);
 
+            // TODO configuration for output pins
             rtc.or.modify(|_, w| {
                 w.rtc_alarm_type()
                     .clear_bit()
@@ -138,7 +158,6 @@ impl Rtc {
             {
                 let timer = self.rtc.tr.read();
                 let cr = self.rtc.cr.read();
-                let ht = timer.ht().bits();
                 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())),
@@ -150,6 +169,53 @@ impl Rtc {
 
         time
     }
+
+    pub fn set_date(&self, date: &Date){
+        write_protection(&self.rtc, false);
+        {
+            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);
+
+                self.rtc.dr.write(|w| unsafe {
+                    w.dt().bits(dt)
+                        .du().bits(du)
+                        .mt().bit(mt > 0)
+                        .mu().bits(mu)
+                        .yt().bits(yt)
+                        .yu().bits(yu)
+                        .wdu().bits(date.day)
+                });
+
+
+            }
+            init_mode(&self.rtc, false);
+        }
+        write_protection(&self.rtc, true);
+    }
+
+    pub fn get_date(&self) -> Date {
+        let date;
+        write_protection(&self.rtc, false);
+        {
+            init_mode(&self.rtc, true);
+            {
+                let dater = self.rtc.dr.read();
+                let (yt, yu) = (dater.yt().bits(), dater.yu().bits());
+                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,
+                                );
+            }
+            init_mode(&self.rtc, false);
+        }
+        write_protection(&self.rtc, true);
+        
+        date
+    }
 
 }