From 7134df974944c9b05188d853290a907860abb757 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jan 2021 04:01:23 +0000 Subject: [PATCH 1/4] build(deps): bump smoltcp from 0.6.0 to 0.7.0 Bumps [smoltcp](https://github.com/smoltcp-rs/smoltcp) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/smoltcp-rs/smoltcp/releases) - [Changelog](https://github.com/smoltcp-rs/smoltcp/blob/master/CHANGELOG.md) - [Commits](https://github.com/smoltcp-rs/smoltcp/compare/v0.6.0...v0.7.0) Signed-off-by: dependabot[bot] --- Cargo.lock | 15 +++++++++++++-- Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 76fb832..748e98d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -827,6 +827,17 @@ dependencies = [ "managed", ] +[[package]] +name = "smoltcp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab527c390c7e107f687bd92a886a083fde61b8cdc700b37f3d7e4346ffd8fae1" +dependencies = [ + "bitflags", + "byteorder", + "managed", +] + [[package]] name = "stabilizer" version = "0.4.1" @@ -849,7 +860,7 @@ dependencies = [ "paste", "serde", "serde-json-core", - "smoltcp", + "smoltcp 0.7.0", "stm32h7xx-hal", ] @@ -884,7 +895,7 @@ dependencies = [ "embedded-hal", "nb 1.0.0", "paste", - "smoltcp", + "smoltcp 0.6.0", "stm32h7", "void", ] diff --git a/Cargo.toml b/Cargo.toml index f4f90fa..8e20684 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ ad9959 = { path = "ad9959" } git = "https://github.com/mrd0ll4r/mcp23017.git" [dependencies.smoltcp] -version = "0.6" +version = "0.7" features = ["ethernet", "proto-ipv4", "socket-tcp", "proto-ipv6"] default-features = false From 8317185e07144f22a0e2ce0e5c38a8fb2360d342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 31 Jan 2021 22:28:48 +0000 Subject: [PATCH 2/4] build(deps): bump stm32h7xx-hal from `3da22d4` to `2b8a04c` Bumps [stm32h7xx-hal](https://github.com/stm32-rs/stm32h7xx-hal) from `3da22d4` to `2b8a04c`. - [Release notes](https://github.com/stm32-rs/stm32h7xx-hal/releases) - [Commits](https://github.com/stm32-rs/stm32h7xx-hal/compare/3da22d4935c8f6e412b99e6662ec11da5265fb88...2b8a04caac566a8560f400ddd6503508f78bea77) Signed-off-by: dependabot[bot] --- Cargo.lock | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1380c7b..965e08a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,7 +36,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9a69a963b70ddacfcd382524f72a4576f359af9334b3bf48a79566590bb8bfa" dependencies = [ "bitrate", - "cortex-m", + "cortex-m 0.7.1", "embedded-hal", ] @@ -160,23 +160,36 @@ checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" [[package]] name = "cortex-m" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cdafeafba636c00c467ded7f1587210725a1adfab0c24028a7844b87738263" +checksum = "9075300b07c6a56263b9b582c214d0ff037b00d45ec9fde1cc711490c56f1bb9" dependencies = [ "aligned", "bare-metal 0.2.5", "bitfield", + "cortex-m 0.7.1", + "volatile-register", +] + +[[package]] +name = "cortex-m" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0b756a8bffc56025de45218a48ff9b801180440c0ee49a722b32d49dcebc771" +dependencies = [ + "bare-metal 0.2.5", + "bitfield", + "embedded-hal", "volatile-register", ] [[package]] name = "cortex-m-log" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d63959cb1e003dd97233fee6762351540253237eadf06fcdcb98cbfa3f9be4a" +checksum = "0e202d2eac4e34adf7524a563e36623bae6f69cc0a73ef9bd22a4c93a5a806fa" dependencies = [ - "cortex-m", + "cortex-m 0.7.1", "cortex-m-semihosting", "log", ] @@ -208,7 +221,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b30efcb6b7920d9016182c485687f0012487032a14c415d2fce6e9862ef8260e" dependencies = [ - "cortex-m", + "cortex-m 0.6.7", "cortex-m-rt", "cortex-m-rtic-macros", "heapless", @@ -234,7 +247,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bffa6c1454368a6aa4811ae60964c38e6996d397ff8095a8b9211b1c1f749bc" dependencies = [ - "cortex-m", + "cortex-m 0.7.1", ] [[package]] @@ -707,7 +720,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d55dedd501dfd02514646e0af4d7016ce36bc12ae177ef52056989966a1eec" dependencies = [ - "cortex-m", + "cortex-m 0.7.1", "cortex-m-semihosting", ] @@ -1035,13 +1048,24 @@ dependencies = [ "managed", ] +[[package]] +name = "smoltcp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab527c390c7e107f687bd92a886a083fde61b8cdc700b37f3d7e4346ffd8fae1" +dependencies = [ + "bitflags", + "byteorder", + "managed", +] + [[package]] name = "stabilizer" version = "0.4.1" dependencies = [ "ad9959", "asm-delay", - "cortex-m", + "cortex-m 0.6.7", "cortex-m-log", "cortex-m-rt", "cortex-m-rtic", @@ -1057,7 +1081,7 @@ dependencies = [ "paste", "serde", "serde-json-core", - "smoltcp", + "smoltcp 0.6.0", "stm32h7xx-hal", ] @@ -1074,7 +1098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7571f17d1ed7d67957d0004de6c52bd1ef5e736ed5ddc2bcecf001512269f77c" dependencies = [ "bare-metal 0.2.5", - "cortex-m", + "cortex-m 0.6.7", "cortex-m-rt", "vcell", ] @@ -1082,17 +1106,17 @@ dependencies = [ [[package]] name = "stm32h7xx-hal" version = "0.8.0" -source = "git+https://github.com/stm32-rs/stm32h7xx-hal?branch=dma#3da22d4935c8f6e412b99e6662ec11da5265fb88" +source = "git+https://github.com/stm32-rs/stm32h7xx-hal?branch=dma#2b8a04caac566a8560f400ddd6503508f78bea77" dependencies = [ "bare-metal 1.0.0", "cast", - "cortex-m", + "cortex-m 0.6.7", "cortex-m-rt", "embedded-dma", "embedded-hal", "nb 1.0.0", "paste", - "smoltcp", + "smoltcp 0.7.0", "stm32h7", "void", ] From c5fde8563c36e7faeb1ce24d708bd02eb1661fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Wed, 3 Feb 2021 13:16:22 +0100 Subject: [PATCH 3/4] deps: bump hal and smoltcp, adapt --- Cargo.lock | 15 ++------------- src/hardware/adc.rs | 7 ++++++- src/hardware/dac.rs | 3 ++- src/hardware/mod.rs | 2 -- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee50a9a..ed15a58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -954,17 +954,6 @@ dependencies = [ "serde", ] -[[package]] -name = "smoltcp" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a" -dependencies = [ - "bitflags", - "byteorder", - "managed", -] - [[package]] name = "smoltcp" version = "0.7.0" @@ -998,7 +987,7 @@ dependencies = [ "paste", "serde", "serde-json-core", - "smoltcp 0.7.0", + "smoltcp", "stm32h7xx-hal", ] @@ -1033,7 +1022,7 @@ dependencies = [ "embedded-hal", "nb 1.0.0", "paste", - "smoltcp 0.7.0", + "smoltcp", "stm32h7", "void", ] diff --git a/src/hardware/adc.rs b/src/hardware/adc.rs index 188e436..1cb6c17 100644 --- a/src/hardware/adc.rs +++ b/src/hardware/adc.rs @@ -180,18 +180,21 @@ macro_rules! adc_input { hal::spi::Spi, PeripheralToMemory, &'static mut [u16; SAMPLE_BUFFER_SIZE], + hal::dma::DBTransfer, >, trigger_transfer: Transfer< hal::dma::dma::$trigger_stream, [< $spi CR >], MemoryToPeripheral, &'static mut [u32; 1], + hal::dma::DBTransfer, >, clear_transfer: Transfer< hal::dma::dma::$clear_stream, [< $spi IFCR >], MemoryToPeripheral, &'static mut [u32; 1], + hal::dma::DBTransfer, >, } @@ -239,6 +242,7 @@ macro_rules! adc_input { _, MemoryToPeripheral, _, + _, > = Transfer::init( clear_stream, [< $spi IFCR >]::new(clear_channel), @@ -276,6 +280,7 @@ macro_rules! adc_input { _, MemoryToPeripheral, _, + _, > = Transfer::init( trigger_stream, [< $spi CR >]::new(trigger_channel), @@ -306,7 +311,7 @@ macro_rules! adc_input { // The data transfer is always a transfer of data from the peripheral to a RAM // buffer. - let data_transfer: Transfer<_, _, PeripheralToMemory, _> = + let data_transfer: Transfer<_, _, PeripheralToMemory, _, _> = Transfer::init( data_stream, spi, diff --git a/src/hardware/dac.rs b/src/hardware/dac.rs index 09d0497..5ca65fb 100644 --- a/src/hardware/dac.rs +++ b/src/hardware/dac.rs @@ -122,6 +122,7 @@ macro_rules! dac_output { $spi, MemoryToPeripheral, &'static mut [u16; SAMPLE_BUFFER_SIZE], + hal::dma::DBTransfer, >, } @@ -164,7 +165,7 @@ macro_rules! dac_output { } // Construct the trigger stream to write from memory to the peripheral. - let transfer: Transfer<_, _, MemoryToPeripheral, _> = + let transfer: Transfer<_, _, MemoryToPeripheral, _, _> = Transfer::init( stream, $spi::new(trigger_channel, spi), diff --git a/src/hardware/mod.rs b/src/hardware/mod.rs index dc3aa25..f912057 100644 --- a/src/hardware/mod.rs +++ b/src/hardware/mod.rs @@ -37,8 +37,6 @@ pub type AFE1 = afe::ProgrammableGainAmplifier< // Type alias for the ethernet interface on Stabilizer. pub type Ethernet = smoltcp::iface::EthernetInterface< - 'static, - 'static, 'static, hal::ethernet::EthernetDMA<'static>, >; From 672ddfa3c3df5530150b388a4c370478c8fe6233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Wed, 3 Feb 2021 13:25:00 +0100 Subject: [PATCH 4/4] pounder: also adapt to new hal --- src/hardware/pounder/timestamp.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hardware/pounder/timestamp.rs b/src/hardware/pounder/timestamp.rs index 5ccf235..e97bc2c 100644 --- a/src/hardware/pounder/timestamp.rs +++ b/src/hardware/pounder/timestamp.rs @@ -43,6 +43,7 @@ pub struct Timestamper { timers::tim8::Channel1InputCapture, PeripheralToMemory, &'static mut [u16; SAMPLE_BUFFER_SIZE], + hal::dma::DBTransfer, >, } @@ -89,7 +90,7 @@ impl Timestamper { input_capture.listen_dma(); // The data transfer is always a transfer of data from the peripheral to a RAM buffer. - let data_transfer: Transfer<_, _, PeripheralToMemory, _> = + let data_transfer: Transfer<_, _, PeripheralToMemory, _, _> = Transfer::init( stream, input_capture,