diff --git a/satrs-core/Cargo.toml b/satrs-core/Cargo.toml index b45f8b9..776995e 100644 --- a/satrs-core/Cargo.toml +++ b/satrs-core/Cargo.toml @@ -56,7 +56,7 @@ optional = true # version = "0.5.2" # path = "../spacepackets" git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git" -rev = "cfa5f8099c95389628440a1611766e3b178fcdb3" +rev = "7aa3432f167d3b5d888a4aa0606780188d74f567" default-features = false diff --git a/satrs-example/Cargo.toml b/satrs-example/Cargo.toml index 8bde559..66f7244 100644 --- a/satrs-example/Cargo.toml +++ b/satrs-example/Cargo.toml @@ -7,7 +7,7 @@ default-run = "satrs-example" [dependencies] crossbeam-channel = "0.5" -delegate = "0.8" +delegate = "0.9" zerocopy = "0.6" csv = "1" diff --git a/satrs-example/src/pus.rs b/satrs-example/src/pus.rs index 6f9a9ec..68774fa 100644 --- a/satrs-example/src/pus.rs +++ b/satrs-example/src/pus.rs @@ -190,13 +190,14 @@ impl PusReceiver { .send(RequestWithToken(Request::HkRequest(request), token)) .unwrap_or_else(|_| panic!("Sending HK request {request:?} failed")); }; - if PusPacket::subservice(pus_tc) == hk::Subservice::TcEnableGeneration as u8 { + if PusPacket::subservice(pus_tc) == hk::Subservice::TcEnableHkGeneration as u8 { send_request(HkRequest::Enable(addressable_id)); - } else if PusPacket::subservice(pus_tc) == hk::Subservice::TcDisableGeneration as u8 { + } else if PusPacket::subservice(pus_tc) == hk::Subservice::TcDisableHkGeneration as u8 { send_request(HkRequest::Disable(addressable_id)); } else if PusPacket::subservice(pus_tc) == hk::Subservice::TcGenerateOneShotHk as u8 { send_request(HkRequest::OneShot(addressable_id)); - } else if PusPacket::subservice(pus_tc) == hk::Subservice::TcModifyCollectionInterval as u8 + } else if PusPacket::subservice(pus_tc) + == hk::Subservice::TcModifyHkCollectionInterval as u8 { if user_data.len() < 12 { self.update_time_stamp();