diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs index e198af0..9999152 100644 --- a/satrs-example/src/main.rs +++ b/satrs-example/src/main.rs @@ -22,7 +22,7 @@ use satrs_core::pus::verification::{ use satrs_core::pus::{EcssTmError, EcssTmSender}; use satrs_core::seq_count::SimpleSeqCountProvider; use satrs_core::tmtc::CcsdsError; -use satrs_example::{OBSW_SERVER_ADDR, RequestTargetId, SERVER_PORT}; +use satrs_example::{RequestTargetId, OBSW_SERVER_ADDR, SERVER_PORT}; use spacepackets::time::cds::TimeProvider; use spacepackets::time::TimeWriter; use spacepackets::tm::PusTm; diff --git a/satrs-example/src/pus.rs b/satrs-example/src/pus.rs index 9772ccb..2c8bb84 100644 --- a/satrs-example/src/pus.rs +++ b/satrs-example/src/pus.rs @@ -48,7 +48,7 @@ impl PusReceiver { verif_reporter, event_request_tx, request_map, - stamper: TimeProvider::default(), + stamper: TimeProvider::new_with_u16_days(0, 0), time_stamp: [0; 7], } } diff --git a/satrs-example/src/requests.rs b/satrs-example/src/requests.rs index 64bbee4..2ae2d21 100644 --- a/satrs-example/src/requests.rs +++ b/satrs-example/src/requests.rs @@ -1,6 +1,10 @@ use crate::hk::HkRequest; +use satrs_core::pus::verification::{TcStateAccepted, VerificationToken}; #[derive(Copy, Clone, Eq, PartialEq, Debug)] pub enum Request { HkRequest(HkRequest), } + +#[derive(Copy, Clone, Eq, PartialEq, Debug)] +struct RequestWithToken(Request, VerificationToken); diff --git a/spacepackets b/spacepackets index 83e2cad..9b091e3 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit 83e2cad75377969b1e74379acff2c0dcf858d4cf +Subproject commit 9b091e3a3a6f599b093c96327751bcf1bc911ca1