Skip to content

Commit

Permalink
Extracted CFDP components
Browse files Browse the repository at this point in the history
  • Loading branch information
robamu committed Nov 4, 2024
1 parent 8114195 commit 48f4cd2
Show file tree
Hide file tree
Showing 16 changed files with 46 additions and 3,442 deletions.
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ exclude = [
"embedded-examples/stm32f3-disco-rtic",
"embedded-examples/stm32h7-rtic",
]

7 changes: 5 additions & 2 deletions satrs-example/src/tmtc/tm_sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@ use std::{
};

use log::info;
use satrs::tmtc::{PacketAsVec, PacketInPool, SharedPacketPool};
use satrs::{
pool::PoolProvider,
seq_count::{CcsdsSimpleSeqCountProvider, SequenceCountProviderCore},
spacepackets::{
ecss::{tm::PusTmZeroCopyWriter, PusPacket},
seq_count::CcsdsSimpleSeqCountProvider,
time::cds::MIN_CDS_FIELD_LEN,
CcsdsPacket,
},
};
use satrs::{
spacepackets::seq_count::SequenceCountProvider,
tmtc::{PacketAsVec, PacketInPool, SharedPacketPool},
};

use crate::interface::tcp::SyncTcpTmSource;

Expand Down
1 change: 1 addition & 0 deletions satrs-mib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions satrs-mib/codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ".."
4 changes: 3 additions & 1 deletion satrs-shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ version = "0.3"
optional = true

[dependencies.spacepackets]
version = ">0.9, <=0.11"
version = ">0.9"
default-features = false
git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets"
branch = "main"

[features]
serde = ["dep:serde", "spacepackets/serde"]
Expand Down
3 changes: 3 additions & 0 deletions satrs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- Renamed `StaticPoolConfig::new` to `StaticPoolConfig::new_from_subpool_cfg_tuples`. The new
`new` implementation expects a type struct instead of tuples.
- Moved `cfdp` module to [dedicated crate](https://egit.irs.uni-stuttgart.de/rust/cfdp)
- Moved `seq_count` module to [spacepackets](https://egit.irs.uni-stuttgart.de/rust/spacepackets)
crate

## Added

Expand Down
3 changes: 2 additions & 1 deletion satrs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ crc = "3"

[dependencies.satrs-shared]
version = ">=0.1.3, <=0.2"
path = "../satrs-shared"

[dependencies.num_enum]
version = ">0.5, <=0.7"
Expand Down Expand Up @@ -131,4 +132,4 @@ doc-images = []

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docs_rs", "--generate-link-to-definition"]
rustdoc-args = ["--generate-link-to-definition"]
Loading

0 comments on commit 48f4cd2

Please sign in to comment.