diff --git a/satrs-example/Cargo.toml b/satrs-example/Cargo.toml index 3749cff..aeb0379 100644 --- a/satrs-example/Cargo.toml +++ b/satrs-example/Cargo.toml @@ -8,18 +8,18 @@ homepage = "https://egit.irs.uni-stuttgart.de/rust/sat-rs" repository = "https://egit.irs.uni-stuttgart.de/rust/sat-rs" [dependencies] -fern = "0.6" +fern = "0.7" chrono = "0.4" log = "0.4" crossbeam-channel = "0.5" -delegate = "0.10" -zerocopy = "0.6" +delegate = "0.13" +zerocopy = "0.8" csv = "1" num_enum = "0.7" -thiserror = "1" +thiserror = "2" lazy_static = "1" strum = { version = "0.26", features = ["derive"] } -derive-new = "0.5" +derive-new = "0.7" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/satrs-example/src/bin/test.rs b/satrs-example/src/bin/test.rs index 31b59dd..c40a04d 100644 --- a/satrs-example/src/bin/test.rs +++ b/satrs-example/src/bin/test.rs @@ -3,7 +3,7 @@ use crossbeam_channel::{bounded, Receiver, Sender}; use std::sync::atomic::{AtomicU16, Ordering}; use std::thread; -use zerocopy::{AsBytes, FromBytes, NetworkEndian, Unaligned, U16}; +use zerocopy::{FromBytes, Immutable, IntoBytes, NetworkEndian, Unaligned, U16}; trait FieldDataProvider: Send { fn get_data(&self) -> &[u8]; @@ -35,7 +35,7 @@ struct ExampleMgmSet { temperature: u16, } -#[derive(FromBytes, AsBytes, Unaligned)] +#[derive(FromBytes, IntoBytes, Immutable, Unaligned)] #[repr(C)] struct ExampleMgmSetZc { mgm_vec: [u8; 12], diff --git a/satrs-mib/Cargo.toml b/satrs-mib/Cargo.toml index 4159053..fbd2813 100644 --- a/satrs-mib/Cargo.toml +++ b/satrs-mib/Cargo.toml @@ -25,6 +25,7 @@ optional = true [dependencies.satrs-shared] version = ">=0.1.3, <=0.2" features = ["serde"] +path = "../satrs-shared" [dependencies.satrs-mib-codegen] path = "codegen" diff --git a/satrs-mib/codegen/Cargo.toml b/satrs-mib/codegen/Cargo.toml index d9c538e..aa186f9 100644 --- a/satrs-mib/codegen/Cargo.toml +++ b/satrs-mib/codegen/Cargo.toml @@ -29,6 +29,7 @@ trybuild = { version = "1", features = ["diff"] } [dev-dependencies.satrs-shared] version = ">=0.1.3, <=0.2" +path = "../../satrs-shared" [dev-dependencies.satrs-mib] path = ".." diff --git a/satrs-minisim/Cargo.toml b/satrs-minisim/Cargo.toml index 6b8c32a..0842844 100644 --- a/satrs-minisim/Cargo.toml +++ b/satrs-minisim/Cargo.toml @@ -9,8 +9,8 @@ edition = "2021" serde = { version = "1", features = ["derive"] } serde_json = "1" log = "0.4" -thiserror = "1" -fern = "0.5" +thiserror = "2" +fern = "0.7" strum = { version = "0.26", features = ["derive"] } num_enum = "0.7" humantime = "2" @@ -25,4 +25,4 @@ features = ["serde"] path = "../satrs" [dev-dependencies] -delegate = "0.12" +delegate = "0.13" diff --git a/satrs-shared/Cargo.toml b/satrs-shared/Cargo.toml index 2498c89..4abe2a7 100644 --- a/satrs-shared/Cargo.toml +++ b/satrs-shared/Cargo.toml @@ -22,7 +22,7 @@ version = "0.3" optional = true [dependencies.spacepackets] -version = ">0.9, <=0.12" +version = ">0.9, <=0.13" default-features = false [features] diff --git a/satrs/Cargo.toml b/satrs/Cargo.toml index c0b03c4..ac19c73 100644 --- a/satrs/Cargo.toml +++ b/satrs/Cargo.toml @@ -13,21 +13,22 @@ keywords = ["no-std", "space", "aerospace"] categories = ["aerospace", "aerospace::space-protocols", "no-std", "hardware-support", "embedded"] [dependencies] -delegate = ">0.7, <=0.10" +delegate = ">0.7, <=0.13" paste = "1" -derive-new = "0.6" +derive-new = ">=0.6, <=0.7" smallvec = "1" crc = "3" [dependencies.satrs-shared] version = ">=0.1.3, <=0.2" +path = "../satrs-shared" [dependencies.num_enum] version = ">0.5, <=0.7" default-features = false [dependencies.spacepackets] -version = "0.12" +version = "0.13" default-features = false [dependencies.cobs] @@ -45,11 +46,11 @@ version = "1" optional = true [dependencies.hashbrown] -version = "0.14" +version = ">=0.14, <=0.15" optional = true [dependencies.heapless] -version = "0.7" +version = "0.8" optional = true [dependencies.downcast-rs] @@ -67,8 +68,8 @@ default-features = false optional = true [dependencies.thiserror] -version = "1" -optional = true +version = "2" +default-features = false [dependencies.serde] version = "1" @@ -81,7 +82,7 @@ features = ["all"] optional = true [dependencies.mio] -version = "0.8" +version = "1" features = ["os-poll", "net"] optional = true @@ -91,7 +92,7 @@ optional = true [dev-dependencies] serde = "1" -zerocopy = "0.7" +zerocopy = "0.8" once_cell = "1" serde_json = "1" rand = "0.8" @@ -111,7 +112,7 @@ std = [ "serde/std", "spacepackets/std", "num_enum/std", - "thiserror", + "thiserror/std", "socket2", "mio" ] @@ -127,7 +128,6 @@ crossbeam = ["crossbeam-channel"] heapless = ["dep:heapless"] defmt = ["dep:defmt", "spacepackets/defmt"] test_util = [] -doc-images = [] [package.metadata.docs.rs] all-features = true