Skip to content

Commit

Permalink
Merge branch 'main' into ashbeitz/improvedSeatMassagerSample
Browse files Browse the repository at this point in the history
  • Loading branch information
ashbeitz authored Feb 29, 2024
2 parents b857560 + 75c2788 commit 0be6d15
Show file tree
Hide file tree
Showing 7 changed files with 475 additions and 388 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ members = [
[workspace.dependencies]
async-std = "^1.5"
bytes = "1.4.0"
config = "0.13.3"
config = "0.14.0"
derivative = "2.2.0"
dyn-clone = "1.0.14"
env_logger= "0.10.0"
env_logger= "0.11.2"
futures = "0.3.28"
futures-core = "0.3.4"
futures-util = "0.3.28"
Expand All @@ -62,13 +62,13 @@ sdl2 = "0.35.2"
serde = "1.0.160"
serde_derive = "1.0.163"
serde_json = "^1.0"
strum = "0.25"
strum_macros = "0.25.1"
strum = "0.26.1"
strum_macros = "0.26.1"
tokio = "1.29.1"
tokio-console-subscriber = { version = "0.2.0", package = "console-subscriber" }
tokio-stream = "0.1.14"
tonic = "0.10.0"
tonic-build = "0.10.0"
tonic = "0.11.0"
tonic-build = "0.11.0"
tower = "0.4.13"
tower-http = "0.4.3"
url = "2.3.1"
Expand Down
840 changes: 463 additions & 377 deletions NOTICE

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion core/invehicle-digital-twin/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ use std::net::SocketAddr;
use std::str::FromStr;
use std::sync::Arc;
use tonic::body::BoxBody;
use tonic::transport::{Body, NamedService};
use tonic::server::NamedService;
use tonic::transport::Body;
use tonic::{Request, Status};
use tower::layer::util::Identity;
use tower::Service;
Expand Down
2 changes: 1 addition & 1 deletion external/agemo
Submodule agemo updated 48 files
+0 −0 .agemo-samples/config/constants.default.yaml
+23 −0 .agemo-samples/config/samples_settings.default.yaml
+10 −10 .agemo-samples/config/template/samples_settings.yaml
+11 −0 .cargo/config.toml
+15 −0 .dockerignore
+4 −0 .github/dependabot.yml
+15 −4 .gitignore
+2,521 −0 Cargo.lock
+19 −10 Cargo.toml
+97 −0 Dockerfile.amd64
+100 −0 Dockerfile.arm64
+20 −0 Dockerfile.mosquitto.amd64
+20 −0 Dockerfile.mosquitto.arm64
+97 −0 Dockerfile.samples.amd64
+100 −0 Dockerfile.samples.arm64
+505 −174 NOTICE
+25 −79 README.md
+18 −0 common/Cargo.toml
+467 −0 common/src/config_utils.rs
+5 −0 common/src/lib.rs
+20 −0 config/constants.default.yaml
+17 −0 config/pub_sub_service_settings.default.yaml
+7 −7 config/template/pub_sub_service_settings.yaml
+61 −0 container/scripts/argument_sanitizer.sh
+15 −0 container/scripts/container_startup.sh
+37 −0 docs/config-overrides.md
+200 −0 docs/containers.md
+1 −1 external/chariott
+18 −0 proc-macros/Cargo.toml
+60 −0 proc-macros/src/config_source/generate.rs
+33 −0 proc-macros/src/config_source/mod.rs
+97 −0 proc-macros/src/config_source/parse.rs
+359 −0 proc-macros/src/config_source/process.rs
+19 −0 proc-macros/src/lib.rs
+7 −4 pub-sub-service/Cargo.toml
+23 −44 pub-sub-service/README.md
+1 −1 pub-sub-service/src/connectors/chariott_connector.rs
+2 −4 pub-sub-service/src/connectors/mosquitto_connector.rs
+108 −31 pub-sub-service/src/load_config.rs
+12 −4 pub-sub-service/src/main.rs
+3 −2 pub-sub-service/src/topic_manager.rs
+2 −0 rust-toolchain.toml
+62 −55 samples/README.md
+2 −5 samples/common/Cargo.toml
+70 −0 samples/common/src/config_utils.rs
+1 −0 samples/common/src/lib.rs
+5 −20 samples/common/src/load_config.rs
+4 −1 samples/connectors/mqtt-five/Cargo.toml
2 changes: 1 addition & 1 deletion external/chariott
Submodule chariott updated 175 files
2 changes: 1 addition & 1 deletion external/opendigitaltwins-dtdl

0 comments on commit 0be6d15

Please sign in to comment.