Merge pull request #132 from quartiq/rs/issue-130/blocked-status

Adding blocked reason to state reporting
quartiq · Jan 20, 2021 · db9135d · db9135d
2 parents 4bdc3f1 + 8fef435
commit db9135d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/rf_channel.rs b/src/rf_channel.rs
@@ -54,7 +54,7 @@ pub struct SupplyMeasurements {
 pub enum ChannelFault {
     OverTemperature,
     UnderTemperature,
-    OverCurrent,
+    SupplyAlert,
 }
 
 /// Represents the three power interlocks present on the device.
@@ -97,8 +97,14 @@ pub enum ChannelState {
 impl serde::Serialize for ChannelState {
     fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         match *self {
-            ChannelState::Blocked(_) => {
-                serializer.serialize_unit_variant("ChannelState", 0, "Blocked")
+            ChannelState::Blocked(ChannelFault::SupplyAlert) => {
+                serializer.serialize_unit_variant("ChannelState", 0, "Blocked(SupplyAlert)")
+            }
+            ChannelState::Blocked(ChannelFault::UnderTemperature) => {
+                serializer.serialize_unit_variant("ChannelState", 0, "Blocked(UnderTempeterature)")
+            }
+            ChannelState::Blocked(ChannelFault::OverTemperature) => {
+                serializer.serialize_unit_variant("ChannelState", 0, "Blocked(OverTemperature)")
             }
             ChannelState::Disabled => {
                 serializer.serialize_unit_variant("ChannelState", 1, "Disabled")
@@ -579,7 +585,7 @@ impl RfChannel {
         } else if temperature < 5.0 {
             Some(ChannelFault::UnderTemperature)
         } else if self.pins.alert.is_low().unwrap() {
-            Some(ChannelFault::OverCurrent)
+            Some(ChannelFault::SupplyAlert)
         } else {
             None
         }