mode request/responses to models

satrs-example/models/src/mgm.rs

@@ -1,5 +1,11 @@
 pub mod request {
-    use crate::{HkRequestType, Message};
+    use crate::{DeviceMode, HkRequestType, Message};
+
+    #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+    pub enum ModeRequest {
+        SetMode(DeviceMode),
+        ReadMode,
+    }
 
     #[derive(Debug, PartialEq, Eq, Clone, Copy, serde::Serialize, serde::Deserialize)]
     pub enum HkId {
@@ -16,7 +22,7 @@ pub mod request {
     pub enum Request {
         Ping,
         Hk(HkRequest),
-        Mode(crate::DeviceMode),
+        Mode(ModeRequest),
     }
 
     impl Request {
@@ -44,23 +50,26 @@ pub struct MgmData {
 }
 
 pub mod response {
-    use crate::{Message, mgm::MgmData};
+    use crate::{DeviceMode, Message, mgm::MgmData};
 
     #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug)]
     pub enum HkResponse {
         MgmData(MgmData),
     }
 
-    #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug)]
-    pub enum ModeFailure {
-        Timeout,
+    #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Copy)]
+    pub enum ModeResponse {
+        /// New mode has been set.
+        Mode(DeviceMode),
+        /// Setting a mode timed out.
+        SetModeTimeout,
     }
 
     #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug)]
     pub enum Response {
         Ok,
         Hk(HkResponse),
-        ModeFailure(ModeFailure),
+        Mode(ModeResponse),
     }
 
     impl Response {
@@ -68,7 +77,7 @@ pub mod response {
             match self {
                 Response::Ok => crate::MessageType::Verification,
                 Response::Hk(_hk_response) => crate::MessageType::Hk,
-                Response::ModeFailure(_mode_failure) => crate::MessageType::Mode,
+                Response::Mode(_mode_failure) => crate::MessageType::Mode,
             }
         }
     }

satrs-example/models/src/mgm_assembly.rs

@@ -33,6 +33,12 @@ pub mod request {
         Sensor,
     }
 
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+    pub enum ModeRequest {
+        SetMode(AssemblyMode),
+        ReadMode,
+    }
+
     #[derive(Debug, PartialEq, Eq, Clone, Copy, serde::Serialize, serde::Deserialize)]
     pub struct HkRequest {
         pub id: HkId,
@@ -42,7 +48,7 @@ pub mod request {
     #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug)]
     pub enum Request {
         Ping,
-        Mode(AssemblyMode),
+        Mode(ModeRequest),
     }
 
     impl Request {
@@ -61,24 +67,36 @@ pub mod request {
 }
 
 pub mod response {
-    use crate::Message;
+    use crate::{DeviceMode, Message};
 
     #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
     pub enum ModeCommandFailure {
         Timeout,
     }
 
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+    pub enum ModeReport {
+        /// Mode of the assembly.
+        Mode(super::AssemblyMode),
+        /// Timeout failure setting the children modes.
+        SetModeTimeout([Option<DeviceMode>; 2]),
+        /// Children are in wrong mode after commanding.
+        WrongMode([Option<DeviceMode>; 2]),
+        /// An assembly tried modekeeping but can not keep its mode.
+        CanNotKeepMode([Option<DeviceMode>; 2]),
+    }
+
     #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
     pub enum Response {
         Ok,
-        ModeFailure(ModeCommandFailure),
+        Mode(ModeReport),
     }
 
     impl Response {
         fn message_type(&self) -> crate::MessageType {
             match self {
                 Response::Ok => crate::MessageType::Verification,
-                Response::ModeFailure(_mode_failure) => crate::MessageType::Mode,
+                Response::Mode(_mode_report) => crate::MessageType::Mode,
             }
         }
     }