Replace Date and Time types with time crate. (#310)

Author: reitermarkus

Cargo.toml

@@ -57,6 +57,10 @@ version = "0.2.4"
 features = ["cortex-m", "fs"]
 optional = true
 
+[dependencies.time]
+version = "0.3"
+default-features = false
+
 [package.metadata.docs.rs]
 features = ["rt", "stm32l432", "stm32-usbd"]
 

examples/rtc.rs

@@ -11,15 +11,16 @@ extern crate panic_semihosting;
 extern crate stm32l4xx_hal as hal;
 // #[macro_use(block)]
 // extern crate nb;
+use time::{Date, Time};
 
-use crate::hal::datetime::{Date, Time};
 use crate::hal::delay::Delay;
 use crate::hal::prelude::*;
 use crate::hal::rcc::{ClockSecuritySystem, CrystalBypass};
 use crate::hal::rtc::{Rtc, RtcClockSource, RtcConfig};
 use crate::rt::ExceptionFrame;
 
 use crate::sh::hio;
+use core::convert::TryInto;
 use core::fmt::Write;
 
 #[entry]
@@ -51,19 +52,19 @@ fn main() -> ! {
         RtcConfig::default().clock_config(RtcClockSource::LSE),
     );
 
-    let time = Time::new(21.hours(), 57.minutes(), 32.secs(), 0.micros(), false);
-    let date = Date::new(1.day(), 24.date(), 4.month(), 2018.year());
+    let time = Time::from_hms(21, 57, 32).unwrap();
+    let date = Date::from_calendar_date(2018, 4.try_into().unwrap(), 24).unwrap();
 
-    rtc.set_date_time(date, time);
+    rtc.set_datetime(&date.with_time(time));
 
     timer.delay_ms(1000_u32);
     timer.delay_ms(1000_u32);
     timer.delay_ms(1000_u32);
 
-    let (rtc_date, rtc_time) = rtc.get_date_time();
+    let rtc_datetime = rtc.get_datetime();
 
-    writeln!(hstdout, "Time: {:?}", rtc_time).unwrap();
-    writeln!(hstdout, "Date: {:?}", rtc_date).unwrap();
+    writeln!(hstdout, "Time: {:?}", rtc_datetime.time()).unwrap();
+    writeln!(hstdout, "Date: {:?}", rtc_datetime.date()).unwrap();
     writeln!(hstdout, "Good bye!").unwrap();
     loop {
         continue;

examples/rtc_alarm.rs

@@ -10,15 +10,15 @@ extern crate cortex_m_semihosting as sh;
 extern crate panic_semihosting;
 extern crate stm32l4xx_hal as hal;
 
-use crate::hal::datetime::{Date, Time};
 use crate::hal::prelude::*;
 use crate::hal::rcc::{ClockSecuritySystem, CrystalBypass};
 use crate::hal::rtc::{Event, Rtc, RtcClockSource, RtcConfig};
 use crate::rt::ExceptionFrame;
 use cortex_m::interrupt::{free, Mutex};
+use time::{Date, Time};
 
 use crate::sh::hio;
-use core::{cell::RefCell, fmt::Write, ops::DerefMut};
+use core::{cell::RefCell, convert::TryInto, fmt::Write, ops::DerefMut};
 use hal::interrupt;
 use hal::pac;
 use pac::NVIC;
@@ -51,10 +51,10 @@ fn main() -> ! {
         RtcConfig::default().clock_config(RtcClockSource::LSE),
     );
 
-    let time = Time::new(21.hours(), 57.minutes(), 32.secs(), 0.micros(), false);
-    let date = Date::new(1.day(), 24.date(), 4.month(), 2018.year());
+    let time = Time::from_hms(21, 57, 32).unwrap();
+    let date = Date::from_calendar_date(2018, 4.try_into().unwrap(), 24).unwrap();
 
-    rtc.set_date_time(date, time);
+    rtc.set_datetime(&date.with_time(time));
 
     // Set alarm A for 1 minute
     // let alarm_time = Time::new(21.hours(), 57.minutes(), 37.secs(), 0.micros(), false);

src/datetime.rs

@@ -44,7 +44,7 @@ This crate requires one of the following features enabled:
     stm32l431, stm32l451, stm32l471
     stm32l412, stm32l422, stm32l432, stm32l442, stm32l452, stm32l462
     stm32l433, stm32l443
-    stm32l475, 
+    stm32l475,
     stm32l476, stm32l486, stm32l496, stm32l4a6
     stm32l4r9, stm32l4s9
 "
@@ -127,7 +127,6 @@ pub mod adc;
 #[cfg(not(any(feature = "stm32l412",)))]
 pub mod can;
 pub mod crc;
-pub mod datetime;
 pub mod delay;
 pub mod dma;
 pub mod dmamux;

src/lib.rs

@@ -4,7 +4,6 @@ pub use crate::hal::digital::v2::*;
 pub use crate::hal::prelude::*; // embedded hal traits // for some reason v2 is not exported in the ehal prelude
 
 pub use crate::crc::CrcExt as _stm32l4_hal_CrcExt;
-pub use crate::datetime::U32Ext as _stm32l4_hal_datetime_U32Ext;
 pub use crate::dma::DmaExt as _stm32l4_hal_DmaExt;
 pub use crate::flash::FlashExt as _stm32l4_hal_FlashExt;
 pub use crate::gpio::ExtiPin as _stm32l4_hal_ExtiPin;