refactor messages

2023-02-27 11:51:48 +01:00
parent b89b4db1db
commit f639eb9b9a
2 changed files with 22 additions and 8 deletions
--- a/satrs-core/src/mode.rs
+++ b/satrs-core/src/mode.rs
@@ -71,8 +71,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(ModeRequest),
+    AnnounceMode(ModeRequest),
+    AnnounceModeRecursive(ModeRequest),
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub struct TargetedModeRequest {
+    target_id: TargetId,
+    mode_request: ModeRequest
 }