improve constraints and system diagram

- rework constraints to work with static metrics
- add (temporary) local metrics for all valves
- add manual interactions to toggle all valves
- connect valve metrics to display state
- add unknown display state to all all valves except burst discs

Author: hansruebb

gui/src/backend/storage/event_series.rs

@@ -20,7 +20,6 @@ impl DataType for EventSeries {
     }
 
     fn append<M: MetricTrait>(&mut self, value: M::Value, time: f64) -> Result<(), &'static str> {
-        println!("Appending value {}", value.to_string());
         self.data.push(DataPoint::new(time, value));
         Ok(())
     }

gui/src/backend/storage/static_metrics.rs

@@ -98,12 +98,67 @@ make_static_metric_with_storage_type!(ApogeeError, f64, SampleSeries);
 
 // ------------- Local Nested Metrics -------------
 
-make_static_local_metric_with_storage_type!(MaxPressureN2Tank, f64, Constant);
 make_static_local_metric_with_storage_type!(
-    N2ReleaseValveState,
+    N2BottleValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2OBottleValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2ReleaseValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2OReleaseValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2QuickDisconnect,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2OQuickDisconnect,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2PurgeValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2PressureRegulator,
     crate::backend::storage::storeable_value::ValveState,
     EventSeries
 );
+make_static_local_metric_with_storage_type!(
+    N2OVentValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2OBurstDisc,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2OFillAndDumpValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(
+    N2OMainValve,
+    crate::backend::storage::storeable_value::ValveState,
+    EventSeries
+);
+make_static_local_metric_with_storage_type!(MaxPressureN2Tank, f64, Constant);
 
 // ------------- Other Nested Metrics (currently do not work via macro) -------------
 
@@ -1112,8 +1167,19 @@ macro_rules! call_static_metric {
             telemetry::Metric::ApogeeError => $($func)::+::<$crate::storage::static_metrics::ApogeeError $(, $generics)*>($($args),*),
             telemetry::Metric::LocalMetric(local_metric) =>
             match local_metric {
+                telemetry::LocalMetric::N2BottleValve => $($func)::+::<$crate::storage::static_metrics::N2BottleValve $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2OBottleValve => $($func)::+::<$crate::storage::static_metrics::N2OBottleValve $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2ReleaseValve => $($func)::+::<$crate::storage::static_metrics::N2ReleaseValve $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2OReleaseValve => $($func)::+::<$crate::storage::static_metrics::N2OReleaseValve $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2QuickDisconnect => $($func)::+::<$crate::storage::static_metrics::N2QuickDisconnect $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2OQuickDisconnect => $($func)::+::<$crate::storage::static_metrics::N2OQuickDisconnect $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2PurgeValve => $($func)::+::<$crate::storage::static_metrics::N2PurgeValve $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2PressureRegulator => $($func)::+::<$crate::storage::static_metrics::N2PressureRegulator $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2OVentValve => $($func)::+::<$crate::storage::static_metrics::N2OVentValve $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2OBurstDisc => $($func)::+::<$crate::storage::static_metrics::N2OBurstDisc $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2OFillAndDumpValve => $($func)::+::<$crate::storage::static_metrics::N2OFillAndDumpValve $(, $generics)*>($($args),*),
+                telemetry::LocalMetric::N2OMainValve => $($func)::+::<$crate::storage::static_metrics::N2OMainValve $(, $generics)*>($($args),*),
                 telemetry::LocalMetric::MaxPressureN2Tank => $($func)::+::<$crate::storage::static_metrics::MaxPressureN2Tank $(, $generics)*>($($args),*),
-                telemetry::LocalMetric::N2ReleaseValveState => $($func)::+::<$crate::storage::static_metrics::N2ReleaseValveState $(, $generics)*>($($args),*),
             },
             _ => unreachable!()
         }

gui/src/backend/storage/store.rs

@@ -138,7 +138,7 @@ impl DataStore {
         schema
             .receive(time, message, |metric, repr, reader: &mut TelemetryMessageReader<N>| {
                 let _ = reader.read_value(repr).and_then(|bits| {
-                    call_static_metric!(Self::ingest_value, <metric, >, self, bits, t).map_err(|s| print!("{s}"))
+                    call_static_metric!(Self::ingest_value, <metric, >, self, bits, t).map_err(|s| println!("{s}"))
                 });
             })
             .unwrap();
@@ -309,7 +309,7 @@ impl DataStore {
             .map(|(metric, data_points)| {
                 call_static_metric!(Data::from_file_entry, <metric, >, data_points)
                     .map(|data| (metric, data))
-                    .map_err(|s| print!("{s}"))
+                    .map_err(|s| println!("{s}"))
             })
             .flatten()
             .collect();

gui/src/backend/storage/storeable_value.rs

@@ -53,6 +53,12 @@ pub enum ValveState {
     Closed,
 }
 
+impl Default for ValveState {
+    fn default() -> Self {
+        Self::Open //TODO Hans: This is not good
+    }
+}
+
 impl StorableValue for ValveState {
     fn to_bits(&self) -> u64 {
         match self {