Merge d81b445085 into 7070810621

Limit setting the year to the 20th centure.
Generate an error for all date/time read functions when the century bit is set.

src/ds323x/datetime.rs

@@ -1,6 +1,8 @@
 //! Common implementation
 
-use super::{decimal_to_packed_bcd, hours_to_register, packed_bcd_to_decimal};
+use super::{
+    decimal_to_packed_bcd, hours_to_register, packed_bcd_to_decimal, some_or_invalid_error,
+};
 use crate::{
     interface::{ReadData, WriteData},
     BitFlags, DateTimeAccess, Datelike, Ds323x, Error, Hours, NaiveDate, NaiveDateTime, NaiveTime,
@@ -25,17 +27,14 @@ where
         let year = 2000 + (packed_bcd_to_decimal(data[Register::YEAR as usize + 1]) as u16);
         let month = packed_bcd_to_decimal(data[Register::MONTH as usize + 1]);
         let day = packed_bcd_to_decimal(data[Register::DOM as usize + 1]);
-        let hour = get_h24(hours_from_register(data[Register::HOURS as usize + 1]));
+        let hour = hours_from_register(data[Register::HOURS as usize + 1]);
         let minute = packed_bcd_to_decimal(data[Register::MINUTES as usize + 1]);
         let second = packed_bcd_to_decimal(data[Register::SECONDS as usize + 1]);
 
-        let date = NaiveDate::from_ymd_opt(year.into(), month.into(), day.into())
+        let date = NaiveDate::from_ymd_opt(year.into(), month.into(), day.into());
-            .ok_or(Error::InvalidDeviceState)?;
+        let date = some_or_invalid_error(date)?;
-        let time = NaiveTime::from_hms_opt(hour.into(), minute.into(), second.into())
+        let datetime = date.and_hms_opt(get_h24(hour).into(), minute.into(), second.into());
-            .ok_or(Error::InvalidDeviceState)?;
+        some_or_invalid_error(datetime)
-        let datetime = NaiveDateTime::new(date, time);
-
-        Ok(datetime)
     }
 
     fn set_datetime(&mut self, datetime: &NaiveDateTime) -> Result<(), Self::Error> {
@@ -105,12 +104,12 @@ where
         let mut data = [0; 4];
         self.iface.read_data(&mut data)?;
 
-        let hour = get_h24(hours_from_register(data[Register::HOURS as usize + 1]));
+        let hour = hours_from_register(data[Register::HOURS as usize + 1]);
         let minute = packed_bcd_to_decimal(data[Register::MINUTES as usize + 1]);
         let second = packed_bcd_to_decimal(data[Register::SECONDS as usize + 1]);
 
-        NaiveTime::from_hms_opt(hour.into(), minute.into(), second.into())
+        let time = NaiveTime::from_hms_opt(get_h24(hour).into(), minute.into(), second.into());
-            .ok_or(Error::InvalidDeviceState)
+        some_or_invalid_error(time)
     }
 
     fn weekday(&mut self) -> Result<u8, Self::Error> {
@@ -173,9 +172,8 @@ where
             2000 + (packed_bcd_to_decimal(data[Register::YEAR as usize + 1 - offset]) as u16);
         let month = packed_bcd_to_decimal(data[Register::MONTH as usize + 1 - offset]);
         let day = packed_bcd_to_decimal(data[Register::DOM as usize + 1 - offset]);
-
+        let date = NaiveDate::from_ymd_opt(year.into(), month.into(), day.into());
-        NaiveDate::from_ymd_opt(year.into(), month.into(), day.into())
+        some_or_invalid_error(date)
-            .ok_or(Error::InvalidDeviceState)
     }
 
     fn set_seconds(&mut self, seconds: u8) -> Result<(), Self::Error> {

src/ds323x/mod.rs

@@ -28,10 +28,34 @@ fn hours_to_register<E>(hours: Hours) -> Result<u8, Error<E>> {
     }
 }
 
+fn some_or_invalid_error<T, E>(data: Option<T>) -> Result<T, Error<E>> {
+    if let Some(data) = data {
+        Ok(data)
+    } else {
+        Err(Error::InvalidDeviceState)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn if_some_then_get_inner() {
+        match some_or_invalid_error::<u8, ()>(Some(1)) {
+            Ok(1) => (),
+            _ => panic!(),
+        }
+    }
+
+    #[test]
+    fn if_none_then_error() {
+        match some_or_invalid_error::<u8, ()>(None) {
+            Err(Error::InvalidDeviceState) => (),
+            _ => panic!(),
+        }
+    }
+
     #[test]
     fn can_convert_packed_bcd_to_decimal() {
         assert_eq!(0, packed_bcd_to_decimal(0b0000_0000));