start adding ACS subsystem

satrs-example/models/src/acs/ctrl.rs

@@ -0,0 +1,28 @@
+#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Mode {
+    Passive,
+    Safe,
+    Idle,
+}
+
+pub mod request {
+    use super::Mode;
+
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+    pub enum ModeRequest {
+        SetMode(Mode),
+        ReadMode,
+    }
+}
+
+pub mod response {
+    use super::Mode;
+
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+    pub enum ModeReport {
+        /// Mode of the assembly.
+        Mode(super::Mode),
+        /// Children are in wrong mode after commanding.
+        WrongMode([Option<Mode>; 2]),
+    }
+}

satrs-example/models/src/acs/mgm.rs

@@ -42,7 +42,7 @@ pub mod request {
 }
 
 #[derive(Default, Debug, Copy, Clone, serde::Serialize, serde::Deserialize)]
-pub struct MgmData {
+pub struct SensorData {
     pub valid: bool,
     pub x: f32,
     pub y: f32,
@@ -50,11 +50,11 @@ pub struct MgmData {
 }
 
 pub mod response {
-    use crate::{DeviceMode, Message, mgm::MgmData};
+    use crate::{DeviceMode, Message, acs::mgm::SensorData};
 
     #[derive(serde::Serialize, serde::Deserialize, Clone, Copy, Debug)]
     pub enum HkResponse {
-        MgmData(MgmData),
+        MgmData(SensorData),
     }
 
     #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Copy)]

satrs-example/models/src/acs/mgm_assembly.rs

@@ -3,7 +3,7 @@ use core::str::FromStr;
 use crate::DeviceMode;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
-pub enum AssemblyMode {
+pub enum Mode {
     /// The assembly mode ressembles the modes of the devices it controls. It also tries to keep
     /// the children in the correct mode by re-commanding them into the correct mode.
     Device(DeviceMode),
@@ -11,22 +11,22 @@ pub enum AssemblyMode {
     NoModeKeeping,
 }
 
-impl FromStr for AssemblyMode {
+impl FromStr for Mode {
     type Err = ();
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.to_lowercase().as_str() {
-            "off" => Ok(AssemblyMode::Device(DeviceMode::Off)),
-            "on" => Ok(AssemblyMode::Device(DeviceMode::On)),
-            "normal" => Ok(AssemblyMode::Device(DeviceMode::Normal)),
-            "no_mode_keeping" => Ok(AssemblyMode::NoModeKeeping),
+            "off" => Ok(Mode::Device(DeviceMode::Off)),
+            "on" => Ok(Mode::Device(DeviceMode::On)),
+            "normal" => Ok(Mode::Device(DeviceMode::Normal)),
+            "no_mode_keeping" => Ok(Mode::NoModeKeeping),
             _ => Err(()),
         }
     }
 }
 
 pub mod request {
-    use crate::{HkRequestType, Message, mgm_assembly::AssemblyMode};
+    use crate::{HkRequestType, Message, acs::mgm_assembly::Mode};
 
     #[derive(Debug, PartialEq, Eq, Clone, Copy, serde::Serialize, serde::Deserialize)]
     pub enum HkId {
@@ -35,7 +35,7 @@ pub mod request {
 
     #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
     pub enum ModeRequest {
-        SetMode(AssemblyMode),
+        SetMode(Mode),
         ReadMode,
     }
 
@@ -77,7 +77,7 @@ pub mod response {
     #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
     pub enum ModeReport {
         /// Mode of the assembly.
-        Mode(super::AssemblyMode),
+        Mode(super::Mode),
         /// Timeout failure setting the children modes.
         SetModeTimeout([Option<DeviceMode>; 2]),
         /// Children are in wrong mode after commanding.

satrs-example/models/src/acs/mgt.rs

@@ -0,0 +1,27 @@
+#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Mode {
+    Off,
+    Normal,
+}
+
+pub mod request {
+    use super::*;
+
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+    pub enum ModeRequest {
+        SetMode(Mode),
+        ReadMode,
+    }
+}
+
+pub mod response {
+    use super::*;
+
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+    pub enum ModeReport {
+        /// Mode of the assembly.
+        Mode(super::Mode),
+        /// Children are in wrong mode after commanding.
+        WrongMode([Option<Mode>; 2]),
+    }
+}

satrs-example/models/src/acs/mod.rs

@@ -0,0 +1,5 @@
+pub mod ctrl;
+pub mod mgm;
+pub mod mgm_assembly;
+pub mod mgt;
+pub mod subsystem;

satrs-example/models/src/acs/subsystem.rs

@@ -0,0 +1,15 @@
+#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Mode {
+    Off,
+    Safe,
+}
+
+impl Mode {
+    /// Each subsystem mode has a fallback mode to allow clean transitions.
+    pub const fn fallback_mode(&self) -> Self {
+        match self {
+            Mode::Off => Mode::Safe,
+            Mode::Safe => Mode::Safe,
+        }
+    }
+}

satrs-example/models/src/lib.rs

@@ -6,10 +6,9 @@ use spacepackets::{
     time::cds::{CdsTime, MIN_CDS_FIELD_LEN},
 };
 
+pub mod acs;
 pub mod ccsds;
 pub mod control;
-pub mod mgm;
-pub mod mgm_assembly;
 pub mod pcdu;
 
 #[derive(