diff --git a/Cargo.lock b/Cargo.lock index 946a634..6c6641d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "ad9959" version = "0.1.0" @@ -457,7 +459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c0d5c9540a691d153064dc47a4db2504587a75eae07bf1d73f7a596ebc73c04" dependencies = [ "matrixmultiply", - "num-complex", + "num-complex 0.3.1", "num-integer", "num-traits", "rawpointer", @@ -471,11 +473,11 @@ checksum = "2178127478ae4ee9be7180bc9c3bffb6354dd7238400db567102f98c413a9f35" [[package]] name = "num" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" dependencies = [ - "num-complex", + "num-complex 0.4.0", "num-integer", "num-iter", "num-rational", @@ -491,6 +493,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-complex" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +dependencies = [ + "num-traits", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -514,9 +525,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg", "num-integer", @@ -748,12 +759,12 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stm32h7" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7571f17d1ed7d67957d0004de6c52bd1ef5e736ed5ddc2bcecf001512269f77c" +checksum = "8b672c837e0ee8158ecc7fce0f9a948dd0693a9c588338e728d14b73307a0b7d" dependencies = [ "bare-metal 0.2.5", - "cortex-m 0.6.7", + "cortex-m 0.7.1", "cortex-m-rt", "vcell", ] @@ -761,11 +772,11 @@ dependencies = [ [[package]] name = "stm32h7xx-hal" version = "0.8.0" -source = "git+https://github.com/stm32-rs/stm32h7xx-hal?branch=master#08231e334a11236fe556668ac19cb1c214da2406" +source = "git+https://github.com/stm32-rs/stm32h7xx-hal?branch=master#ad2a1ae9831dd34e171cc178cdad84e770b4c0ae" dependencies = [ "bare-metal 1.0.0", "cast", - "cortex-m 0.6.7", + "cortex-m 0.7.1", "cortex-m-rt", "embedded-dma", "embedded-hal", diff --git a/README.md b/README.md index 19b5a0d..4250d6a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![QUARTIQ Matrix Chat](https://img.shields.io/matrix/quartiq:matrix.org)](https://matrix.to/#/#quartiq:matrix.org) +[![Continuous Integration](https://github.com/quartiq/stabilizer/actions/workflows/ci.yml/badge.svg)](https://github.com/quartiq/stabilizer/actions/workflows/ci.yml) [![HITL (private)](https://github.com/quartiq/hitl/workflows/Stabilizer/badge.svg)](https://github.com/quartiq/hitl/actions?query=workflow%3AStabilizer) # Stabilizer Firmware diff --git a/dsp/Cargo.toml b/dsp/Cargo.toml index 4c675ff..9b92078 100644 --- a/dsp/Cargo.toml +++ b/dsp/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" libm = "0.2.1" serde = { version = "1.0", features = ["derive"], default-features = false } generic-array = "0.14" -num = { version = "0.3.1", default-features = false } +num = { version = "0.4.0", default-features = false } miniconf = "0.1" [dev-dependencies] diff --git a/src/hardware/pounder/mod.rs b/src/hardware/pounder/mod.rs index 0497a37..32a8e80 100644 --- a/src/hardware/pounder/mod.rs +++ b/src/hardware/pounder/mod.rs @@ -231,14 +231,16 @@ impl ad9959::Interface for QspiInterface { }; self.qspi - .write(encoded_address, &encoded_payload) + .write(encoded_address.into(), &encoded_payload) .map_err(|_| Error::Qspi) } ad9959::Mode::FourBitSerial => { if self.streaming { Err(Error::Qspi) } else { - self.qspi.write(addr, data).map_err(|_| Error::Qspi)?; + self.qspi + .write(addr.into(), data) + .map_err(|_| Error::Qspi)?; Ok(()) } } @@ -257,7 +259,7 @@ impl ad9959::Interface for QspiInterface { } self.qspi - .read(0x80_u8 | addr, dest) + .read((0x80_u8 | addr).into(), dest) .map_err(|_| Error::Qspi) } }