From 9bf08849a297198ea4b0ae391bf2548b751fee48 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 16 May 2025 19:43:45 +0200 Subject: [PATCH 1/3] annoying --- satrs-mib/Cargo.toml | 1 + satrs-mib/codegen/Cargo.toml | 1 + satrs-shared/Cargo.toml | 3 ++- satrs/Cargo.toml | 7 ++++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/satrs-mib/Cargo.toml b/satrs-mib/Cargo.toml index d2093c2..13b54e2 100644 --- a/satrs-mib/Cargo.toml +++ b/satrs-mib/Cargo.toml @@ -24,6 +24,7 @@ optional = true [dependencies.satrs-shared] version = "0.2.2" +path = "../satrs-shared" features = ["serde"] [dependencies.satrs-mib-codegen] diff --git a/satrs-mib/codegen/Cargo.toml b/satrs-mib/codegen/Cargo.toml index fb4bbf8..124b767 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.2.2" +path = "../../satrs-shared" [dev-dependencies.satrs-mib] path = ".." diff --git a/satrs-shared/Cargo.toml b/satrs-shared/Cargo.toml index 901a33d..420dca8 100644 --- a/satrs-shared/Cargo.toml +++ b/satrs-shared/Cargo.toml @@ -22,12 +22,13 @@ version = "1" optional = true [dependencies.spacepackets] -version = "0.14" +version = ">=0.14, <=0.15" default-features = false [features] serde = ["dep:serde", "spacepackets/serde"] defmt = ["dep:defmt", "spacepackets/defmt"] +alloc = ["spacepackets/alloc"] [package.metadata.docs.rs] all-features = true diff --git a/satrs/Cargo.toml b/satrs/Cargo.toml index 7b623a3..c0fcb7b 100644 --- a/satrs/Cargo.toml +++ b/satrs/Cargo.toml @@ -13,12 +13,13 @@ keywords = ["no-std", "space", "aerospace"] categories = ["aerospace", "aerospace::space-protocols", "no-std", "hardware-support", "embedded"] [dependencies] -satrs-shared = { version = "0.2.2" } +satrs-shared = { version = "0.2.2", path = "../satrs-shared" } +spacepackets = { version = ">=0.14, <=0.15", default-features = false } + delegate = ">0.7, <=0.13" paste = "1" derive-new = ">=0.6, <=0.7" num_enum = { version = ">0.5, <=0.7", default-features = false } -spacepackets = { version = "0.14", default-features = false } cobs = { version = "0.4", default-features = false, git = "https://github.com/jamesmunns/cobs.rs.git", branch = "main" } thiserror = { version = "2", default-features = false } @@ -66,7 +67,7 @@ alloc = [ "dyn-clone", "downcast-rs" ] -serde = ["dep:serde", "spacepackets/serde", "satrs-shared/serde"] +serde = ["dep:serde", "spacepackets/serde", "spacepackets/serde"] crossbeam = ["crossbeam-channel"] heapless = ["dep:heapless", "static_cell"] defmt = ["dep:defmt", "spacepackets/defmt"] -- 2.43.0 From 4a4fd7ac2c3f24358bc85702bde615f6bf57a52b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 16 May 2025 19:49:43 +0200 Subject: [PATCH 2/3] use git deps --- satrs-example/src/bin/simpleclient.rs | 5 +---- satrs-shared/Cargo.toml | 4 +--- satrs/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/satrs-example/src/bin/simpleclient.rs b/satrs-example/src/bin/simpleclient.rs index 0b137c4..12e2b35 100644 --- a/satrs-example/src/bin/simpleclient.rs +++ b/satrs-example/src/bin/simpleclient.rs @@ -1,10 +1,7 @@ use satrs::pus::verification::RequestId; use satrs::spacepackets::ecss::tc::PusTcCreator; use satrs::spacepackets::ecss::tm::PusTmReader; -use satrs::{ - spacepackets::ecss::{PusPacket, WritablePusPacket}, - spacepackets::SpHeader, -}; +use satrs::{spacepackets::ecss::PusPacket, spacepackets::SpHeader}; use satrs_example::config::{OBSW_SERVER_ADDR, SERVER_PORT}; use std::net::{IpAddr, SocketAddr, UdpSocket}; use std::time::Duration; diff --git a/satrs-shared/Cargo.toml b/satrs-shared/Cargo.toml index 420dca8..f5cf13b 100644 --- a/satrs-shared/Cargo.toml +++ b/satrs-shared/Cargo.toml @@ -11,6 +11,7 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +spacepackets = { version = ">=0.14, <=0.15", git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git", default-features = false } [dependencies.serde] version = "1" @@ -21,9 +22,6 @@ optional = true version = "1" optional = true -[dependencies.spacepackets] -version = ">=0.14, <=0.15" -default-features = false [features] serde = ["dep:serde", "spacepackets/serde"] diff --git a/satrs/Cargo.toml b/satrs/Cargo.toml index c0fcb7b..b452f1a 100644 --- a/satrs/Cargo.toml +++ b/satrs/Cargo.toml @@ -14,7 +14,7 @@ categories = ["aerospace", "aerospace::space-protocols", "no-std", "hardware-sup [dependencies] satrs-shared = { version = "0.2.2", path = "../satrs-shared" } -spacepackets = { version = ">=0.14, <=0.15", default-features = false } +spacepackets = { version = ">=0.14, <=0.15", git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git", default-features = false } delegate = ">0.7, <=0.13" paste = "1" -- 2.43.0 From 99a954a1f57c345c287a07653d179df22e2d6ff5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 19 May 2025 14:18:26 +0200 Subject: [PATCH 3/3] some tweaks --- satrs-shared/Cargo.toml | 1 - satrs/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/satrs-shared/Cargo.toml b/satrs-shared/Cargo.toml index f5cf13b..02e988b 100644 --- a/satrs-shared/Cargo.toml +++ b/satrs-shared/Cargo.toml @@ -26,7 +26,6 @@ optional = true [features] serde = ["dep:serde", "spacepackets/serde"] defmt = ["dep:defmt", "spacepackets/defmt"] -alloc = ["spacepackets/alloc"] [package.metadata.docs.rs] all-features = true diff --git a/satrs/Cargo.toml b/satrs/Cargo.toml index b452f1a..8c1017d 100644 --- a/satrs/Cargo.toml +++ b/satrs/Cargo.toml @@ -67,7 +67,7 @@ alloc = [ "dyn-clone", "downcast-rs" ] -serde = ["dep:serde", "spacepackets/serde", "spacepackets/serde"] +serde = ["dep:serde", "spacepackets/serde", "satrs-shared/serde"] crossbeam = ["crossbeam-channel"] heapless = ["dep:heapless", "static_cell"] defmt = ["dep:defmt", "spacepackets/defmt"] -- 2.43.0