diff --git a/Cargo.lock b/Cargo.lock index e7f0729..7d0cb25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -357,23 +357,12 @@ dependencies = [ "syn", ] -[[package]] -name = "derive_stringset" -version = "0.1.0" -source = "git+https://github.com/vertigo-designs/miniconf.git?branch=feature/mqtt-interface#38379f7fa72e675c348a4f532811795cc95766df" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "dsp" version = "0.1.0" dependencies = [ "criterion", "libm", - "miniconf 0.1.0 (git+https://github.com/vertigo-designs/miniconf.git?branch=feature/mqtt-interface)", "ndarray", "rand", "serde", @@ -630,19 +619,7 @@ dependencies = [ 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 0.1.0 (git+https://github.com/vertigo-designs/miniconf.git?branch=feature/mqtt-interface)", + "derive_stringset", "heapless", "minimq", "serde", @@ -1074,7 +1051,7 @@ dependencies = [ "heapless", "log", "mcp23017", - "miniconf 0.1.0", + "miniconf", "nb 1.0.0", "panic-halt", "panic-semihosting", diff --git a/Cargo.toml b/Cargo.toml index 460a296..23aab3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,9 +46,8 @@ dsp = { path = "dsp" } ad9959 = { path = "ad9959" } [dependencies.miniconf] -# git = "https://github.com/vertigo-designs/miniconf.git" -# branch = "feature/mqtt-interface" -path = "../../vertigo-designs/miniconf" +git = "https://github.com/vertigo-designs/miniconf.git" +branch = "feature/mqtt-interface" [dependencies.mcp23017] git = "https://github.com/mrd0ll4r/mcp23017.git" @@ -71,7 +70,7 @@ pounder_v1_1 = [ ] [profile.dev] codegen-units = 1 incremental = false -opt-level = 1 +opt-level = 3 [profile.release] opt-level = 3 diff --git a/dsp/Cargo.toml b/dsp/Cargo.toml index 25d395a..d0d46d8 100644 --- a/dsp/Cargo.toml +++ b/dsp/Cargo.toml @@ -9,10 +9,6 @@ libm = "0.2.1" serde = { version = "1.0", features = ["derive"], default-features = false } serde-json-core = "0.1" -[dependencies.miniconf] -git = "https://github.com/vertigo-designs/miniconf.git" -branch = "feature/mqtt-interface" - [dev-dependencies] criterion = "0.3" rand = "0.8" diff --git a/src/bin/dual-iir.rs b/src/bin/dual-iir.rs index b115ec5..a8dfa39 100644 --- a/src/bin/dual-iir.rs +++ b/src/bin/dual-iir.rs @@ -38,8 +38,6 @@ impl Settings { } } -const ID: &str = "test"; - #[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)] const APP: () = { struct Resources { @@ -63,7 +61,7 @@ const APP: () = { let broker = IpAddr::V4(Ipv4Addr::new(10, 34, 16, 1)); let mqtt_interface = MqttInterface::new( stabilizer.net.stack, - ID, + "stabilizer", broker, Settings::new(), )