kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing dependency rev

master
Ryan Summers 2021-08-09 14:01:11 +02:00
parent cf1d5ed533
commit 05210fc1e7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -200,7 +200,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_miniconf" name = "derive_miniconf"
version = "0.1.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -413,7 +413,7 @@ dependencies = [
[[package]] [[package]]
name = "miniconf" name = "miniconf"
version = "0.1.0" 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 = [ dependencies = [
"derive_miniconf", "derive_miniconf",
"heapless 0.7.3", "heapless 0.7.3",

2
Cargo.toml
View File

@ -76,7 +76,7 @@ branch = "feature/assume-init"
[patch.crates-io.miniconf] [patch.crates-io.miniconf]
git = "https://github.com/quartiq/miniconf.git" git = "https://github.com/quartiq/miniconf.git"
branch = "feature/client-integration" rev = "6c19ba2"
[dependencies.smoltcp-nal] [dependencies.smoltcp-nal]
git = "https://github.com/quartiq/smoltcp-nal.git" git = "https://github.com/quartiq/smoltcp-nal.git"

6
src/net/mod.rs
View File

@ -23,7 +23,7 @@ use telemetry::TelemetryClient;
use core::fmt::Write; use core::fmt::Write;
use heapless::String; use heapless::String;
use miniconf::{Miniconf, MiniconfClient}; use miniconf::Miniconf;
use serde::Serialize; use serde::Serialize;
use smoltcp_nal::embedded_nal::SocketAddr; use smoltcp_nal::embedded_nal::SocketAddr;
@ -46,7 +46,7 @@ pub enum NetworkState {
} }
/// A structure of Stabilizer's default network users. /// A structure of Stabilizer's default network users.
pub struct NetworkUsers<S: Default + Miniconf, T: Serialize> { pub struct NetworkUsers<S: Default + Miniconf, T: Serialize> {
pub miniconf: MiniconfClient<S, NetworkReference>, pub miniconf: miniconf::MqttClient<S, NetworkReference>,
pub processor: NetworkProcessor, pub processor: NetworkProcessor,
stream: DataStream, stream: DataStream,
generator: Option<FrameGenerator>, generator: Option<FrameGenerator>,
@ -90,7 +90,7 @@ where
let prefix = get_device_prefix(app, mac); let prefix = get_device_prefix(app, mac);
let settings = MiniconfClient::new( let settings = miniconf::MqttClient::new(
stack_manager.acquire_stack(), stack_manager.acquire_stack(),
&get_client_id(app, "settings", mac), &get_client_id(app, "settings", mac),
&prefix, &prefix,