From b66f80f78446fbeb80dbe739e93ec88c0e53c4c5 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Wed, 17 Feb 2021 16:30:39 +0100 Subject: [PATCH] Fixing dependencies --- Cargo.lock | 5 ++++- Cargo.toml | 9 +++------ dsp/Cargo.toml | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27dd8d0..cc31add 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,6 +351,7 @@ dependencies = [ [[package]] name = "derive_stringset" version = "0.1.0" +source = "git+https://github.com/quartiq/miniconf.git?branch=rs/issue-21/terminal-array-elements#b93924e81ad860efd9dcda8df2ea901a579958e2" dependencies = [ "proc-macro2", "quote", @@ -619,6 +620,7 @@ dependencies = [ [[package]] name = "miniconf" version = "0.1.0" +source = "git+https://github.com/quartiq/miniconf.git?branch=rs/issue-21/terminal-array-elements#b93924e81ad860efd9dcda8df2ea901a579958e2" dependencies = [ "derive_stringset", "heapless", @@ -1020,7 +1022,8 @@ dependencies = [ [[package]] name = "smoltcp-nal" version = "0.1.0" -source = "git+https://github.com/vertigo-designs/smoltcp-nal.git?branch=main#6a656dd78c5f7543475e95c0eaf81def95fc5a10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e5aeb4818706fd74c35917692008d29a5314483c8180300a582253718ce57a" dependencies = [ "embedded-nal", "heapless", diff --git a/Cargo.toml b/Cargo.toml index 6942942..eeade26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,18 +44,15 @@ enum-iterator = "0.6.0" paste = "1" dsp = { path = "dsp" } ad9959 = { path = "ad9959" } +smoltcp-nal = "0.1.0" [dependencies.miniconf] -git = "https://github.com/vertigo-designs/miniconf.git" -branch = "develop" +git = "https://github.com/quartiq/miniconf.git" +branch = "rs/issue-21/terminal-array-elements" [dependencies.mcp23017] git = "https://github.com/mrd0ll4r/mcp23017.git" -[dependencies.smoltcp-nal] -git = "https://github.com/vertigo-designs/smoltcp-nal.git" -branch = "main" - [dependencies.stm32h7xx-hal] features = ["stm32h743v", "rt", "unproven", "ethernet", "quadspi"] git = "https://github.com/stm32-rs/stm32h7xx-hal" diff --git a/dsp/Cargo.toml b/dsp/Cargo.toml index 8e07060..457e209 100644 --- a/dsp/Cargo.toml +++ b/dsp/Cargo.toml @@ -9,6 +9,10 @@ libm = "0.2.1" serde = { version = "1.0", features = ["derive"], default-features = false } generic-array = "0.14" +[dependencies.miniconf] +git = "https://github.com/quartiq/miniconf.git" +branch = "rs/issue-21/terminal-array-elements" + [dev-dependencies] criterion = "0.3" rand = "0.8"