adc: use one IioThread per ADC

This is in preparation for the use of buffered iio for the powerboard ADC.
This commit does not add the buffering yet but instead only splits the
mainboard ADC handling and powerboard ADC handling into separate threads,
as the two ADCs will work at independent sampling rates, which means reading
values should not block on the respective other ADC.

Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>

Author: hnez

src/adc.rs

@@ -78,11 +78,12 @@ pub struct Adc {
 
 impl Adc {
     pub async fn new(bb: &mut BrokerBuilder) -> Result<Self> {
-        let iio_thread = IioThread::new().await?;
+        let stm32_thread = IioThread::new_stm32().await?;
+        let powerboard_thread = IioThread::new_powerboard().await?;
 
         let adc = Self {
             usb_host_curr: AdcChannel {
-                fast: iio_thread.clone().get_channel("usb-host-curr").unwrap(),
+                fast: stm32_thread.clone().get_channel("usb-host-curr").unwrap(),
                 topic: bb.topic(
                     "/v1/usb/host/total/feedback/current",
                     true,
@@ -93,7 +94,7 @@ impl Adc {
                 ),
             },
             usb_host1_curr: AdcChannel {
-                fast: iio_thread.clone().get_channel("usb-host1-curr").unwrap(),
+                fast: stm32_thread.clone().get_channel("usb-host1-curr").unwrap(),
                 topic: bb.topic(
                     "/v1/usb/host/port1/feedback/current",
                     true,
@@ -104,7 +105,7 @@ impl Adc {
                 ),
             },
             usb_host2_curr: AdcChannel {
-                fast: iio_thread.clone().get_channel("usb-host2-curr").unwrap(),
+                fast: stm32_thread.clone().get_channel("usb-host2-curr").unwrap(),
                 topic: bb.topic(
                     "/v1/usb/host/port2/feedback/current",
                     true,
@@ -115,7 +116,7 @@ impl Adc {
                 ),
             },
             usb_host3_curr: AdcChannel {
-                fast: iio_thread.clone().get_channel("usb-host3-curr").unwrap(),
+                fast: stm32_thread.clone().get_channel("usb-host3-curr").unwrap(),
                 topic: bb.topic(
                     "/v1/usb/host/port3/feedback/current",
                     true,
@@ -126,7 +127,7 @@ impl Adc {
                 ),
             },
             out0_volt: AdcChannel {
-                fast: iio_thread.clone().get_channel("out0-volt").unwrap(),
+                fast: stm32_thread.clone().get_channel("out0-volt").unwrap(),
                 topic: bb.topic(
                     "/v1/output/out_0/feedback/voltage",
                     true,
@@ -137,7 +138,7 @@ impl Adc {
                 ),
             },
             out1_volt: AdcChannel {
-                fast: iio_thread.clone().get_channel("out1-volt").unwrap(),
+                fast: stm32_thread.clone().get_channel("out1-volt").unwrap(),
                 topic: bb.topic(
                     "/v1/output/out_1/feedback/voltage",
                     true,
@@ -148,7 +149,7 @@ impl Adc {
                 ),
             },
             iobus_curr: AdcChannel {
-                fast: iio_thread.clone().get_channel("iobus-curr").unwrap(),
+                fast: stm32_thread.clone().get_channel("iobus-curr").unwrap(),
                 topic: bb.topic(
                     "/v1/iobus/feedback/current",
                     true,
@@ -159,7 +160,7 @@ impl Adc {
                 ),
             },
             iobus_volt: AdcChannel {
-                fast: iio_thread.clone().get_channel("iobus-volt").unwrap(),
+                fast: stm32_thread.clone().get_channel("iobus-volt").unwrap(),
                 topic: bb.topic(
                     "/v1/iobus/feedback/voltage",
                     true,
@@ -170,7 +171,7 @@ impl Adc {
                 ),
             },
             pwr_volt: AdcChannel {
-                fast: iio_thread.clone().get_channel("pwr-volt").unwrap(),
+                fast: powerboard_thread.clone().get_channel("pwr-volt").unwrap(),
                 topic: bb.topic(
                     "/v1/dut/feedback/voltage",
                     true,
@@ -181,7 +182,7 @@ impl Adc {
                 ),
             },
             pwr_curr: AdcChannel {
-                fast: iio_thread.get_channel("pwr-curr").unwrap(),
+                fast: powerboard_thread.get_channel("pwr-curr").unwrap(),
                 topic: bb.topic(
                     "/v1/dut/feedback/current",
                     true,

src/adc/iio/demo_mode.rs

@@ -29,7 +29,8 @@ use crate::measurement::{Measurement, Timestamp};
 // We need to somehow get the output states from digital_io/gpio/demo_mode.rs
 // to here. We could clobber the actual business code even more, or do dirty
 // mutable globals stuff.
-pub static DEMO_MAGIC: Mutex<Option<Arc<IioThread>>> = Mutex::new(None);
+pub static DEMO_MAGIC_STM32: Mutex<Option<Arc<IioThread>>> = Mutex::new(None);
+pub static DEMO_MAGIC_POWERBOARD: Mutex<Option<Arc<IioThread>>> = Mutex::new(None);
 
 pub struct CalibratedChannelInner {
     name: &'static str,
@@ -153,10 +154,10 @@ pub struct IioThread {
 }
 
 impl IioThread {
-    pub async fn new() -> Result<Arc<Self>> {
-        let mut demo_magic = block_on(DEMO_MAGIC.lock());
+    pub async fn new_stm32() -> Result<Arc<Self>> {
+        let mut demo_magic = block_on(DEMO_MAGIC_STM32.lock());
 
-        // Only ever set up a single demo_mode "IioThread"
+        // Only ever set up a single demo_mode "IioThread" per ADC
         if let Some(this) = &*demo_magic {
             return Ok(this.clone());
         }
@@ -179,6 +180,24 @@ impl IioThread {
             CalibratedChannel::with_exponential("out1-volt", 0.0, -3.3, 0.002, 0.2, 0.1),
             CalibratedChannel::with_exponential("iobus-curr", 0.15, 0.0, 0.001, 0.2, 0.01),
             CalibratedChannel::with_exponential("iobus-volt", 12.2, 0.0, 0.1, 0.2, 1.0),
+        ];
+
+        let this = Arc::new(Self { channels });
+
+        *demo_magic = Some(this.clone());
+
+        Ok(this)
+    }
+
+    pub async fn new_powerboard() -> Result<Arc<Self>> {
+        let mut demo_magic = block_on(DEMO_MAGIC_POWERBOARD.lock());
+
+        // Only ever set up a single demo_mode "IioThread" per ADC
+        if let Some(this) = &*demo_magic {
+            return Ok(this.clone());
+        }
+
+        let channels = vec![
             CalibratedChannel::with_exponential("pwr-volt", 24.0, 0.0, 0.02, 0.2, 2.0),
             CalibratedChannel::with_exponential("pwr-curr", 1.2, 0.0, 0.002, 0.2, 0.01),
         ];