From 2ac7568d5bf81c8effc0949251da732ec5930797 Mon Sep 17 00:00:00 2001
From: Ryan Summers <ryan.summers@vertigo-designs.com>
Date: Fri, 19 Feb 2021 10:36:39 +0100
Subject: [PATCH] Updating dependencies

---
 Cargo.lock     | 71 +++++++++++++++++++++++++++++++++++++++++++++++---
 Cargo.toml     |  6 ++++-
 dsp/Cargo.toml |  1 +
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d5ebc04..cd59705 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -348,6 +348,16 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "derive_stringset"
+version = "0.1.0"
+source = "git+https://github.com/quartiq/miniconf.git?branch=develop#97ace3d8268075235cb67a2a8740d200bea1fe30"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dsp"
 version = "0.1.0"
@@ -355,6 +365,7 @@ dependencies = [
  "criterion",
  "generic-array 0.14.4",
  "libm",
+ "miniconf",
  "ndarray",
  "num",
  "rand",
@@ -386,6 +397,17 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "embedded-nal"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae46eb1b02de5a76d9d0ea21d657ff5b0ad2cc47f3a7723608227b1dd1b3eb18"
+dependencies = [
+ "heapless",
+ "nb 1.0.0",
+ "no-std-net",
+]
+
 [[package]]
 name = "enum-iterator"
 version = "0.6.0"
@@ -596,6 +618,31 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "miniconf"
+version = "0.1.0"
+source = "git+https://github.com/quartiq/miniconf.git?branch=develop#97ace3d8268075235cb67a2a8740d200bea1fe30"
+dependencies = [
+ "derive_stringset",
+ "heapless",
+ "minimq",
+ "serde",
+ "serde-json-core",
+]
+
+[[package]]
+name = "minimq"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c5e626690b6f62e15710cf9815e5ca25ee54084899298c100a14b2504c80a46"
+dependencies = [
+ "bit_field",
+ "embedded-nal",
+ "enum-iterator",
+ "generic-array 0.14.4",
+ "heapless",
+]
+
 [[package]]
 name = "nb"
 version = "0.1.3"
@@ -624,6 +671,12 @@ dependencies = [
  "rawpointer",
 ]
 
+[[package]]
+name = "no-std-net"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2178127478ae4ee9be7180bc9c3bffb6354dd7238400db567102f98c413a9f35"
+
 [[package]]
 name = "num"
 version = "0.3.1"
@@ -952,8 +1005,7 @@ dependencies = [
 [[package]]
 name = "serde-json-core"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89fd6016a00149b485f66da701f76d909210d319040c97b6eff300f6e2ba2153"
+source = "git+https://github.com/rust-embedded-community/serde-json-core.git?branch=master#ee06ac91bc43b72450a92198a00d9e5c5b9946d2"
 dependencies = [
  "heapless",
  "serde",
@@ -1002,6 +1054,17 @@ dependencies = [
  "managed",
 ]
 
+[[package]]
+name = "smoltcp-nal"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e5aeb4818706fd74c35917692008d29a5314483c8180300a582253718ce57a"
+dependencies = [
+ "embedded-nal",
+ "heapless",
+ "smoltcp",
+]
+
 [[package]]
 name = "stabilizer"
 version = "0.4.1"
@@ -1018,13 +1081,13 @@ dependencies = [
  "heapless",
  "log",
  "mcp23017",
+ "miniconf",
  "nb 1.0.0",
  "panic-halt",
  "panic-semihosting",
  "paste",
  "serde",
- "serde-json-core",
- "smoltcp",
+ "smoltcp-nal",
  "stm32h7xx-hal",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index dd46840..599e595 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,11 @@ miniconf = "0.1"
 
 [patch.crates-io.miniconf]
 git = "https://github.com/quartiq/miniconf.git"
-branch = "rs/issue-21/terminal-array-elements"
+branch = "develop"
+
+[patch.crates-io.serde-json-core]
+git = "https://github.com/rust-embedded-community/serde-json-core.git"
+branch = "master"
 
 [dependencies.mcp23017]
 git = "https://github.com/mrd0ll4r/mcp23017.git"
diff --git a/dsp/Cargo.toml b/dsp/Cargo.toml
index 516b6e2..674a9cb 100644
--- a/dsp/Cargo.toml
+++ b/dsp/Cargo.toml
@@ -9,6 +9,7 @@ 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 }
+miniconf = "0.1"
 
 [dev-dependencies]
 criterion = "0.3"