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

Merge a9b15528c2 into c5fdd9057f

Paul Bender 2025-10-05 15:13:36 +00:00 committed by GitHub
parent c5fdd9057f a9b15528c2
commit 51e63c6c7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ds323x/datetime.rs
View File

@ -36,7 +36,7 @@ where
} }
fn set_datetime(&mut self, datetime: &NaiveDateTime) -> Result<(), Self::Error> { fn set_datetime(&mut self, datetime: &NaiveDateTime) -> Result<(), Self::Error> {
if datetime.year() < 2000 || datetime.year() > 2100 { if !(2000..=2199).contains(&datetime.year()) {
return Err(Error::InvalidInputData); return Err(Error::InvalidInputData);
} }
let (month, year) = month_year_to_registers(datetime.month() as u8, datetime.year() as u16); let (month, year) = month_year_to_registers(datetime.month() as u8, datetime.year() as u16);
@ -174,7 +174,7 @@ where
} }
fn set_year(&mut self, year: u16) -> Result<(), Self::Error> { fn set_year(&mut self, year: u16) -> Result<(), Self::Error> {
if !(2000..=2100).contains(&year) { if !(2000..=2199).contains(&year) {
return Err(Error::InvalidInputData); return Err(Error::InvalidInputData);
} }
let data = self.iface.read_register(Register::MONTH)?; let data = self.iface.read_register(Register::MONTH)?;
@ -197,7 +197,7 @@ where
} }
fn set_date(&mut self, date: &rtcc::NaiveDate) -> Result<(), Self::Error> { fn set_date(&mut self, date: &rtcc::NaiveDate) -> Result<(), Self::Error> {
if date.year() < 2000 || date.year() > 2100 { if !(2000..=2199).contains(&date.year()) {
return Err(Error::InvalidInputData); return Err(Error::InvalidInputData);
} }
let (month, year) = month_year_to_registers(date.month() as u8, date.year() as u16); let (month, year) = month_year_to_registers(date.month() as u8, date.year() as u16);

15
tests/common/mod.rs
View File

@ -57,21 +57,6 @@ impl BitFlags {
pub const WEEKDAY: u8 = 0b0100_0000; pub const WEEKDAY: u8 = 0b0100_0000;
} }
pub struct DummyOutputPin;
impl embedded_hal::digital::OutputPin for DummyOutputPin {
fn set_low(&mut self) -> Result<(), Self::Error> {
Ok(())
}
fn set_high(&mut self) -> Result<(), Self::Error> {
Ok(())
}
}
impl embedded_hal::digital::ErrorType for DummyOutputPin {
type Error = embedded_hal::digital::ErrorKind;
}
pub fn new_ds3231( pub fn new_ds3231(
transactions: &[I2cTrans], transactions: &[I2cTrans],
) -> Ds323x<interface::I2cInterface<I2cMock>, ic::DS3231> { ) -> Ds323x<interface::I2cInterface<I2cMock>, ic::DS3231> {