Merge pull request #162 from systec-ms/rewrite_rtc

RTC: Rewritten

Author: hannobraun

Cargo.toml

@@ -20,7 +20,6 @@ cortex-m = "0.7"
 cortex-m-rt = ">=0.6.15, <0.8"
 embedded-time = "0.12.0"
 nb = "1.0"
-rtcc = "0.2"
 stm32f7 = "0.14.0"
 micromath = "2.0"
 synopsys-usb-otg = { version = "0.2.3", features = ["cortex-m"], optional = true }
@@ -29,6 +28,10 @@ rand_core = "0.6"
 bxcan = "0.6"
 bare-metal = "1.0"
 
+[dependencies.time]
+version = "0.3"
+default-features = false
+
 [dependencies.cast]
 default-features = false
 version = "0.3.0"
@@ -53,6 +56,11 @@ embedded-graphics = "0.6.1"
 usb-device = "0.2.5"
 usbd-serial = "0.1.0"
 
+[dev-dependencies.time]
+version = "0.3"
+default-features = false
+features = ["macros"]
+
 [features]
 device-selected = []
 ltdc = []

examples/rtc.rs

@@ -9,12 +9,15 @@ extern crate panic_halt as _;
 use cortex_m_rt::entry;
 
 use cortex_m_semihosting::hprintln;
-use rtcc::{Hours, NaiveDate, NaiveTime, Rtcc};
 use stm32f7xx_hal::{
     pac,
     prelude::*,
     rtc::{Rtc, RtcClock},
 };
+use time::{
+    macros::{date, time},
+    PrimitiveDateTime,
+};
 
 #[entry]
 fn main() -> ! {
@@ -34,21 +37,19 @@ fn main() -> ! {
     )
     .unwrap();
 
-    rtc.set_24h_fmt();
-    rtc.set_time(&NaiveTime::from_hms(12, 30, 00)).unwrap();
-    rtc.set_date(&NaiveDate::from_ymd(2021, 11, 25)).unwrap();
+    rtc.set_datetime(&PrimitiveDateTime::new(date!(2019 - 01 - 01), time!(23:59)))
+        .unwrap();
+    // Alternatively:
+    // rtc.set_date(&date!(2019 - 01 - 01)).unwrap();
+    // rtc.set_time(&time!(23:59)).unwrap();
+    // Or:
+    // rtc.set_year(2019).unwrap();
+    // rtc.set_month(12).unwrap();
+    // rtc.set_day(31).unwrap();
+    // rtc.set_hours(23).unwrap();
+    // rtc.set_minutes(59).unwrap();
+    // rtc.set_seconds(59).unwrap();
     loop {
-        if let Hours::H24(h) = rtc.get_hours().unwrap() {
-            hprintln!(
-                "{}-{}-{} {}:{}:{}",
-                rtc.get_year().unwrap(),
-                rtc.get_month().unwrap(),
-                rtc.get_day().unwrap(),
-                h,
-                rtc.get_minutes().unwrap(),
-                rtc.get_seconds().unwrap()
-            )
-            .unwrap();
-        }
+        hprintln!("{}", rtc.get_datetime()).unwrap();
     }
 }