Merge branch 'main' into feature_sender_abstraction_has_id_and_name

satrs-core/src/hk.rs

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

satrs-core/src/mode.rs

@@ -35,12 +35,16 @@ impl ModeAndSubmode {
             submode: u16::from_be_bytes(buf[4..6].try_into().unwrap()),
         })
     }
+
+    pub fn mode(&self) -> u32 {self.mode}
+
+    pub fn submode(&self) -> u16 {self.submode}
 }
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct ModeCommand {
-    address: TargetId,
-    mode_submode: ModeAndSubmode,
+    pub address: TargetId,
+    pub mode_submode: ModeAndSubmode,
 }
 
 impl ModeCommand {
@@ -71,8 +75,15 @@ impl ModeCommand {
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum ModeRequest {
-    SetMode(ModeCommand),
-    ReadMode(TargetId),
-    AnnounceMode(TargetId),
-    AnnounceModeRecursive(TargetId),
+    SetMode(ModeAndSubmode),
+    ReadMode,
+    AnnounceMode,
+    AnnounceModeRecursive,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub struct TargetedModeRequest {
+    target_id: TargetId,
+    mode_request: ModeRequest,
 }