diff --git a/Cargo.lock b/Cargo.lock index a8b27878d..0589da15d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,9 +351,9 @@ dependencies = [ [[package]] name = "idsp" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2013b1ad00c5b617d4fe0277fa41af6e0173a7dea648f7f84d71b9529fd12d0d" +checksum = "454770ee82223cd2580e0cef04b4e5dbe5b60f11600e3cb7e910aaf0d62c99ce" dependencies = [ "num-complex 0.4.4", "num-traits", diff --git a/Cargo.toml b/Cargo.toml index d0ad36675..e1f95e4da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,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" diff --git a/src/bin/lockin.rs b/src/bin/lockin.rs index a116b4da1..e89731171 100644 --- 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>>, + lockin: Lockin>>, signal_generator: signal_generator::SignalGenerator, generator: FrameGenerator, cpu_temp_sensor: stabilizer::hardware::cpu_temp_sensor::CpuTempSensor,