kirbylife
/
ds323x-rs
mirror of https://github.com/eldruin/ds323x-rs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract hour conversion

pull/4/head
Diego Barrios Romero 2018-10-28 18:17:05 +01:00
parent 16c4b46843
commit e4ab20df20
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ds323x/datetime.rs
View File

@ -32,19 +32,7 @@ where
/// Read the hours. /// Read the hours.
pub fn get_hours(&mut self) -> Result<Hours, Error<E>> { pub fn get_hours(&mut self) -> Result<Hours, Error<E>> {
let data = self.iface.read_register(Register::HOURS)?; let data = self.iface.read_register(Register::HOURS)?;
self.get_hours_from_register(data) Ok(hours_from_register(data))
}
fn get_hours_from_register(&self, data: u8) -> Result<Hours, Error<E>> {
if is_24h_format(data) {
Ok(Hours::H24(packed_bcd_to_decimal(data & !BitFlags::H24_H12)))
}
else if is_am(data) {
Ok(Hours::AM(packed_bcd_to_decimal(data & !(BitFlags::H24_H12 | BitFlags::AM_PM))))
}
else {
Ok(Hours::PM(packed_bcd_to_decimal(data & !(BitFlags::H24_H12 | BitFlags::AM_PM))))
}
} }
/// Read the day of the week [1-7]. /// Read the day of the week [1-7].
@ -185,6 +173,17 @@ where
} }
} }
fn hours_from_register(data: u8) -> Hours {
if is_24h_format(data) {
Hours::H24(packed_bcd_to_decimal(data & !BitFlags::H24_H12))
}
else if is_am(data) {
Hours::AM(packed_bcd_to_decimal(data & !(BitFlags::H24_H12 | BitFlags::AM_PM)))
}
else {
Hours::PM(packed_bcd_to_decimal(data & !(BitFlags::H24_H12 | BitFlags::AM_PM)))
}
}
fn is_24h_format(hours_data: u8) -> bool { fn is_24h_format(hours_data: u8) -> bool {
hours_data & BitFlags::H24_H12 == 0 hours_data & BitFlags::H24_H12 == 0
} }