rust/spacepackets
5
1
Fork 0
Code Issues Pull Requests Projects Releases 27 Wiki Activity

use proper UnixTimestamp ctor
All checks were successful
Rust/spacepackets/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-05 18:58:32 +01:00
parent ac2936460f
commit 8cf6f72cf3
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/time/cds.rs
View File

@ -577,15 +577,14 @@ impl<ProvidesDaysLen: ProvidesDaysLength> TimeProvider<ProvidesDaysLen> {
} }
#[inline] #[inline]
fn calc_unix_seconds(&mut self, unix_days_seconds: i64, ms_of_day: u32) { fn calc_unix_seconds(&mut self, mut unix_days_seconds: i64, ms_of_day: u32) {
self.unix_stamp.unix_seconds = unix_days_seconds;
self.unix_stamp.subsecond_millis = Some((ms_of_day % 1000) as u16);
let seconds_of_day = (ms_of_day / 1000) as i64; let seconds_of_day = (ms_of_day / 1000) as i64;
if self.unix_stamp.unix_seconds < 0 { if unix_days_seconds < 0 {
self.unix_stamp.unix_seconds -= seconds_of_day; unix_days_seconds -= seconds_of_day;
} else { } else {
self.unix_stamp.unix_seconds += seconds_of_day; unix_days_seconds += seconds_of_day;
} }
self.unix_stamp = UnixTimestamp::const_new(unix_days_seconds, (ms_of_day % 1000) as u16);
} }
fn calc_date_time(&self, ns_since_last_second: u32) -> Option<DateTime<Utc>> { fn calc_date_time(&self, ns_since_last_second: u32) -> Option<DateTime<Utc>> {
@ -1319,12 +1318,9 @@ mod tests {
(DAYS_CCSDS_TO_UNIX * SECONDS_PER_DAY as i32) as i64 (DAYS_CCSDS_TO_UNIX * SECONDS_PER_DAY as i32) as i64
); );
let subsecond_millis = unix_stamp.subsecond_millis; let subsecond_millis = unix_stamp.subsecond_millis;
assert!(subsecond_millis.is_some()); assert!(subsecond_millis.is_none());
assert_eq!(subsecond_millis.unwrap(), 0);
assert_eq!(time_stamper.submillis_precision(), None); assert_eq!(time_stamper.submillis_precision(), None);
assert!(time_stamper.subsecond_millis().is_some()); assert!(time_stamper.subsecond_millis().is_none());
assert_eq!(time_stamper.subsecond_millis().unwrap(), 0);
assert_eq!(time_stamper.ccdsd_time_code(), CcsdsTimeCodes::Cds); assert_eq!(time_stamper.ccdsd_time_code(), CcsdsTimeCodes::Cds);
assert_eq!( assert_eq!(
time_stamper.p_field(), time_stamper.p_field(),