From 075dc3843467b41e3112b82a8d4130576cd3cb5d Mon Sep 17 00:00:00 2001 From: lkoester Date: Tue, 15 Aug 2023 08:49:54 +0200 Subject: [PATCH 1/8] first implementation of apid with target id, currently main broken --- satrs-core/src/tmtc/mod.rs | 35 +------------ satrs-example/Cargo.toml | 7 +++ satrs-example/src/lib.rs | 93 +++++++++++++++++++++++++++++++++ satrs-example/src/logger.rs | 22 ++++++++ satrs-example/src/main.rs | 22 ++++---- satrs-example/src/pus/action.rs | 11 ++-- satrs-example/src/pus/hk.rs | 38 +++++++------- satrs-example/src/requests.rs | 14 ++--- 8 files changed, 163 insertions(+), 79 deletions(-) create mode 100644 satrs-example/src/logger.rs diff --git a/satrs-core/src/tmtc/mod.rs b/satrs-core/src/tmtc/mod.rs index 5d5f306..03edbd7 100644 --- a/satrs-core/src/tmtc/mod.rs +++ b/satrs-core/src/tmtc/mod.rs @@ -10,6 +10,7 @@ use downcast_rs::{impl_downcast, Downcast}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; use spacepackets::{ByteConversionError, SizeMissmatch, SpHeader}; +use spacepackets::ecss::tc::PusTc; #[cfg(feature = "alloc")] pub mod ccsds_distrib; @@ -24,40 +25,6 @@ pub use pus_distrib::{PusDistributor, PusServiceProvider}; pub type TargetId = u32; -#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -pub struct AddressableId { - pub target_id: TargetId, - pub unique_id: u32, -} - -impl AddressableId { - pub fn from_raw_be(buf: &[u8]) -> Result { - if buf.len() < 8 { - return Err(ByteConversionError::FromSliceTooSmall(SizeMissmatch { - found: buf.len(), - expected: 8, - })); - } - Ok(Self { - target_id: u32::from_be_bytes(buf[0..4].try_into().unwrap()), - unique_id: u32::from_be_bytes(buf[4..8].try_into().unwrap()), - }) - } - - pub fn write_to_be_bytes(&self, buf: &mut [u8]) -> Result { - if buf.len() < 8 { - return Err(ByteConversionError::ToSliceTooSmall(SizeMissmatch { - found: buf.len(), - expected: 8, - })); - } - buf[0..4].copy_from_slice(&self.target_id.to_be_bytes()); - buf[4..8].copy_from_slice(&self.unique_id.to_be_bytes()); - Ok(8) - } -} - /// Generic trait for object which can receive any telecommands in form of a raw bytestream, with /// no assumptions about the received protocol. /// diff --git a/satrs-example/Cargo.toml b/satrs-example/Cargo.toml index 34d8491..5e6e72f 100644 --- a/satrs-example/Cargo.toml +++ b/satrs-example/Cargo.toml @@ -15,9 +15,16 @@ zerocopy = "0.6" csv = "1" num_enum = "0.6" thiserror = "1" +embedded-can = "0.4" +#socketcan = "2.0" +derive-new = "0.5" +num-traits = "0.2" +num-derive = "0.3" [dependencies.satrs-core] path = "../satrs-core" [dependencies.satrs-mib] path = "../satrs-mib" + + diff --git a/satrs-example/src/lib.rs b/satrs-example/src/lib.rs index ed2d226..4e76618 100644 --- a/satrs-example/src/lib.rs +++ b/satrs-example/src/lib.rs @@ -1,11 +1,102 @@ +use std::fmt; use num_enum::{IntoPrimitive, TryFromPrimitive}; use satrs_core::events::{EventU32TypedSev, SeverityInfo}; use satrs_core::objects::ObjectId; use std::net::Ipv4Addr; +use delegate::delegate; +use derive_new::new; +use thiserror::Error; +use satrs_core::spacepackets::{ByteConversionError, CcsdsPacket, SizeMissmatch}; +use satrs_core::spacepackets::ecss::PusPacket; +use satrs_core::spacepackets::ecss::tc::{GenericPusTcSecondaryHeader, IsPusTelecommand, PusTc}; +use satrs_core::tmtc::TargetId; use satrs_mib::res_code::{ResultU16, ResultU16Info}; use satrs_mib::resultcode; +//pub mod can; +//mod can_ids; +mod logger; + +pub type Apid = u16; + +#[derive(Debug, Error)] +pub enum TargetIdCreationError { + #[error("byte conversion")] + ByteConversion(#[from] ByteConversionError), + #[error("not enough app data to generate target ID")] + NotEnoughAppData(usize) +} + +// TODO: can these stay pub? +#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, new)] +pub struct TargetIdWithApid { + pub apid: Apid, + pub target: TargetId, +} + +impl fmt::Display for TargetIdWithApid { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "{}, {}", self.apid, self.target) + } +} + +impl TargetIdWithApid { + pub fn apid(&self) -> Apid { + self.apid + } + pub fn target_id(&self) -> TargetId{ + self.target + } +} + +impl TargetIdWithApid { + pub fn from_tc(tc: &(impl CcsdsPacket + PusPacket + IsPusTelecommand)) -> Result { + if tc.user_data().len() < 4 { + return Err(ByteConversionError::FromSliceTooSmall(SizeMissmatch { + found: tc.user_data().len(), + expected: 8, + }).into()); + } + let target_id = u32::from_be_bytes(tc.user_data()[0..4].try_into().unwrap()); + Ok(Self { + apid: tc.apid(), + target: u32::from_be_bytes(tc.user_data()[0..4].try_into().unwrap()), + }) + } +} + +// #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, new)] +// #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +// pub struct TargetIdWithUniqueId { +// target_id: TargetIdWithApid, +// unique_id: u32, +// } +// +// impl TargetIdWithUniqueId { +// delegate! { +// to self.target_id { +// pub fn apid(&self) -> Apid; +// pub fn target_id(&self) -> TargetId; +// } +// } +// pub fn unique_id(&self) -> u32 { +// self.unique_id +// } +// +// pub fn write_target_id_and_unique_id_as_pus_header(&self, buf: &mut [u8]) -> Result { +// if buf.len() < 8 { +// return Err(ByteConversionError::ToSliceTooSmall(SizeMissmatch { +// found: buf.len(), +// expected: 8, +// })); +// } +// buf[0..4].copy_from_slice(&self.target_id.target_id().to_be_bytes()); +// buf[4..8].copy_from_slice(&self.unique_id.to_be_bytes()); +// Ok(8) +// } +// } +// pub const PUS_APID: u16 = 0x02; #[derive(Copy, Clone, PartialEq, Eq, Debug, TryFromPrimitive, IntoPrimitive)] @@ -20,6 +111,8 @@ pub enum RequestTargetId { AcsSubsystem = 1, } +pub const AOCS_APID: u16 = 1; + pub const ACS_OBJECT_ID: ObjectId = ObjectId { id: RequestTargetId::AcsSubsystem as u32, name: "ACS_SUBSYSTEM", diff --git a/satrs-example/src/logger.rs b/satrs-example/src/logger.rs new file mode 100644 index 0000000..52d46b0 --- /dev/null +++ b/satrs-example/src/logger.rs @@ -0,0 +1,22 @@ +#![allow(unused_imports)] + +use chrono; +use log::{debug, error, info, trace, warn}; + +pub fn setup_logger() -> Result<(), fern::InitError> { + fern::Dispatch::new() + .format(|out, message, record| { + out.finish(format_args!( + "{}[{}][{}] {}", + chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"), + std::thread::current().name().expect("unnamed_thread"), + record.level(), + message + )) + }) + .level(log::LevelFilter::Debug) + .chain(std::io::stdout()) + .chain(fern::log_file("output.log")?) + .apply()?; + Ok(()) +} diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs index 4053e50..0c4bbb5 100644 --- a/satrs-example/src/main.rs +++ b/satrs-example/src/main.rs @@ -4,6 +4,8 @@ mod logging; mod pus; mod requests; mod tmtc; +//mod can; +//mod can_ids; use log::{info, warn}; @@ -43,11 +45,9 @@ use satrs_core::spacepackets::{ SpHeader, }; use satrs_core::tmtc::tm_helper::SharedTmStore; -use satrs_core::tmtc::{AddressableId, TargetId}; +use satrs_core::tmtc::{TargetId}; use satrs_core::ChannelId; -use satrs_example::{ - RequestTargetId, TcReceiverId, TmSenderId, OBSW_SERVER_ADDR, PUS_APID, SERVER_PORT, -}; +use satrs_example::{RequestTargetId, TcReceiverId, TmSenderId, OBSW_SERVER_ADDR, PUS_APID, SERVER_PORT, TargetIdWithApid}; use std::collections::HashMap; use std::net::{IpAddr, SocketAddr}; use std::sync::mpsc::{channel, TryRecvError}; @@ -124,7 +124,8 @@ fn main() { // Some request are targetable. This map is used to retrieve sender handles based on a target ID. let mut request_map = HashMap::new(); let (acs_thread_tx, acs_thread_rx) = channel::(); - request_map.insert(RequestTargetId::AcsSubsystem as TargetId, acs_thread_tx); + let target_apid = TargetIdWithApid::new(PUS_APID, RequestTargetId::AcsSubsystem as TargetId); + request_map.insert(target_apid, acs_thread_tx); let tc_source_wrapper = PusTcSource { tc_store: tc_store.clone(), @@ -393,8 +394,8 @@ fn main() { Request::Hk(hk_req) => match hk_req { HkRequest::OneShot(unique_id) => { let target = request.targeted_request.target_id; - assert_eq!(target, RequestTargetId::AcsSubsystem as u32); - if request.targeted_request.target_id + assert_eq!(target.target_id(), RequestTargetId::AcsSubsystem as u32); + if request.targeted_request.target_id.target == AcsHkIds::TestMgmSet as u32 { let mut sp_header = SpHeader::tm( @@ -410,11 +411,8 @@ fn main() { ×tamp, ); let mut buf: [u8; 8] = [0; 8]; - let addressable_id = AddressableId { - target_id: target, - unique_id, - }; - addressable_id.write_to_be_bytes(&mut buf).unwrap(); + + target.target.write_to_be_bytes(&mut buf).unwrap(); let pus_tm = PusTmCreator::new( &mut sp_header, sec_header, diff --git a/satrs-example/src/pus/action.rs b/satrs-example/src/pus/action.rs index 76e27cf..89fea24 100644 --- a/satrs-example/src/pus/action.rs +++ b/satrs-example/src/pus/action.rs @@ -11,13 +11,13 @@ use satrs_core::pus::{ use satrs_core::spacepackets::ecss::tc::PusTcReader; use satrs_core::spacepackets::ecss::PusPacket; use satrs_core::tmtc::TargetId; -use satrs_example::tmtc_err; +use satrs_example::{TargetIdWithApid, tmtc_err}; use std::collections::HashMap; use std::sync::mpsc::Sender; pub struct PusService8ActionHandler { psb: PusServiceBase, - request_handlers: HashMap>, + request_handlers: HashMap>, } impl PusService8ActionHandler { @@ -27,7 +27,7 @@ impl PusService8ActionHandler { tm_sender: Box, tm_apid: u16, verification_handler: StdVerifReporterWithSender, - request_handlers: HashMap>, + request_handlers: HashMap>, ) -> Self { Self { psb: PusServiceBase::new( @@ -63,7 +63,8 @@ impl PusService8ActionHandler { "Expected at least 4 bytes".into(), )); } - let target_id = u32::from_be_bytes(user_data[0..4].try_into().unwrap()); + //let target_id = u32::from_be_bytes(user_data[0..4].try_into().unwrap()); + let target_id = TargetIdWithApid::from_tc(tc).unwrap(); let action_id = u32::from_be_bytes(user_data[4..8].try_into().unwrap()); if let Some(sender) = self.request_handlers.get(&target_id) { sender @@ -78,7 +79,7 @@ impl PusService8ActionHandler { .expect("Forwarding action request failed"); } else { let mut fail_data: [u8; 4] = [0; 4]; - fail_data.copy_from_slice(&target_id.to_be_bytes()); + fail_data.copy_from_slice(&target_id.target.to_be_bytes()); self.psb() .verification_handler .borrow_mut() diff --git a/satrs-example/src/pus/hk.rs b/satrs-example/src/pus/hk.rs index d4c8bee..15573a5 100644 --- a/satrs-example/src/pus/hk.rs +++ b/satrs-example/src/pus/hk.rs @@ -1,6 +1,6 @@ use crate::requests::{Request, RequestWithToken}; use log::{error, warn}; -use satrs_core::hk::{CollectionIntervalFactor, HkRequest}; +use satrs_core::hk::{CollectionIntervalFactor, HkRequest, UniqueId}; use satrs_core::pool::{SharedPool, StoreAddr}; use satrs_core::pus::verification::{ FailParams, StdVerifReporterWithSender, TcStateAccepted, VerificationToken, @@ -11,14 +11,14 @@ use satrs_core::pus::{ }; use satrs_core::spacepackets::ecss::tc::PusTcReader; use satrs_core::spacepackets::ecss::{hk, PusPacket}; -use satrs_core::tmtc::{AddressableId, TargetId}; -use satrs_example::{hk_err, tmtc_err}; +use satrs_core::tmtc::TargetId; +use satrs_example::{hk_err, TargetIdWithApid, tmtc_err}; use std::collections::HashMap; use std::sync::mpsc::Sender; pub struct PusService3HkHandler { psb: PusServiceBase, - request_handlers: HashMap>, + request_handlers: HashMap>, } impl PusService3HkHandler { @@ -28,7 +28,7 @@ impl PusService3HkHandler { tm_sender: Box, tm_apid: u16, verification_handler: StdVerifReporterWithSender, - request_handlers: HashMap>, + request_handlers: HashMap>, ) -> Self { Self { psb: PusServiceBase::new( @@ -90,10 +90,11 @@ impl PusServiceHandler for PusService3HkHandler { "Expected at least 8 bytes of app data".into(), )); } - let addressable_id = AddressableId::from_raw_be(user_data).unwrap(); + let target_id = TargetIdWithApid::from_tc(&tc).expect("invalid tc format"); + let unique_id = u32::from_be_bytes(tc.user_data()[0..4].try_into().unwrap()); if !self .request_handlers - .contains_key(&addressable_id.target_id) + .contains_key(&target_id) { self.psb .verification_handler @@ -103,15 +104,14 @@ impl PusServiceHandler for PusService3HkHandler { FailParams::new(Some(&time_stamp), &hk_err::UNKNOWN_TARGET_ID, None), ) .expect("Sending start failure TM failed"); - let tgt_id = addressable_id.target_id; return Err(PusPacketHandlingError::NotEnoughAppData(format!( - "Unknown target ID {tgt_id}" + "Unknown target ID {target_id}" ))); } - let send_request = |target: TargetId, request: HkRequest| { + let send_request = |target: TargetIdWithApid, request: HkRequest| { let sender = self .request_handlers - .get(&addressable_id.target_id) + .get(&target) .unwrap(); sender .send(RequestWithToken::new(target, Request::Hk(request), token)) @@ -119,18 +119,18 @@ impl PusServiceHandler for PusService3HkHandler { }; if subservice == hk::Subservice::TcEnableHkGeneration as u8 { send_request( - addressable_id.target_id, - HkRequest::Enable(addressable_id.unique_id), + target_id, + HkRequest::Enable(unique_id), ); } else if subservice == hk::Subservice::TcDisableHkGeneration as u8 { send_request( - addressable_id.target_id, - HkRequest::Disable(addressable_id.unique_id), + target_id, + HkRequest::Disable(unique_id), ); } else if subservice == hk::Subservice::TcGenerateOneShotHk as u8 { send_request( - addressable_id.target_id, - HkRequest::OneShot(addressable_id.unique_id), + target_id, + HkRequest::OneShot(unique_id), ); } else if subservice == hk::Subservice::TcModifyHkCollectionInterval as u8 { if user_data.len() < 12 { @@ -151,9 +151,9 @@ impl PusServiceHandler for PusService3HkHandler { )); } send_request( - addressable_id.target_id, + target_id, HkRequest::ModifyCollectionInterval( - addressable_id.unique_id, + unique_id, CollectionIntervalFactor::from_be_bytes(user_data[8..12].try_into().unwrap()), ), ); diff --git a/satrs-example/src/requests.rs b/satrs-example/src/requests.rs index 5fa2549..4640a91 100644 --- a/satrs-example/src/requests.rs +++ b/satrs-example/src/requests.rs @@ -1,7 +1,9 @@ +use derive_new::new; use satrs_core::hk::HkRequest; use satrs_core::mode::ModeRequest; use satrs_core::pus::verification::{TcStateAccepted, VerificationToken}; use satrs_core::tmtc::TargetId; +use satrs_example::TargetIdWithApid; #[allow(dead_code)] #[derive(Clone, Eq, PartialEq, Debug)] @@ -19,18 +21,12 @@ pub enum Request { Action(ActionRequest), } -#[derive(Clone, Eq, PartialEq, Debug)] +#[derive(Clone, Eq, PartialEq, Debug, new)] pub struct TargetedRequest { - pub(crate) target_id: TargetId, + pub(crate) target_id: TargetIdWithApid, pub(crate) request: Request, } -impl TargetedRequest { - pub fn new(target_id: TargetId, request: Request) -> Self { - Self { target_id, request } - } -} - #[derive(Clone, Eq, PartialEq, Debug)] pub struct RequestWithToken { pub(crate) targeted_request: TargetedRequest, @@ -39,7 +35,7 @@ pub struct RequestWithToken { impl RequestWithToken { pub fn new( - target_id: u32, + target_id: TargetIdWithApid, request: Request, token: VerificationToken, ) -> Self { From 5aa2ec74bafffc8e50ee23807caeaf9708755a0a Mon Sep 17 00:00:00 2001 From: lkoester Date: Tue, 15 Aug 2023 08:50:08 +0200 Subject: [PATCH 2/8] still broken --- satrs-example/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs index 0c4bbb5..064992d 100644 --- a/satrs-example/src/main.rs +++ b/satrs-example/src/main.rs @@ -412,7 +412,7 @@ fn main() { ); let mut buf: [u8; 8] = [0; 8]; - target.target.write_to_be_bytes(&mut buf).unwrap(); + addressable_id.write_to_be_bytes(&mut buf).unwrap(); let pus_tm = PusTmCreator::new( &mut sp_header, sec_header, From 26404cdfe18521c9a76d150277553aa3aaba0876 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 15 Aug 2023 20:41:51 +0200 Subject: [PATCH 3/8] remove unused imports --- satrs-core/src/tmtc/mod.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/satrs-core/src/tmtc/mod.rs b/satrs-core/src/tmtc/mod.rs index 03edbd7..b85ebdd 100644 --- a/satrs-core/src/tmtc/mod.rs +++ b/satrs-core/src/tmtc/mod.rs @@ -7,10 +7,7 @@ //! routing without the overhead and complication of using message queues. However, it also requires #[cfg(feature = "alloc")] use downcast_rs::{impl_downcast, Downcast}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -use spacepackets::{ByteConversionError, SizeMissmatch, SpHeader}; -use spacepackets::ecss::tc::PusTc; +use spacepackets::SpHeader; #[cfg(feature = "alloc")] pub mod ccsds_distrib; From a3311f102e4e81032400952ea2371e7419d83802 Mon Sep 17 00:00:00 2001 From: lkoester Date: Tue, 15 Aug 2023 21:07:15 +0200 Subject: [PATCH 4/8] added HkUniqueId --- satrs-example/src/hk.rs | 35 +++++++++++++++++++++++++++++++++ satrs-example/src/lib.rs | 25 ++++++++++++----------- satrs-example/src/main.rs | 17 +++++++++++----- satrs-example/src/pus/action.rs | 2 +- satrs-example/src/pus/hk.rs | 27 ++++++------------------- 5 files changed, 68 insertions(+), 38 deletions(-) diff --git a/satrs-example/src/hk.rs b/satrs-example/src/hk.rs index 2e4727a..5c5bcee 100644 --- a/satrs-example/src/hk.rs +++ b/satrs-example/src/hk.rs @@ -1,4 +1,39 @@ +use derive_new::new; +use zerocopy::AsBytes; +use satrs_example::TargetIdWithApid; + #[derive(Debug, Copy, Clone, PartialEq, Eq)] pub enum AcsHkIds { TestMgmSet = 1, } + +#[derive(Debug, new, Copy, Clone)] +pub struct HkUniqueId { + id: u32, +} + +impl From for HkUniqueId { + fn from(id: u32) -> Self { + Self { id } + } +} + +impl HkUniqueId { + pub fn id(&self) -> u32 { + self.id + } + + pub fn bytes_from_target_id(&self, buf: &mut [u8], target_id: u32) -> Result<(), ()> { + if buf.len() < 8 { + return Err(()); + } + buf[0..4].copy_from_slice(&self.id.to_be_bytes()); + buf[4..8].copy_from_slice(&target_id.to_be_bytes()); + + Ok(()) + } + + pub fn bytes_from_target_id_with_apid(&self, buf: &mut [u8], target_id: TargetIdWithApid) -> Result<(), ()> { + self.bytes_from_target_id(buf, target_id.target) + } +} diff --git a/satrs-example/src/lib.rs b/satrs-example/src/lib.rs index 4e76618..9d310e8 100644 --- a/satrs-example/src/lib.rs +++ b/satrs-example/src/lib.rs @@ -1,15 +1,15 @@ -use std::fmt; +use delegate::delegate; +use derive_new::new; use num_enum::{IntoPrimitive, TryFromPrimitive}; use satrs_core::events::{EventU32TypedSev, SeverityInfo}; use satrs_core::objects::ObjectId; -use std::net::Ipv4Addr; -use delegate::delegate; -use derive_new::new; -use thiserror::Error; -use satrs_core::spacepackets::{ByteConversionError, CcsdsPacket, SizeMissmatch}; -use satrs_core::spacepackets::ecss::PusPacket; use satrs_core::spacepackets::ecss::tc::{GenericPusTcSecondaryHeader, IsPusTelecommand, PusTc}; +use satrs_core::spacepackets::ecss::PusPacket; +use satrs_core::spacepackets::{ByteConversionError, CcsdsPacket, SizeMissmatch}; use satrs_core::tmtc::TargetId; +use std::fmt; +use std::net::Ipv4Addr; +use thiserror::Error; use satrs_mib::res_code::{ResultU16, ResultU16Info}; use satrs_mib::resultcode; @@ -25,7 +25,7 @@ pub enum TargetIdCreationError { #[error("byte conversion")] ByteConversion(#[from] ByteConversionError), #[error("not enough app data to generate target ID")] - NotEnoughAppData(usize) + NotEnoughAppData(usize), } // TODO: can these stay pub? @@ -45,18 +45,21 @@ impl TargetIdWithApid { pub fn apid(&self) -> Apid { self.apid } - pub fn target_id(&self) -> TargetId{ + pub fn target_id(&self) -> TargetId { self.target } } impl TargetIdWithApid { - pub fn from_tc(tc: &(impl CcsdsPacket + PusPacket + IsPusTelecommand)) -> Result { + pub fn from_tc( + tc: &(impl CcsdsPacket + PusPacket + IsPusTelecommand), + ) -> Result { if tc.user_data().len() < 4 { return Err(ByteConversionError::FromSliceTooSmall(SizeMissmatch { found: tc.user_data().len(), expected: 8, - }).into()); + }) + .into()); } let target_id = u32::from_be_bytes(tc.user_data()[0..4].try_into().unwrap()); Ok(Self { diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs index 064992d..e70484c 100644 --- a/satrs-example/src/main.rs +++ b/satrs-example/src/main.rs @@ -9,7 +9,7 @@ mod tmtc; use log::{info, warn}; -use crate::hk::AcsHkIds; +use crate::hk::{AcsHkIds, HkUniqueId}; use crate::logging::setup_logger; use crate::pus::action::{Pus8Wrapper, PusService8ActionHandler}; use crate::pus::event::Pus5Wrapper; @@ -45,9 +45,12 @@ use satrs_core::spacepackets::{ SpHeader, }; use satrs_core::tmtc::tm_helper::SharedTmStore; -use satrs_core::tmtc::{TargetId}; +use satrs_core::tmtc::TargetId; use satrs_core::ChannelId; -use satrs_example::{RequestTargetId, TcReceiverId, TmSenderId, OBSW_SERVER_ADDR, PUS_APID, SERVER_PORT, TargetIdWithApid}; +use satrs_example::{ + RequestTargetId, TargetIdWithApid, TcReceiverId, TmSenderId, OBSW_SERVER_ADDR, PUS_APID, + SERVER_PORT, +}; use std::collections::HashMap; use std::net::{IpAddr, SocketAddr}; use std::sync::mpsc::{channel, TryRecvError}; @@ -394,7 +397,10 @@ fn main() { Request::Hk(hk_req) => match hk_req { HkRequest::OneShot(unique_id) => { let target = request.targeted_request.target_id; - assert_eq!(target.target_id(), RequestTargetId::AcsSubsystem as u32); + assert_eq!( + target.target_id(), + RequestTargetId::AcsSubsystem as u32 + ); if request.targeted_request.target_id.target == AcsHkIds::TestMgmSet as u32 { @@ -412,7 +418,8 @@ fn main() { ); let mut buf: [u8; 8] = [0; 8]; - addressable_id.write_to_be_bytes(&mut buf).unwrap(); + let hk_id = HkUniqueId::new(1); + hk_id.bytes_from_target_id_with_apid(&mut buf, target).unwrap(); let pus_tm = PusTmCreator::new( &mut sp_header, sec_header, diff --git a/satrs-example/src/pus/action.rs b/satrs-example/src/pus/action.rs index 89fea24..f348471 100644 --- a/satrs-example/src/pus/action.rs +++ b/satrs-example/src/pus/action.rs @@ -11,7 +11,7 @@ use satrs_core::pus::{ use satrs_core::spacepackets::ecss::tc::PusTcReader; use satrs_core::spacepackets::ecss::PusPacket; use satrs_core::tmtc::TargetId; -use satrs_example::{TargetIdWithApid, tmtc_err}; +use satrs_example::{tmtc_err, TargetIdWithApid}; use std::collections::HashMap; use std::sync::mpsc::Sender; diff --git a/satrs-example/src/pus/hk.rs b/satrs-example/src/pus/hk.rs index 15573a5..4284c07 100644 --- a/satrs-example/src/pus/hk.rs +++ b/satrs-example/src/pus/hk.rs @@ -12,7 +12,7 @@ use satrs_core::pus::{ use satrs_core::spacepackets::ecss::tc::PusTcReader; use satrs_core::spacepackets::ecss::{hk, PusPacket}; use satrs_core::tmtc::TargetId; -use satrs_example::{hk_err, TargetIdWithApid, tmtc_err}; +use satrs_example::{hk_err, tmtc_err, TargetIdWithApid}; use std::collections::HashMap; use std::sync::mpsc::Sender; @@ -92,10 +92,7 @@ impl PusServiceHandler for PusService3HkHandler { } let target_id = TargetIdWithApid::from_tc(&tc).expect("invalid tc format"); let unique_id = u32::from_be_bytes(tc.user_data()[0..4].try_into().unwrap()); - if !self - .request_handlers - .contains_key(&target_id) - { + if !self.request_handlers.contains_key(&target_id) { self.psb .verification_handler .borrow_mut() @@ -109,29 +106,17 @@ impl PusServiceHandler for PusService3HkHandler { ))); } let send_request = |target: TargetIdWithApid, request: HkRequest| { - let sender = self - .request_handlers - .get(&target) - .unwrap(); + let sender = self.request_handlers.get(&target).unwrap(); sender .send(RequestWithToken::new(target, Request::Hk(request), token)) .unwrap_or_else(|_| panic!("Sending HK request {request:?} failed")); }; if subservice == hk::Subservice::TcEnableHkGeneration as u8 { - send_request( - target_id, - HkRequest::Enable(unique_id), - ); + send_request(target_id, HkRequest::Enable(unique_id)); } else if subservice == hk::Subservice::TcDisableHkGeneration as u8 { - send_request( - target_id, - HkRequest::Disable(unique_id), - ); + send_request(target_id, HkRequest::Disable(unique_id)); } else if subservice == hk::Subservice::TcGenerateOneShotHk as u8 { - send_request( - target_id, - HkRequest::OneShot(unique_id), - ); + send_request(target_id, HkRequest::OneShot(unique_id)); } else if subservice == hk::Subservice::TcModifyHkCollectionInterval as u8 { if user_data.len() < 12 { self.psb From b27842c2bbe7f79e2d8a6dc027544bf774d1ee7e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 30 Jan 2024 23:48:46 +0100 Subject: [PATCH 5/8] all clippy fixes --- satrs-example/Cargo.toml | 2 -- satrs-example/src/hk.rs | 2 +- satrs-example/src/lib.rs | 32 -------------------------------- satrs-example/src/logger.rs | 5 ----- satrs-example/src/logging.rs | 16 ---------------- satrs-example/src/main.rs | 9 ++++----- satrs-example/src/pus/action.rs | 1 - satrs-example/src/pus/hk.rs | 3 +-- satrs-example/src/requests.rs | 1 - 9 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 satrs-example/src/logging.rs diff --git a/satrs-example/Cargo.toml b/satrs-example/Cargo.toml index a300bfa..2fd3c04 100644 --- a/satrs-example/Cargo.toml +++ b/satrs-example/Cargo.toml @@ -17,8 +17,6 @@ zerocopy = "0.6" csv = "1" num_enum = "0.7" thiserror = "1" -embedded-can = "0.4" -#socketcan = "2.0" derive-new = "0.5" num-traits = "0.2" num-derive = "0.3" diff --git a/satrs-example/src/hk.rs b/satrs-example/src/hk.rs index a85a0bd..dfcb0b5 100644 --- a/satrs-example/src/hk.rs +++ b/satrs-example/src/hk.rs @@ -1,6 +1,5 @@ use derive_new::new; use satrs_example::TargetIdWithApid; -use zerocopy::AsBytes; #[derive(Debug, Copy, Clone, PartialEq, Eq)] pub enum AcsHkIds { @@ -19,6 +18,7 @@ impl From for HkUniqueId { } impl HkUniqueId { + #[allow(dead_code)] pub fn id(&self) -> u32 { self.id } diff --git a/satrs-example/src/lib.rs b/satrs-example/src/lib.rs index ae311a4..75fc598 100644 --- a/satrs-example/src/lib.rs +++ b/satrs-example/src/lib.rs @@ -12,7 +12,6 @@ use thiserror::Error; use satrs_mib::res_code::{ResultU16, ResultU16Info}; use satrs_mib::resultcode; -mod logger; pub type Apid = u16; @@ -64,37 +63,6 @@ impl TargetIdWithApid { } } -// #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, new)] -// #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -// pub struct TargetIdWithUniqueId { -// target_id: TargetIdWithApid, -// unique_id: u32, -// } -// -// impl TargetIdWithUniqueId { -// delegate! { -// to self.target_id { -// pub fn apid(&self) -> Apid; -// pub fn target_id(&self) -> TargetId; -// } -// } -// pub fn unique_id(&self) -> u32 { -// self.unique_id -// } -// -// pub fn write_target_id_and_unique_id_as_pus_header(&self, buf: &mut [u8]) -> Result { -// if buf.len() < 8 { -// return Err(ByteConversionError::ToSliceTooSmall(SizeMissmatch { -// found: buf.len(), -// expected: 8, -// })); -// } -// buf[0..4].copy_from_slice(&self.target_id.target_id().to_be_bytes()); -// buf[4..8].copy_from_slice(&self.unique_id.to_be_bytes()); -// Ok(8) -// } -// } -// pub const PUS_APID: u16 = 0x02; #[derive(Copy, Clone, PartialEq, Eq, Debug, TryFromPrimitive, IntoPrimitive)] diff --git a/satrs-example/src/logger.rs b/satrs-example/src/logger.rs index 52d46b0..5e7163c 100644 --- a/satrs-example/src/logger.rs +++ b/satrs-example/src/logger.rs @@ -1,8 +1,3 @@ -#![allow(unused_imports)] - -use chrono; -use log::{debug, error, info, trace, warn}; - pub fn setup_logger() -> Result<(), fern::InitError> { fern::Dispatch::new() .format(|out, message, record| { diff --git a/satrs-example/src/logging.rs b/satrs-example/src/logging.rs deleted file mode 100644 index 63788fb..0000000 --- a/satrs-example/src/logging.rs +++ /dev/null @@ -1,16 +0,0 @@ -pub fn setup_logger() -> Result<(), fern::InitError> { - fern::Dispatch::new() - .format(|out, message, record| { - out.finish(format_args!( - "{}[{}][{}] {}", - chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"), - record.target(), //(std::thread::current().name().expect("unnamed_thread"), - record.level(), - message - )) - }) - .level(log::LevelFilter::Debug) - .chain(std::io::stdout()) - .apply()?; - Ok(()) -} diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs index 0bbc395..752769f 100644 --- a/satrs-example/src/main.rs +++ b/satrs-example/src/main.rs @@ -1,6 +1,6 @@ mod ccsds; mod hk; -mod logging; +mod logger; mod pus; mod requests; mod tcp; @@ -12,9 +12,8 @@ use satrs_core::hal::std::tcp_server::ServerConfig; use satrs_core::hal::std::udp_server::UdpTcServer; use crate::ccsds::CcsdsReceiver; -use crate::hk::AcsHkIds; use crate::hk::{AcsHkIds, HkUniqueId}; -use crate::logging::setup_logger; +use crate::logger::setup_logger; use crate::pus::action::{Pus8Wrapper, PusService8ActionHandler}; use crate::pus::event::Pus5Wrapper; use crate::pus::hk::{Pus3Wrapper, PusService3HkHandler}; @@ -51,7 +50,7 @@ use satrs_core::spacepackets::{ SpHeader, }; use satrs_core::tmtc::tm_helper::SharedTmStore; -use satrs_core::tmtc::TargetId; +use satrs_core::tmtc::{CcsdsDistributor, TargetId}; use satrs_core::ChannelId; use satrs_example::{ RequestTargetId, TargetIdWithApid, TcReceiverId, TmSenderId, OBSW_SERVER_ADDR, PUS_APID, @@ -465,7 +464,7 @@ fn main() { ); let mut buf: [u8; 8] = [0; 8]; - let hk_id = HkUniqueId::new(1); + let hk_id = HkUniqueId::new(unique_id); hk_id .bytes_from_target_id_with_apid(&mut buf, target) .unwrap(); diff --git a/satrs-example/src/pus/action.rs b/satrs-example/src/pus/action.rs index f348471..d280e69 100644 --- a/satrs-example/src/pus/action.rs +++ b/satrs-example/src/pus/action.rs @@ -10,7 +10,6 @@ use satrs_core::pus::{ }; use satrs_core::spacepackets::ecss::tc::PusTcReader; use satrs_core::spacepackets::ecss::PusPacket; -use satrs_core::tmtc::TargetId; use satrs_example::{tmtc_err, TargetIdWithApid}; use std::collections::HashMap; use std::sync::mpsc::Sender; diff --git a/satrs-example/src/pus/hk.rs b/satrs-example/src/pus/hk.rs index 4284c07..a00f5ef 100644 --- a/satrs-example/src/pus/hk.rs +++ b/satrs-example/src/pus/hk.rs @@ -1,6 +1,6 @@ use crate::requests::{Request, RequestWithToken}; use log::{error, warn}; -use satrs_core::hk::{CollectionIntervalFactor, HkRequest, UniqueId}; +use satrs_core::hk::{CollectionIntervalFactor, HkRequest}; use satrs_core::pool::{SharedPool, StoreAddr}; use satrs_core::pus::verification::{ FailParams, StdVerifReporterWithSender, TcStateAccepted, VerificationToken, @@ -11,7 +11,6 @@ use satrs_core::pus::{ }; use satrs_core::spacepackets::ecss::tc::PusTcReader; use satrs_core::spacepackets::ecss::{hk, PusPacket}; -use satrs_core::tmtc::TargetId; use satrs_example::{hk_err, tmtc_err, TargetIdWithApid}; use std::collections::HashMap; use std::sync::mpsc::Sender; diff --git a/satrs-example/src/requests.rs b/satrs-example/src/requests.rs index 4640a91..bcae8d7 100644 --- a/satrs-example/src/requests.rs +++ b/satrs-example/src/requests.rs @@ -2,7 +2,6 @@ use derive_new::new; use satrs_core::hk::HkRequest; use satrs_core::mode::ModeRequest; use satrs_core::pus::verification::{TcStateAccepted, VerificationToken}; -use satrs_core::tmtc::TargetId; use satrs_example::TargetIdWithApid; #[allow(dead_code)] From b79b5d20096f20ad1428f0b6ef86f2b73c089e17 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 30 Jan 2024 23:59:29 +0100 Subject: [PATCH 6/8] done --- satrs-example/src/hk.rs | 40 +++++++++++++++++---------------------- satrs-example/src/main.rs | 8 +++----- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/satrs-example/src/hk.rs b/satrs-example/src/hk.rs index dfcb0b5..deae635 100644 --- a/satrs-example/src/hk.rs +++ b/satrs-example/src/hk.rs @@ -1,5 +1,5 @@ use derive_new::new; -use satrs_example::TargetIdWithApid; +use satrs_core::spacepackets::ByteConversionError; #[derive(Debug, Copy, Clone, PartialEq, Eq)] pub enum AcsHkIds { @@ -8,36 +8,30 @@ pub enum AcsHkIds { #[derive(Debug, new, Copy, Clone)] pub struct HkUniqueId { - id: u32, -} - -impl From for HkUniqueId { - fn from(id: u32) -> Self { - Self { id } - } + target_id: u32, + set_id: u32, } impl HkUniqueId { #[allow(dead_code)] - pub fn id(&self) -> u32 { - self.id + pub fn target_id(&self) -> u32 { + self.target_id + } + #[allow(dead_code)] + pub fn set_id(&self) -> u32 { + self.set_id } - pub fn bytes_from_target_id(&self, buf: &mut [u8], target_id: u32) -> Result<(), ()> { + pub fn write_to_be_bytes(&self, buf: &mut [u8]) -> Result { if buf.len() < 8 { - return Err(()); + return Err(ByteConversionError::ToSliceTooSmall { + found: buf.len(), + expected: 8, + }); } - buf[0..4].copy_from_slice(&self.id.to_be_bytes()); - buf[4..8].copy_from_slice(&target_id.to_be_bytes()); + buf[0..4].copy_from_slice(&self.target_id.to_be_bytes()); + buf[4..8].copy_from_slice(&self.set_id.to_be_bytes()); - Ok(()) - } - - pub fn bytes_from_target_id_with_apid( - &self, - buf: &mut [u8], - target_id: TargetIdWithApid, - ) -> Result<(), ()> { - self.bytes_from_target_id(buf, target_id.target) + Ok(8) } } diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs index 752769f..59d1566 100644 --- a/satrs-example/src/main.rs +++ b/satrs-example/src/main.rs @@ -442,6 +442,7 @@ fn main() { match request.targeted_request.request { Request::Hk(hk_req) => match hk_req { HkRequest::OneShot(unique_id) => { + // TODO: We should check whether the unique ID is even valid. let target = request.targeted_request.target_id; assert_eq!( target.target_id(), @@ -463,11 +464,8 @@ fn main() { ×tamp, ); let mut buf: [u8; 8] = [0; 8]; - - let hk_id = HkUniqueId::new(unique_id); - hk_id - .bytes_from_target_id_with_apid(&mut buf, target) - .unwrap(); + let hk_id = HkUniqueId::new(target.target_id(), unique_id); + hk_id.write_to_be_bytes(&mut buf).unwrap(); let pus_tm = PusTmCreator::new( &mut sp_header, sec_header, From 21961daba40115b60bb9f9854310f0cc8532cc3b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 00:00:56 +0100 Subject: [PATCH 7/8] these 2 deps are not required --- satrs-example/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/satrs-example/Cargo.toml b/satrs-example/Cargo.toml index 2fd3c04..c668cc5 100644 --- a/satrs-example/Cargo.toml +++ b/satrs-example/Cargo.toml @@ -18,8 +18,6 @@ csv = "1" num_enum = "0.7" thiserror = "1" derive-new = "0.5" -num-traits = "0.2" -num-derive = "0.3" [dependencies.satrs-core] # version = "0.1.0-alpha.1" From 93fb38a9b72d64171741de4c18a5f38a74bf3894 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 31 Jan 2024 00:02:27 +0100 Subject: [PATCH 8/8] ignore log file --- satrs-example/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 satrs-example/.gitignore diff --git a/satrs-example/.gitignore b/satrs-example/.gitignore new file mode 100644 index 0000000..6f444ac --- /dev/null +++ b/satrs-example/.gitignore @@ -0,0 +1 @@ +/output.log