From 2c757224fce08edb78f0fc64a87dfabb82a8374b Mon Sep 17 00:00:00 2001 From: Guillaume Binet Date: Sat, 18 May 2024 08:58:34 -0400 Subject: [PATCH] added a simplelogger --- Cargo.toml | 2 +- copper/src/config.rs | 62 ++++++++++++++++++++------------ copper_derive_test/build.rs | 20 ++++++----- examples/pluginload/Cargo.toml | 2 +- examples/simplelogger/Cargo.toml | 9 +++++ examples/simplelogger/src/lib.rs | 59 ++++++++++++++++++++++++++++++ examples/v4lsrc/Cargo.toml | 2 +- examples/v4lsrc/src/lib.rs | 7 ++-- 8 files changed, 127 insertions(+), 36 deletions(-) create mode 100644 examples/simplelogger/Cargo.toml create mode 100644 examples/simplelogger/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 4182eaa74..372dfff96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,3 @@ [workspace] -members = ["copper", "copper_derive", "copper_derive_test", "examples/pluginload", "examples/v4lsrc"] +members = ["copper", "copper_derive", "copper_derive_test", "examples/pluginload", "examples/simplelogger", "examples/v4lsrc"] resolver = "2" diff --git a/copper/src/config.rs b/copper/src/config.rs index 94bfa534e..03620d0c5 100644 --- a/copper/src/config.rs +++ b/copper/src/config.rs @@ -1,14 +1,14 @@ -use petgraph::dot::Dot; +use std::collections::HashMap; + use petgraph::dot::Config as PetConfig; +use petgraph::dot::Dot; use petgraph::stable_graph::StableDiGraph; -use serde::{Serialize, Deserialize}; -use uom::si::rational::Time; -use uom::si::time::nanosecond; -use ron::Options; use ron::extensions::Extensions; -use std::collections::HashMap; +use ron::Options; use ron::value::Value as RonValue; - +use serde::{Deserialize, Serialize}; +use uom::si::rational::Time; +use uom::si::time::nanosecond; pub type ConfigNodeId = u32; pub type NodeConfig = HashMap; @@ -71,7 +71,6 @@ impl From for String { } } - #[derive(Serialize, Deserialize, Debug)] pub struct ConfigNode { instance_name: String, @@ -80,7 +79,7 @@ pub struct ConfigNode { #[serde(skip_serializing_if = "Option::is_none")] base_period_ns: Option, #[serde(skip_serializing_if = "Option::is_none")] - instance_config:Option, + instance_config: Option, } impl ConfigNode { @@ -101,7 +100,8 @@ impl ConfigNode { #[allow(dead_code)] pub fn base_period(&self) -> Option