dut_power: determine GPIO flags based on hardware generation

Now that we know the LXA TAC hardware generation we are running on
there is no longer a need to guess based on the name of the GPIO
driver's name.

This also means we can remove the driver name shims for demo and
test modes.

Signed-off-by: Leonard Göhrs <[email protected]>

Author: hnez

src/digital_io/gpio/demo_mode.rs

@@ -80,14 +80,6 @@ impl BitOr for LineRequestFlags {
     }
 }
 
-pub struct ChipDecoy;
-
-impl ChipDecoy {
-    pub fn label(&self) -> &'static str {
-        "demo_mode"
-    }
-}
-
 pub struct FindDecoy {
     name: String,
 }
@@ -102,10 +94,6 @@ impl FindDecoy {
 
         Ok(line_handle)
     }
-
-    pub fn chip(&self) -> ChipDecoy {
-        ChipDecoy
-    }
 }
 
 pub fn find_line(name: &str) -> Option<FindDecoy> {

src/digital_io/gpio/test.rs

@@ -57,14 +57,6 @@ impl BitOr for LineRequestFlags {
     }
 }
 
-pub struct ChipDecoy;
-
-impl ChipDecoy {
-    pub fn label(&self) -> &'static str {
-        "test"
-    }
-}
-
 pub struct FindDecoy {
     name: String,
     val: Arc<AtomicU8>,
@@ -80,10 +72,6 @@ impl FindDecoy {
         })
     }
 
-    pub fn chip(&self) -> ChipDecoy {
-        ChipDecoy
-    }
-
     pub fn stub_get(&self) -> u8 {
         self.val.load(Ordering::Relaxed)
     }

src/dut_power.rs

@@ -30,6 +30,7 @@ use crate::adc::AdcChannel;
 use crate::broker::{BrokerBuilder, Topic};
 use crate::digital_io::{find_line, LineHandle, LineRequestFlags};
 use crate::led::{BlinkPattern, BlinkPatternBuilder};
+use crate::system::HardwareGeneration;
 use crate::watched_tasks::WatchedTasksBuilder;
 
 #[cfg(any(test, feature = "demo_mode"))]
@@ -71,6 +72,27 @@ const MIN_VOLTAGE: f32 = -1.0;
 const PWR_LINE_ASSERTED: u8 = 0;
 const DISCHARGE_LINE_ASSERTED: u8 = 0;
 
+trait OutputFlags {
+    fn output_flags(&self) -> LineRequestFlags;
+}
+
+impl OutputFlags for HardwareGeneration {
+    fn output_flags(&self) -> LineRequestFlags {
+        // Early TACs have a i2c port expander on the power board.
+        // This port expander is output only and can not be configured as
+        // open drain.
+        // The outputs on later TACs should however be driven open drain
+        // for EMI reasons.
+
+        match self {
+            HardwareGeneration::Gen1 => LineRequestFlags::OUTPUT,
+            HardwareGeneration::Gen2 | HardwareGeneration::Gen3 => {
+                LineRequestFlags::OUTPUT | LineRequestFlags::OPEN_DRAIN
+            }
+        }
+    }
+}
+
 #[derive(PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub enum OutputRequest {
     Idle,
@@ -295,22 +317,14 @@ impl DutPwrThread {
         pwr_volt: AdcChannel,
         pwr_curr: AdcChannel,
         pwr_led: Arc<Topic<BlinkPattern>>,
+        hardware_generation: HardwareGeneration,
     ) -> Result<Self> {
         let pwr_line = find_line("DUT_PWR_EN")
             .ok_or_else(|| anyhow!("Could not find GPIO line DUT_PWR_EN"))?;
         let discharge_line = find_line("DUT_PWR_DISCH")
             .ok_or_else(|| anyhow!("Could not find GPIO line DUT_PWR_DISCH"))?;
 
-        // Early TACs have a i2c port expander on the power board.
-        // This port expander is output only and can not be configured as
-        // open drain.
-        // The outputs on later TACs should however be driven open drain
-        // for EMI reasons.
-        let flags = match pwr_line.chip().label() {
-            "pca9570" => LineRequestFlags::OUTPUT,
-            _ => LineRequestFlags::OUTPUT | LineRequestFlags::OPEN_DRAIN,
-        };
-
+        let flags = hardware_generation.output_flags();
         let pwr_line = pwr_line.request(flags, 1 - PWR_LINE_ASSERTED, "tacd")?;
         let discharge_line = discharge_line.request(flags, DISCHARGE_LINE_ASSERTED, "tacd")?;
 
@@ -600,6 +614,7 @@ mod tests {
     use crate::adc::Adc;
     use crate::broker::{BrokerBuilder, Topic};
     use crate::digital_io::find_line;
+    use crate::system::HardwareGeneration;
     use crate::watched_tasks::WatchedTasksBuilder;
 
     use super::{
@@ -610,6 +625,7 @@ mod tests {
     #[test]
     fn failsafe() {
         let mut wtb = WatchedTasksBuilder::new();
+        let hardware_generation = HardwareGeneration::Gen3;
         let pwr_line = find_line("DUT_PWR_EN").unwrap();
         let discharge_line = find_line("DUT_PWR_DISCH").unwrap();
 
@@ -624,6 +640,7 @@ mod tests {
                 adc.pwr_volt.clone(),
                 adc.pwr_curr.clone(),
                 led.clone(),
+                hardware_generation,
             ))
             .unwrap();
 
@@ -769,6 +786,7 @@ mod tests {
     #[test]
     fn grace_period() {
         let mut wtb = WatchedTasksBuilder::new();
+        let hardware_generation = HardwareGeneration::Gen3;
         let pwr_line = find_line("DUT_PWR_EN").unwrap();
         let discharge_line = find_line("DUT_PWR_DISCH").unwrap();
 
@@ -783,6 +801,7 @@ mod tests {
                 adc.pwr_volt.clone(),
                 adc.pwr_curr.clone(),
                 led,
+                hardware_generation,
             ))
             .unwrap();
 

src/main.rs

@@ -82,6 +82,7 @@ async fn init(screenshooter: ScreenShooter) -> Result<(Ui, WatchedTasksBuilder)>
         adc.pwr_volt.clone(),
         adc.pwr_curr.clone(),
         led.dut_pwr.clone(),
+        hardware_generation,
     )
     .await?;
     let dig_io = DigitalIo::new(&mut bb, &mut wtb, led.out_0.clone(), led.out_1.clone())?;