From 05210fc1e7f8cafc0cb05cd172af9b69dca44f66 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Mon, 9 Aug 2021 14:01:11 +0200 Subject: [PATCH] Fixing dependency rev --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/net/mod.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f147acc..9db369a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,7 +200,7 @@ dependencies = [ [[package]] name = "derive_miniconf" version = "0.1.0" -source = "git+https://github.com/quartiq/miniconf.git?branch=feature/client-integration#46aa4791e2874dbce6f75a0db15f636a4e7a134c" +source = "git+https://github.com/quartiq/miniconf.git?rev=6c19ba2#6c19ba208eb426377ff6e09416fcabdf4fd3021d" dependencies = [ "proc-macro2", "quote", @@ -413,7 +413,7 @@ dependencies = [ [[package]] name = "miniconf" version = "0.1.0" -source = "git+https://github.com/quartiq/miniconf.git?branch=feature/client-integration#46aa4791e2874dbce6f75a0db15f636a4e7a134c" +source = "git+https://github.com/quartiq/miniconf.git?rev=6c19ba2#6c19ba208eb426377ff6e09416fcabdf4fd3021d" dependencies = [ "derive_miniconf", "heapless 0.7.3", diff --git a/Cargo.toml b/Cargo.toml index 0a83b98..09f2031 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ branch = "feature/assume-init" [patch.crates-io.miniconf] git = "https://github.com/quartiq/miniconf.git" -branch = "feature/client-integration" +rev = "6c19ba2" [dependencies.smoltcp-nal] git = "https://github.com/quartiq/smoltcp-nal.git" diff --git a/src/net/mod.rs b/src/net/mod.rs index f179d67..24cd36e 100644 --- a/src/net/mod.rs +++ b/src/net/mod.rs @@ -23,7 +23,7 @@ use telemetry::TelemetryClient; use core::fmt::Write; use heapless::String; -use miniconf::{Miniconf, MiniconfClient}; +use miniconf::Miniconf; use serde::Serialize; use smoltcp_nal::embedded_nal::SocketAddr; @@ -46,7 +46,7 @@ pub enum NetworkState { } /// A structure of Stabilizer's default network users. pub struct NetworkUsers { - pub miniconf: MiniconfClient, + pub miniconf: miniconf::MqttClient, pub processor: NetworkProcessor, stream: DataStream, generator: Option, @@ -90,7 +90,7 @@ where let prefix = get_device_prefix(app, mac); - let settings = MiniconfClient::new( + let settings = miniconf::MqttClient::new( stack_manager.acquire_stack(), &get_client_id(app, "settings", mac), &prefix,