diff --git a/satrs-example/src/pus/action.rs b/satrs-example/src/pus/action.rs index 445ad86..03d362c 100644 --- a/satrs-example/src/pus/action.rs +++ b/satrs-example/src/pus/action.rs @@ -17,7 +17,7 @@ use satrs::pus::{ }; use satrs::request::{GenericMessage, UniqueApidTargetId}; use satrs::spacepackets::ecss::tc::PusTcReader; -use satrs::spacepackets::ecss::{EcssEnumU16, PusPacket}; +use satrs::spacepackets::ecss::{EcssEnumU16, PusPacket, PusServiceId}; use satrs::tmtc::{PacketAsVec, PacketSenderWithSharedPool}; use satrs_example::config::components::PUS_ACTION_SERVICE; use satrs_example::config::tmtc_err; @@ -278,7 +278,7 @@ pub struct ActionServiceWrapper TargetedPusService for ActionServiceWrapper { - const SERVICE_ID: u8 = 8; + const SERVICE_ID: u8 = PusServiceId::Action as u8; const SERVICE_STR: &'static str = "action"; delegate::delegate! { diff --git a/satrs-example/src/pus/hk.rs b/satrs-example/src/pus/hk.rs index 33e01ac..0092241 100644 --- a/satrs-example/src/pus/hk.rs +++ b/satrs-example/src/pus/hk.rs @@ -13,7 +13,7 @@ use satrs::pus::{ }; use satrs::request::{GenericMessage, UniqueApidTargetId}; use satrs::spacepackets::ecss::tc::PusTcReader; -use satrs::spacepackets::ecss::{hk, PusPacket}; +use satrs::spacepackets::ecss::{hk, PusPacket, PusServiceId}; use satrs::tmtc::{PacketAsVec, PacketSenderWithSharedPool}; use satrs_example::config::components::PUS_HK_SERVICE; use satrs_example::config::{hk_err, tmtc_err}; @@ -299,8 +299,7 @@ pub struct HkServiceWrapper TargetedPusService for HkServiceWrapper { - const SERVICE_ID: u8 = 3; - + const SERVICE_ID: u8 = PusServiceId::Housekeeping as u8; const SERVICE_STR: &'static str = "housekeeping"; delegate::delegate! { diff --git a/satrs-example/src/pus/mode.rs b/satrs-example/src/pus/mode.rs index e990a80..56ae9d4 100644 --- a/satrs-example/src/pus/mode.rs +++ b/satrs-example/src/pus/mode.rs @@ -272,7 +272,6 @@ impl TargetedPus for ModeServiceWrapper { const SERVICE_ID: u8 = CustomPusServiceId::Mode as u8; - const SERVICE_STR: &'static str = "mode"; delegate::delegate! { diff --git a/satrs-example/src/pus/scheduler.rs b/satrs-example/src/pus/scheduler.rs index d6488a2..38cee95 100644 --- a/satrs-example/src/pus/scheduler.rs +++ b/satrs-example/src/pus/scheduler.rs @@ -78,6 +78,7 @@ pub struct SchedulingServiceWrapper, } + impl DirectPusService for SchedulingServiceWrapper {