Merge branch 'feature/flash-storage' of github.com:quartiq/stabilizer…

… into feature/flash-storage
quartiq · Nov 14, 2023 · 58904b2 · 58904b2
2 parents 6f17197 + e9aaec4
commit 58904b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ cortex-m-rtic = "1.0"
 embedded-hal = "0.2.7"
 num_enum = { version = "0.7.1", default-features = false }
 paste = "1"
-idsp = "0.12"
+idsp = "0.13"
 ad9959 = { path = "ad9959", version = "0.2.1" }
 mcp230xx = "1.0"
 mutex-trait = "0.2"
@@ -72,7 +72,7 @@ bbqueue = "0.5"
 postcard = "1"
 
 [dependencies.stm32h7xx-hal]
-version = "0.15.0"
+version = "0.15.1"
 features = ["stm32h743v", "rt", "ethernet", "xspi", "usb_hs"]
 
 [features]

diff --git a/src/bin/lockin.rs b/src/bin/lockin.rs
@@ -37,7 +37,7 @@ use core::{
 use fugit::ExtU64;
 use mutex_trait::prelude::*;
 
-use idsp::{Accu, Chain, Complex, ComplexExt, Filter, Lockin, Lowpass, RPLL};
+use idsp::{Accu, Complex, ComplexExt, Filter, Lockin, Lowpass, Repeat, RPLL};
 
 use stabilizer::{
     hardware::{
@@ -237,7 +237,7 @@ mod app {
         adcs: (Adc0Input, Adc1Input),
         dacs: (Dac0Output, Dac1Output),
         pll: RPLL,
-        lockin: Lockin<Chain<2, Lowpass<2>>>,
+        lockin: Lockin<Repeat<2, Lowpass<2>>>,
         signal_generator: signal_generator::SignalGenerator,
         generator: FrameGenerator,
         cpu_temp_sensor: stabilizer::hardware::cpu_temp_sensor::CpuTempSensor,