Merge pull request #29 from hnez/iobus-limits

iobus: display power supply overload notifications

Author: hnez

src/digital_io.rs

@@ -17,7 +17,7 @@
 
 use async_std::prelude::*;
 use async_std::sync::Arc;
-use async_std::task::{spawn, spawn_blocking};
+use async_std::task::spawn;
 
 use crate::broker::{BrokerBuilder, Topic};
 use crate::led::BlinkPattern;
@@ -40,14 +40,13 @@ mod gpio {
     pub use hardware::*;
 }
 
-pub use gpio::{find_line, EventRequestFlags, EventType, LineHandle, LineRequestFlags};
+pub use gpio::{find_line, LineHandle, LineRequestFlags};
 
 pub struct DigitalIo {
     pub out_0: Arc<Topic<bool>>,
     pub out_1: Arc<Topic<bool>>,
     pub uart_rx_en: Arc<Topic<bool>>,
     pub uart_tx_en: Arc<Topic<bool>>,
-    pub iobus_flt_fb: Arc<Topic<bool>>,
 }
 
 /// Handle a GPIO line whose state is completely defined by the broker framework
@@ -82,38 +81,6 @@ fn handle_line_wo(
     topic
 }
 
-/// Handle a GPIO line whose state is completely defined by itself
-/// (e.g. there is no way to manipulate it via the broker framework).
-fn handle_line_ro(bb: &mut BrokerBuilder, path: &str, line_name: &str) -> Arc<Topic<bool>> {
-    let topic = bb.topic_ro(path, None);
-    let line = find_line(line_name).unwrap();
-
-    let topic_thread = topic.clone();
-
-    let src = line
-        .events(
-            LineRequestFlags::INPUT,
-            EventRequestFlags::BOTH_EDGES,
-            "tacd",
-        )
-        .unwrap();
-
-    spawn_blocking(move || {
-        topic_thread.set(src.get_value().unwrap() != 0);
-
-        for ev in src {
-            let state = match ev.unwrap().event_type() {
-                EventType::RisingEdge => true,
-                EventType::FallingEdge => false,
-            };
-
-            topic_thread.set(state);
-        }
-    });
-
-    topic
-}
-
 impl DigitalIo {
     pub fn new(
         bb: &mut BrokerBuilder,
@@ -140,14 +107,12 @@ impl DigitalIo {
 
         let uart_rx_en = handle_line_wo(bb, "/v1/uart/rx/enabled", "UART_RX_EN", true, true, None);
         let uart_tx_en = handle_line_wo(bb, "/v1/uart/tx/enabled", "UART_TX_EN", true, true, None);
-        let iobus_flt_fb = handle_line_ro(bb, "/v1/iobus/feedback/fault", "IOBUS_FLT_FB");
 
         Self {
             out_0,
             out_1,
             uart_rx_en,
             uart_tx_en,
-            iobus_flt_fb,
         }
     }
 }

src/digital_io/gpio/demo_mode.rs

@@ -15,10 +15,6 @@
 // with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-use std::iter::Iterator;
-use std::thread::sleep;
-use std::time::Duration;
-
 use anyhow::Result;
 use async_std::task::block_on;
 
@@ -39,14 +35,6 @@ impl LineHandle {
         match self.name.as_str() {
             "OUT_0" => iio_thread.get_channel("out0-volt").unwrap().set(val != 0),
             "OUT_1" => iio_thread.get_channel("out1-volt").unwrap().set(val != 0),
-            "IOBUS_PWR_EN" => {
-                iio_thread
-                    .clone()
-                    .get_channel("iobus-curr")
-                    .unwrap()
-                    .set(val != 0);
-                iio_thread.get_channel("iobus-volt").unwrap().set(val != 0);
-            }
             "DUT_PWR_EN" => {
                 iio_thread
                     .clone()
@@ -62,49 +50,9 @@ impl LineHandle {
     }
 }
 
-pub struct LineEvent(u8);
-
-impl LineEvent {
-    pub fn event_type(&self) -> EventType {
-        match self.0 {
-            0 => EventType::FallingEdge,
-            _ => EventType::RisingEdge,
-        }
-    }
-}
-
-pub struct LineEventHandle {}
-
-impl LineEventHandle {
-    pub fn get_value(&self) -> Result<u8, ()> {
-        Ok(0)
-    }
-}
-
-impl Iterator for LineEventHandle {
-    type Item = Result<LineEvent, ()>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        loop {
-            sleep(Duration::from_secs(1000));
-        }
-    }
-}
-
-pub enum EventType {
-    RisingEdge,
-    FallingEdge,
-}
-
-#[allow(non_camel_case_types)]
-pub enum EventRequestFlags {
-    BOTH_EDGES,
-}
-
 #[allow(clippy::upper_case_acronyms)]
 pub enum LineRequestFlags {
     OUTPUT,
-    INPUT,
 }
 
 pub struct FindDecoy {
@@ -121,15 +69,6 @@ impl FindDecoy {
 
         Ok(line_handle)
     }
-
-    pub fn events(
-        &self,
-        _: LineRequestFlags,
-        _: EventRequestFlags,
-        _: &str,
-    ) -> Result<LineEventHandle, ()> {
-        Ok(LineEventHandle {})
-    }
 }
 
 pub fn find_line(name: &str) -> Result<FindDecoy> {

src/digital_io/gpio/test.rs

@@ -41,26 +41,11 @@ impl LineHandle {
 
 pub struct LineEvent(u8);
 
-impl LineEvent {
-    pub fn event_type(&self) -> EventType {
-        match self.0 {
-            0 => EventType::FallingEdge,
-            _ => EventType::RisingEdge,
-        }
-    }
-}
-
 pub struct LineEventHandle {
     val: Arc<AtomicU8>,
     prev_val: u8,
 }
 
-impl LineEventHandle {
-    pub fn get_value(&self) -> Result<u8, ()> {
-        Ok(self.val.load(Ordering::Relaxed))
-    }
-}
-
 impl Iterator for LineEventHandle {
     type Item = Result<LineEvent, ()>;
 
@@ -78,20 +63,9 @@ impl Iterator for LineEventHandle {
     }
 }
 
-pub enum EventType {
-    RisingEdge,
-    FallingEdge,
-}
-
-#[allow(non_camel_case_types)]
-pub enum EventRequestFlags {
-    BOTH_EDGES,
-}
-
 #[allow(clippy::upper_case_acronyms)]
 pub enum LineRequestFlags {
     OUTPUT,
-    INPUT,
 }
 
 pub struct FindDecoy {
@@ -109,18 +83,6 @@ impl FindDecoy {
         })
     }
 
-    pub fn events(
-        &self,
-        _: LineRequestFlags,
-        _: EventRequestFlags,
-        _: &str,
-    ) -> Result<LineEventHandle> {
-        Ok(LineEventHandle {
-            val: self.val.clone(),
-            prev_val: self.val.load(Ordering::Relaxed),
-        })
-    }
-
     pub fn stub_get(&self) -> u8 {
         self.val.load(Ordering::Relaxed)
     }

src/iobus.rs

@@ -22,8 +22,12 @@ use async_std::task::{sleep, spawn};
 
 use serde::{Deserialize, Serialize};
 
+use crate::adc::CalibratedChannel;
 use crate::broker::{BrokerBuilder, Topic};
 
+const CURRENT_MAX: f32 = 0.2;
+const VOLTAGE_MIN: f32 = 10.0;
+
 #[cfg(feature = "demo_mode")]
 mod http {
     use super::{LSSState, Nodes, ServerInfo};
@@ -97,15 +101,23 @@ pub struct ServerInfo {
 }
 
 pub struct IoBus {
+    pub supply_fault: Arc<Topic<bool>>,
     pub server_info: Arc<Topic<ServerInfo>>,
     pub nodes: Arc<Topic<Nodes>>,
 }
 
 impl IoBus {
-    pub fn new(bb: &mut BrokerBuilder) -> Self {
+    pub fn new(
+        bb: &mut BrokerBuilder,
+        iobus_pwr_en: Arc<Topic<bool>>,
+        iobus_curr: CalibratedChannel,
+        iobus_volt: CalibratedChannel,
+    ) -> Self {
+        let supply_fault = bb.topic_ro("/v1/iobus/feedback/fault", None);
         let server_info = bb.topic_ro("/v1/iobus/server/info", None);
         let nodes = bb.topic_ro("/v1/iobus/server/nodes", None);
 
+        let supply_fault_task = supply_fault.clone();
         let server_info_task = server_info.clone();
         let nodes_task = nodes.clone();
 
@@ -125,10 +137,24 @@ impl IoBus {
                     nodes_task.set_if_changed(nodes);
                 }
 
+                // Report the power supply health
+                let pwr_en = iobus_pwr_en.try_get().unwrap_or(false);
+                let current = iobus_curr.get();
+                let voltage = iobus_volt.get();
+
+                let undervolt = pwr_en && (voltage.value < VOLTAGE_MIN);
+                let overcurrent = current.value > CURRENT_MAX;
+
+                supply_fault_task.set_if_changed(undervolt || overcurrent);
+
                 sleep(Duration::from_secs(1)).await;
             }
         });
 
-        Self { server_info, nodes }
+        Self {
+            supply_fault,
+            server_info,
+            nodes,
+        }
     }
 }

src/main.rs

@@ -84,7 +84,12 @@ async fn main() -> Result<(), std::io::Error> {
 
     // Expose other software on the TAC via the broker framework by connecting
     // to them via HTTP / DBus APIs.
-    let iobus = IoBus::new(&mut bb);
+    let iobus = IoBus::new(
+        &mut bb,
+        regulators.iobus_pwr_en.clone(),
+        adc.iobus_curr.fast.clone(),
+        adc.iobus_volt.fast.clone(),
+    );
     let (network, rauc, systemd) = {
         let dbus = DbusSession::new(&mut bb, led.eth_dut.clone(), led.eth_lab.clone()).await;
 

src/regulators.rs

@@ -25,7 +25,22 @@ use crate::broker::{BrokerBuilder, Topic};
 mod reg {
     use std::io::Result;
 
+    use async_std::task::block_on;
+
+    use crate::adc::IioThread;
+
     pub fn regulator_set(name: &str, state: bool) -> Result<()> {
+        if name == "output_iobus_12v" {
+            let iio_thread = block_on(IioThread::new()).unwrap();
+
+            iio_thread
+                .clone()
+                .get_channel("iobus-curr")
+                .unwrap()
+                .set(state);
+            iio_thread.get_channel("iobus-volt").unwrap().set(state);
+        }
+
         let state = if state { "enabled" } else { "disabled" };
         println!("Regulator: would set {name} to {state} but don't feel like it");
 

src/ui/screens.rs

@@ -29,6 +29,7 @@ use serde::{Deserialize, Serialize};
 mod dig_out;
 mod help;
 mod iobus;
+mod iobus_health;
 mod locator;
 mod power;
 mod reboot;
@@ -43,6 +44,7 @@ mod usb;
 use dig_out::DigOutScreen;
 use help::HelpScreen;
 use iobus::IoBusScreen;
+use iobus_health::IoBusHealthScreen;
 use locator::LocatorScreen;
 use power::PowerScreen;
 use reboot::RebootConfirmScreen;
@@ -75,6 +77,7 @@ pub enum NormalScreen {
 #[derive(Serialize, Deserialize, PartialEq, PartialOrd, Eq, Ord, Clone, Copy, Debug)]
 pub enum AlertScreen {
     ScreenSaver,
+    IoBusHealth,
     Locator,
     RebootConfirm,
     UpdateAvailable,
@@ -185,6 +188,7 @@ pub(super) fn init(
         Box::new(UartScreen::new()),
         Box::new(UsbScreen::new()),
         Box::new(HelpScreen::new(alerts, &res.setup_mode.show_help)),
+        Box::new(IoBusHealthScreen::new(alerts, &res.iobus.supply_fault)),
         Box::new(UpdateInstallationScreen::new(
             alerts,
             &res.rauc.operation,

src/ui/screens/iobus.rs

@@ -111,7 +111,7 @@ impl ActivatableScreen for IoBusScreen {
 
         widgets.push(|display| {
             DynamicWidget::indicator(
-                ui.res.dig_io.iobus_flt_fb.clone(),
+                ui.res.iobus.supply_fault.clone(),
                 display,
                 row_anchor(2) + OFFSET_INDICATOR,
                 Box::new(|state: &bool| match *state {