refactor messages

This commit is contained in:
Robin Müller 2023-02-27 11:51:48 +01:00
parent b89b4db1db
commit f639eb9b9a
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 22 additions and 8 deletions

View File

@ -1,11 +1,18 @@
use crate::tmtc::AddressableId; use crate::tmtc::AddressableId;
pub type CollectionIntervalFactor = u32; pub type CollectionIntervalFactor = u32;
pub type UniqueId = u32;
#[derive(Debug, Copy, Clone, PartialEq, Eq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum HkRequest { pub enum HkRequest {
OneShot(AddressableId), OneShot(UniqueId),
Enable(AddressableId), Enable(UniqueId),
Disable(AddressableId), Disable(UniqueId),
ModifyCollectionInterval(AddressableId, CollectionIntervalFactor), ModifyCollectionInterval(UniqueId, CollectionIntervalFactor),
}
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub struct TargetedHkRequest {
target: u32,
hk_request: HkRequest
} }

View File

@ -71,8 +71,15 @@ impl ModeCommand {
#[derive(Debug, Copy, Clone, PartialEq, Eq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum ModeRequest { pub enum ModeRequest {
SetMode(ModeCommand), SetMode(ModeAndSubmode),
ReadMode(TargetId), ReadMode(ModeRequest),
AnnounceMode(TargetId), AnnounceMode(ModeRequest),
AnnounceModeRecursive(TargetId), AnnounceModeRecursive(ModeRequest),
}
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct TargetedModeRequest {
target_id: TargetId,
mode_request: ModeRequest
} }