Merge branch 'master' into rs/issue-276/unique-identifiers

dsp/benches/micro.rs

@@ -67,7 +67,7 @@ fn iir_bench() {
     let mut xy = iir::Vec5::default();
     println!(
         "int::IIR::update(s, x): {}",
-        bench_env(0.32241, |x| dut.update(&mut xy, *x))
+        bench_env(0.32241, |x| dut.update(&mut xy, *x, true))
     );
 }
 

dsp/src/iir.rs

@@ -117,7 +117,7 @@ impl IIR {
     /// # Arguments
     /// * `xy` - Current filter state.
     /// * `x0` - New input.
-    pub fn update(&self, xy: &mut Vec5, x0: f32) -> f32 {
+    pub fn update(&self, xy: &mut Vec5, x0: f32, hold: bool) -> f32 {
         let n = self.ba.len();
         debug_assert!(xy.len() == n);
         // `xy` contains       x0 x1 y0 y1 y2
@@ -128,7 +128,11 @@ impl IIR {
         // Store x0            x0 x1 x2 y1 y2
         xy[0] = x0;
         // Compute y0 by multiply-accumulate
-        let y0 = macc(self.y_offset, xy, &self.ba);
+        let y0 = if hold {
+            xy[n / 2 + 1]
+        } else {
+            macc(self.y_offset, xy, &self.ba)
+        };
         // Limit y0
         let y0 = max(self.y_min, min(self.y_max, y0));
         // Store y0            x0 x1 y0 y1 y2

src/bin/dual-iir.rs

@@ -2,8 +2,6 @@
 #![no_std]
 #![no_main]
 
-use stm32h7xx_hal as hal;
-
 use stabilizer::{hardware, net};
 
 use miniconf::Miniconf;
@@ -11,20 +9,23 @@ use serde::Deserialize;
 
 use dsp::iir;
 use hardware::{
-    Adc0Input, Adc1Input, AfeGain, Dac0Output, Dac1Output, AFE0, AFE1,
+    Adc0Input, Adc1Input, AfeGain, Dac0Output, Dac1Output, DigitalInput1,
+    InputPin, AFE0, AFE1,
 };
 
-use net::{Action, MqttSettings};
+use net::{Action, MiniconfInterface};
 
 const SCALE: f32 = i16::MAX as _;
 
 // The number of cascaded IIR biquads per channel. Select 1 or 2!
 const IIR_CASCADE_LENGTH: usize = 1;
 
-#[derive(Debug, Deserialize, Miniconf)]
+#[derive(Clone, Copy, Debug, Deserialize, Miniconf)]
 pub struct Settings {
     afe: [AfeGain; 2],
     iir_ch: [[iir::IIR; IIR_CASCADE_LENGTH]; 2],
+    allow_hold: bool,
+    force_hold: bool,
 }
 
 impl Default for Settings {
@@ -32,6 +33,8 @@ impl Default for Settings {
         Self {
             afe: [AfeGain::G1, AfeGain::G1],
             iir_ch: [[iir::IIR::new(1., -SCALE, SCALE); IIR_CASCADE_LENGTH]; 2],
+            allow_hold: false,
+            force_hold: false,
         }
     }
 }
@@ -40,23 +43,23 @@ impl Default for Settings {
 const APP: () = {
     struct Resources {
         afes: (AFE0, AFE1),
+        digital_input1: DigitalInput1,
         adcs: (Adc0Input, Adc1Input),
         dacs: (Dac0Output, Dac1Output),
-        mqtt_settings: MqttSettings<Settings>,
+        mqtt_config: MiniconfInterface<Settings>,
 
         // Format: iir_state[ch][cascade-no][coeff]
         #[init([[[0.; 5]; IIR_CASCADE_LENGTH]; 2])]
         iir_state: [[iir::Vec5; IIR_CASCADE_LENGTH]; 2],
-        #[init([[iir::IIR::new(1., -SCALE, SCALE); IIR_CASCADE_LENGTH]; 2])]
+        settings: Settings,
-        iir_ch: [[iir::IIR; IIR_CASCADE_LENGTH]; 2],
     }
 
-    #[init]
+    #[init(spawn=[settings_update])]
     fn init(c: init::Context) -> init::LateResources {
         // Configure the microcontroller
         let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device);
 
-        let mqtt_settings = MqttSettings::new(
+        let mqtt_config = MiniconfInterface::new(
             stabilizer.net.stack,
             "",
             &net::get_device_prefix(
@@ -67,6 +70,9 @@ const APP: () = {
             stabilizer.cycle_counter,
         );
 
+        // Spawn a settings update for default settings.
+        c.spawn.settings_update().unwrap();
+
         // Enable ADC/DAC events
         stabilizer.adcs.0.start();
         stabilizer.adcs.1.start();
@@ -80,7 +86,9 @@ const APP: () = {
             afes: stabilizer.afes,
             adcs: stabilizer.adcs,
             dacs: stabilizer.dacs,
-            mqtt_settings,
+            mqtt_config,
+            digital_input1: stabilizer.digital_inputs.1,
+            settings: Settings::default(),
         }
     }
 
@@ -100,7 +108,7 @@ const APP: () = {
     ///
     /// Because the ADC and DAC operate at the same rate, these two constraints actually implement
     /// the same time bounds, meeting one also means the other is also met.
-    #[task(binds=DMA1_STR4, resources=[adcs, dacs, iir_state, iir_ch], priority=2)]
+    #[task(binds=DMA1_STR4, resources=[adcs, digital_input1, dacs, iir_state, settings], priority=2)]
     fn process(c: process::Context) {
         let adc_samples = [
             c.resources.adcs.0.acquire_buffer(),
@@ -112,13 +120,19 @@ const APP: () = {
             c.resources.dacs.1.acquire_buffer(),
         ];
 
+        let hold = c.resources.settings.force_hold
+            || (c.resources.digital_input1.is_high().unwrap()
+                && c.resources.settings.allow_hold);
+
         for channel in 0..adc_samples.len() {
             for sample in 0..adc_samples[0].len() {
-                let x = f32::from(adc_samples[channel][sample] as i16);
+                let mut y = f32::from(adc_samples[channel][sample] as i16);
-                let mut y = x;
                 for i in 0..c.resources.iir_state[channel].len() {
-                    y = c.resources.iir_ch[channel][i]
+                    y = c.resources.settings.iir_ch[channel][i].update(
-                        .update(&mut c.resources.iir_state[channel][i], y);
+                        &mut c.resources.iir_state[channel][i],
+                        y,
+                        hold,
+                    );
                 }
                 // Note(unsafe): The filter limits ensure that the value is in range.
                 // The truncation introduces 1/2 LSB distortion.
@@ -129,10 +143,14 @@ const APP: () = {
         }
     }
 
-    #[idle(resources=[mqtt_settings], spawn=[settings_update])]
+    #[idle(resources=[mqtt_config], spawn=[settings_update])]
     fn idle(mut c: idle::Context) -> ! {
         loop {
-            match c.resources.mqtt_settings.lock(|settings| settings.update()) {
+            match c
+                .resources
+                .mqtt_config
+                .lock(|config_interface| config_interface.update())
+            {
                 Some(Action::Sleep) => cortex_m::asm::wfi(),
                 Some(Action::UpdateSettings) => {
                     c.spawn.settings_update().unwrap()
@@ -142,12 +160,12 @@ const APP: () = {
         }
     }
 
-    #[task(priority = 1, resources=[mqtt_settings, afes, iir_ch])]
+    #[task(priority = 1, resources=[mqtt_config, afes, settings])]
     fn settings_update(mut c: settings_update::Context) {
-        let settings = &c.resources.mqtt_settings.mqtt.settings;
+        let settings = &c.resources.mqtt_config.mqtt.settings;
 
         // Update the IIR channels.
-        c.resources.iir_ch.lock(|iir| *iir = settings.iir_ch);
+        c.resources.settings.lock(|current| *current = *settings);
 
         // Update AFEs
         c.resources.afes.0.set_gain(settings.afe[0]);
@@ -156,7 +174,7 @@ const APP: () = {
 
     #[task(binds = ETH, priority = 1)]
     fn eth(_: eth::Context) {
-        unsafe { hal::ethernet::interrupt_handler() }
+        unsafe { stm32h7xx_hal::ethernet::interrupt_handler() }
     }
 
     #[task(binds = SPI2, priority = 3)]

src/bin/lockin-external.rs

@@ -16,7 +16,7 @@ use stabilizer::hardware::{
 };
 
 use miniconf::Miniconf;
-use stabilizer::net::{Action, MqttSettings};
+use stabilizer::net::{Action, MiniconfInterface};
 
 #[derive(Copy, Clone, Debug, Deserialize, Miniconf)]
 enum Conf {
@@ -60,7 +60,7 @@ const APP: () = {
         afes: (AFE0, AFE1),
         adcs: (Adc0Input, Adc1Input),
         dacs: (Dac0Output, Dac1Output),
-        mqtt_settings: MqttSettings<Settings>,
+        mqtt_config: MiniconfInterface<Settings>,
         settings: Settings,
 
         timestamper: InputStamper,
@@ -73,7 +73,7 @@ const APP: () = {
         // Configure the microcontroller
         let (mut stabilizer, _pounder) = setup(c.core, c.device);
 
-        let mqtt_settings = MqttSettings::new(
+        let mqtt_config = MiniconfInterface::new(
             stabilizer.net.stack,
             "",
             &net::get_device_prefix(
@@ -113,7 +113,7 @@ const APP: () = {
             afes: stabilizer.afes,
             adcs: stabilizer.adcs,
             dacs: stabilizer.dacs,
-            mqtt_settings,
+            mqtt_config,
             timestamper: stabilizer.timestamper,
 
             settings,
@@ -195,10 +195,14 @@ const APP: () = {
         }
     }
 
-    #[idle(resources=[mqtt_settings], spawn=[settings_update])]
+    #[idle(resources=[mqtt_config], spawn=[settings_update])]
     fn idle(mut c: idle::Context) -> ! {
         loop {
-            match c.resources.mqtt_settings.lock(|settings| settings.update()) {
+            match c
+                .resources
+                .mqtt_config
+                .lock(|config_interface| config_interface.update())
+            {
                 Some(Action::Sleep) => cortex_m::asm::wfi(),
                 Some(Action::UpdateSettings) => {
                     c.spawn.settings_update().unwrap()
@@ -208,9 +212,9 @@ const APP: () = {
         }
     }
 
-    #[task(priority = 1, resources=[mqtt_settings, settings, afes])]
+    #[task(priority = 1, resources=[mqtt_config, settings, afes])]
     fn settings_update(mut c: settings_update::Context) {
-        let settings = &c.resources.mqtt_settings.mqtt.settings;
+        let settings = &c.resources.mqtt_config.mqtt.settings;
 
         c.resources.afes.0.set_gain(settings.afe[0]);
         c.resources.afes.1.set_gain(settings.afe[1]);

src/hardware/configuration.rs

@@ -13,8 +13,8 @@ use embedded_hal::digital::v2::{InputPin, OutputPin};
 
 use super::{
     adc, afe, cycle_counter::CycleCounter, dac, design_parameters,
-    digital_input_stamper, eeprom, pounder, timers, DdsOutput, EthernetPhy,
+    digital_input_stamper, eeprom, pounder, timers, DdsOutput, DigitalInput0,
-    NetworkStack, AFE0, AFE1,
+    DigitalInput1, EthernetPhy, NetworkStack, AFE0, AFE1,
 };
 
 pub struct NetStorage {
@@ -70,6 +70,7 @@ pub struct StabilizerDevices {
     pub timestamp_timer: timers::TimestampTimer,
     pub net: NetworkDevices,
     pub cycle_counter: CycleCounter,
+    pub digital_inputs: (DigitalInput0, DigitalInput1),
 }
 
 /// The available Pounder-specific hardware interfaces.
@@ -440,6 +441,12 @@ pub fn setup(
         )
     };
 
+    let digital_inputs = {
+        let di0 = gpiog.pg9.into_floating_input();
+        let di1 = gpioc.pc15.into_floating_input();
+        (di0, di1)
+    };
+
     let mut eeprom_i2c = {
         let sda = gpiof.pf0.into_alternate_af4().set_open_drain();
         let scl = gpiof.pf1.into_alternate_af4().set_open_drain();
@@ -874,6 +881,7 @@ pub fn setup(
         adc_dac_timer: sampling_timer,
         timestamp_timer,
         cycle_counter,
+        digital_inputs,
     };
 
     // info!("Version {} {}", build_info::PKG_VERSION, build_info::GIT_VERSION.unwrap());

src/hardware/mod.rs

@@ -1,6 +1,9 @@
 ///! Module for all hardware-specific setup of Stabilizer
 use stm32h7xx_hal as hal;
 
+// Re-export for the DigitalInputs below:
+pub use embedded_hal::digital::v2::InputPin;
+
 #[cfg(feature = "semihosting")]
 use panic_semihosting as _;
 
@@ -34,6 +37,14 @@ pub type AFE1 = afe::ProgrammableGainAmplifier<
     hal::gpio::gpiod::PD15<hal::gpio::Output<hal::gpio::PushPull>>,
 >;
 
+// Type alias for digital input 0 (DI0).
+pub type DigitalInput0 =
+    hal::gpio::gpiog::PG9<hal::gpio::Input<hal::gpio::Floating>>;
+
+// Type alias for digital input 1 (DI1).
+pub type DigitalInput1 =
+    hal::gpio::gpioc::PC15<hal::gpio::Input<hal::gpio::Floating>>;
+
 pub type NetworkStack = smoltcp_nal::NetworkStack<
     'static,
     'static,

src/net/mod.rs

@@ -5,8 +5,7 @@ use crate::hardware::{
 use core::fmt::Write;
 
 use heapless::{consts, String};
-
+use miniconf::minimq;
-use miniconf::{minimq, MqttInterface};
 
 /// Potential actions for firmware to take.
 pub enum Action {
@@ -18,17 +17,17 @@ pub enum Action {
 }
 
 /// MQTT settings interface.
-pub struct MqttSettings<S>
+pub struct MiniconfInterface<S>
 where
     S: miniconf::Miniconf + Default,
 {
-    pub mqtt: MqttInterface<S, NetworkStack, minimq::consts::U256>,
+    pub mqtt: miniconf::MqttInterface<S, NetworkStack, minimq::consts::U256>,
     clock: CycleCounter,
     phy: EthernetPhy,
     network_was_reset: bool,
 }
 
-impl<S> MqttSettings<S>
+impl<S> MiniconfInterface<S>
 where
     S: miniconf::Miniconf + Default,
 {
@@ -53,7 +52,8 @@ where
                     .unwrap()
             };
 
-            MqttInterface::new(mqtt_client, prefix, S::default()).unwrap()
+            miniconf::MqttInterface::new(mqtt_client, prefix, S::default())
+                .unwrap()
         };
 
         Self {