From ab0621b3ebfe1c3da10109ae4f429fa7dff86ce6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 04:25:27 +0000 Subject: [PATCH 1/2] build(deps): bump stm32h7xx-hal from 0.15.0 to 0.15.1 Bumps [stm32h7xx-hal](https://github.com/stm32-rs/stm32h7xx-hal) from 0.15.0 to 0.15.1. - [Changelog](https://github.com/stm32-rs/stm32h7xx-hal/blob/master/CHANGELOG.md) - [Commits](https://github.com/stm32-rs/stm32h7xx-hal/compare/v0.15.0...v0.15.1) --- updated-dependencies: - dependency-name: stm32h7xx-hal dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7ebcc4bb..a8b27878d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -952,9 +952,9 @@ dependencies = [ [[package]] name = "stm32h7xx-hal" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42323c63e7ee7b6979d9370ef7f381860bbd16653bd24a30cf26e78877dbf3fb" +checksum = "e08bcfbdbe4458133f2fd55994a5c4f1b4bf28084f0218e93cdbc19d7c70219f" dependencies = [ "bare-metal 1.0.0", "cast", diff --git a/Cargo.toml b/Cargo.toml index 44333108b..d0ad36675 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ smoltcp-nal = { version = "0.4.1", features = ["shared-stack"]} bbqueue = "0.5" [dependencies.stm32h7xx-hal] -version = "0.15.0" +version = "0.15.1" features = ["stm32h743v", "rt", "ethernet", "xspi", "usb_hs"] [features] From 9de50e1ea9d9deb35d544863f7b954c7080fc246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Mon, 6 Nov 2023 10:12:35 +0100 Subject: [PATCH 2/2] bump idsp --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/bin/lockin.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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,