From 60e831fd9950054f1bbdf17ec11bdbf966ee0a84 Mon Sep 17 00:00:00 2001 From: Hubald Verzijl Date: Fri, 19 Jun 2026 18:50:35 +0200 Subject: [PATCH] Updated Crate versions + added function. --- Cargo.lock | 89 +++++++++++++++++++++++++++++++++++++++++++++--------- Cargo.toml | 4 +-- src/lib.rs | 5 +-- 3 files changed, 80 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a56d80..ab70c20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,16 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "EQ-DA-icd" +version = "0.1.0" +dependencies = [ + "defmt", + "postcard-rpc", + "postcard-schema", + "serde", +] + [[package]] name = "atomic-polyfill" version = "1.0.3" @@ -18,13 +28,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "bioz-icd-rs" -version = "0.1.0" -dependencies = [ - "postcard-rpc", - "postcard-schema", - "serde", -] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "byteorder" @@ -47,6 +54,38 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" +[[package]] +name = "defmt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" +dependencies = [ + "bitflags", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" +dependencies = [ + "defmt-parser", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "defmt-parser" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" +dependencies = [ + "thiserror", +] + [[package]] name = "hash32" version = "0.2.1" @@ -81,9 +120,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4" dependencies = [ "hash32 0.3.1", "stable_deref_trait", @@ -129,11 +168,11 @@ dependencies = [ [[package]] name = "postcard-rpc" -version = "0.11.13" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1af23d87c9a8308bbfaae655ac770ec10517e6448fa5e0b50838a36e5d860b9" +checksum = "d1b0f9cc8bd8f38f5893fb7f07626b1c8722b3166ead66cfb14b5c5d5352822c" dependencies = [ - "heapless 0.8.0", + "heapless 0.9.3", "portable-atomic", "postcard", "postcard-schema", @@ -143,14 +182,36 @@ dependencies = [ [[package]] name = "postcard-schema" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a13d8b1f8b3473b45c2c779b97c18c260ac6458eb045d4be75df8087784400" +checksum = "9475666d89f42231a0a57da32d5f6ca7f9b5cd4c335ea1fe8f3278215b7a21ff" dependencies = [ "postcard-derive", "serde", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "proc-macro2" version = "1.0.95" diff --git a/Cargo.toml b/Cargo.toml index 1b2029b..261bad5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] -postcard-rpc = { version = "0.11.12" } +postcard-rpc = { version = "0.12.1" } defmt = "1.0.1" [dependencies.serde] @@ -13,7 +13,7 @@ features = ["derive"] default-features = false [dependencies.postcard-schema] -version = "0.2.4" +version = "0.2.5" features = ["derive"] [features] diff --git a/src/lib.rs b/src/lib.rs index 2b3a4d8..02ad71c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,6 +19,7 @@ endpoints! { | StopDataEndpoint | () | bool | "data/stop" | | SetAlgorithmEndpoint | SetAlgorithm | () | "algorithm/start" | | SetSetpointEndpoint | f32 | () | "setpoint/set" | + | SetSetpointCascadeEndpoint | f32 | () | "setpoint_cascade/set" | | PressureEndpoint | () | f32 | "data/pressure" | | ExternalSensorEndpoint | () | f32 | "data/external_sensor" | | OutFlowEndpoint | () | f32 | "data/out_flow" | @@ -73,6 +74,6 @@ pub struct SetAlgorithm { #[derive(Serialize, Deserialize, Schema, Debug, PartialEq, Format)] pub struct SetValves { - pub valve_a: u16, - pub valve_b: u16, + pub valve_a: u32, + pub valve_b: u32, }