From 738516eedbd07230fe2e658bae21572740e113e3 Mon Sep 17 00:00:00 2001
From: Ryan Summers <ryan.summers@vertigo-designs.com>
Date: Wed, 3 Feb 2021 15:13:37 +0100
Subject: [PATCH] Adding broken example

---
 Cargo.lock                 | 26 +++++++++++++++++++++++---
 Cargo.toml                 |  7 ++++---
 src/bin/dual-iir.rs        |  8 ++++++--
 src/bin/lockin-external.rs |  2 +-
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 77cf37a..e7f0729 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -348,6 +348,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "derive_stringset"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive_stringset"
 version = "0.1.0"
@@ -364,7 +373,7 @@ version = "0.1.0"
 dependencies = [
  "criterion",
  "libm",
- "miniconf",
+ "miniconf 0.1.0 (git+https://github.com/vertigo-designs/miniconf.git?branch=feature/mqtt-interface)",
  "ndarray",
  "rand",
  "serde",
@@ -617,12 +626,23 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "miniconf"
+version = "0.1.0"
+dependencies = [
+ "derive_stringset 0.1.0",
+ "heapless",
+ "minimq",
+ "serde",
+ "serde-json-core 0.2.0",
+]
+
 [[package]]
 name = "miniconf"
 version = "0.1.0"
 source = "git+https://github.com/vertigo-designs/miniconf.git?branch=feature/mqtt-interface#38379f7fa72e675c348a4f532811795cc95766df"
 dependencies = [
- "derive_stringset",
+ "derive_stringset 0.1.0 (git+https://github.com/vertigo-designs/miniconf.git?branch=feature/mqtt-interface)",
  "heapless",
  "minimq",
  "serde",
@@ -1054,7 +1074,7 @@ dependencies = [
  "heapless",
  "log",
  "mcp23017",
- "miniconf",
+ "miniconf 0.1.0",
  "nb 1.0.0",
  "panic-halt",
  "panic-semihosting",
diff --git a/Cargo.toml b/Cargo.toml
index 23aab3a..460a296 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,8 +46,9 @@ dsp = { path = "dsp" }
 ad9959 = { path = "ad9959" }
 
 [dependencies.miniconf]
-git = "https://github.com/vertigo-designs/miniconf.git"
-branch = "feature/mqtt-interface"
+# git = "https://github.com/vertigo-designs/miniconf.git"
+# branch = "feature/mqtt-interface"
+path = "../../vertigo-designs/miniconf"
 
 [dependencies.mcp23017]
 git = "https://github.com/mrd0ll4r/mcp23017.git"
@@ -70,7 +71,7 @@ pounder_v1_1 = [ ]
 [profile.dev]
 codegen-units = 1
 incremental = false
-opt-level = 3
+opt-level = 1
 
 [profile.release]
 opt-level = 3
diff --git a/src/bin/dual-iir.rs b/src/bin/dual-iir.rs
index 88dca46..b115ec5 100644
--- a/src/bin/dual-iir.rs
+++ b/src/bin/dual-iir.rs
@@ -27,15 +27,19 @@ const IIR_CASCADE_LENGTH: usize = 1;
 
 #[derive(Debug, Deserialize, StringSet)]
 pub struct Settings {
+    test: u32,
 }
 
 impl Settings {
     pub fn new() -> Self {
         Self {
+            test: 0,
         }
     }
 }
 
+const ID: &str = "test";
+
 #[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
 const APP: () = {
     struct Resources {
@@ -56,10 +60,10 @@ const APP: () = {
         // Configure the microcontroller
         let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device);
 
-        let broker = IpAddr::V4(Ipv4Addr::new(10, 0, 0, 2));
+        let broker = IpAddr::V4(Ipv4Addr::new(10, 34, 16, 1));
         let mqtt_interface = MqttInterface::new(
             stabilizer.net.stack,
-            "stabilizer/iir/dual",
+            ID,
             broker,
             Settings::new(),
         )
diff --git a/src/bin/lockin-external.rs b/src/bin/lockin-external.rs
index ffeb849..c32fa81 100644
--- a/src/bin/lockin-external.rs
+++ b/src/bin/lockin-external.rs
@@ -60,7 +60,7 @@ const APP: () = {
         // Configure the microcontroller
         let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device);
 
-        let broker = IpAddr::V4(Ipv4Addr::new(10, 0, 0, 2));
+        let broker = IpAddr::V4(Ipv4Addr::new(10, 34, 16, 1));
         let mqtt_interface = MqttInterface::new(
             stabilizer.net.stack,
             "stabilizer/lockin",