rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 22 Wiki Activity

use concrete git branch dependency

Browse Source
This commit is contained in:
Robin Müller 2023-01-02 23:54:59 +01:00
parent c03c88a85d
commit e85e953c93
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Cargo.lock generated
View File

@ -568,7 +568,7 @@ dependencies = [
"postcard", "postcard",
"serde", "serde",
"serde_json", "serde_json",
"spacepackets", "spacepackets 0.3.1 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features)",
"zerocopy", "zerocopy",
] ]
@ -581,7 +581,7 @@ dependencies = [
"delegate", "delegate",
"satrs-core", "satrs-core",
"satrs-mib", "satrs-mib",
"spacepackets", "spacepackets 0.3.1 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features)",
"zerocopy", "zerocopy",
] ]
@ -696,6 +696,19 @@ dependencies = [
"zerocopy", "zerocopy",
] ]
[[package]]
name = "spacepackets"
version = "0.3.1"
source = "git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features#ae55c394bb2455eed3b05a5b587048a931d27238"
dependencies = [
"chrono",
"crc",
"delegate",
"num-traits",
"serde",
"zerocopy",
]
[[package]] [[package]]
name = "spin" name = "spin"
version = "0.9.4" version = "0.9.4"

3
satrs-core/Cargo.toml
View File

@ -39,7 +39,8 @@ default-features = false
optional = true optional = true
[dependencies.spacepackets] [dependencies.spacepackets]
path = "../spacepackets" git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
branch = "all_features"
default-features = false default-features = false
[dev-dependencies] [dev-dependencies]

22
satrs-core/src/pus/verification.rs
View File

@ -104,7 +104,7 @@ pub use stdmod::{
}; };
#[derive(Debug, Eq, PartialEq, Copy, Clone)] #[derive(Debug, Eq, PartialEq, Copy, Clone)]
pub enum Subservices { pub enum Subservice {
TmAcceptanceSuccess = 1, TmAcceptanceSuccess = 1,
TmAcceptanceFailure = 2, TmAcceptanceFailure = 2,
TmStartSuccess = 3, TmStartSuccess = 3,
@ -115,8 +115,8 @@ pub enum Subservices {
TmCompletionFailure = 8, TmCompletionFailure = 8,
} }
impl From<Subservices> for u8 { impl From<Subservice> for u8 {
fn from(enumeration: Subservices) -> Self { fn from(enumeration: Subservice) -> Self {
enumeration as u8 enumeration as u8
} }
} }
@ -347,7 +347,7 @@ impl VerificationReporterBasic {
let tm = self let tm = self
.create_pus_verif_success_tm( .create_pus_verif_success_tm(
buf, buf,
Subservices::TmAcceptanceSuccess.into(), Subservice::TmAcceptanceSuccess.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
time_stamp, time_stamp,
@ -377,7 +377,7 @@ impl VerificationReporterBasic {
let tm = self let tm = self
.create_pus_verif_fail_tm( .create_pus_verif_fail_tm(
buf, buf,
Subservices::TmAcceptanceFailure.into(), Subservice::TmAcceptanceFailure.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
None::<&dyn EcssEnumeration>, None::<&dyn EcssEnumeration>,
@ -406,7 +406,7 @@ impl VerificationReporterBasic {
let tm = self let tm = self
.create_pus_verif_success_tm( .create_pus_verif_success_tm(
buf, buf,
Subservices::TmStartSuccess.into(), Subservice::TmStartSuccess.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
time_stamp, time_stamp,
@ -438,7 +438,7 @@ impl VerificationReporterBasic {
let tm = self let tm = self
.create_pus_verif_fail_tm( .create_pus_verif_fail_tm(
buf, buf,
Subservices::TmStartFailure.into(), Subservice::TmStartFailure.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
None::<&dyn EcssEnumeration>, None::<&dyn EcssEnumeration>,
@ -466,7 +466,7 @@ impl VerificationReporterBasic {
) -> Result<(), EcssTmError<E>> { ) -> Result<(), EcssTmError<E>> {
let tm = self.create_pus_verif_success_tm( let tm = self.create_pus_verif_success_tm(
buf, buf,
Subservices::TmStepSuccess.into(), Subservice::TmStepSuccess.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
time_stamp, time_stamp,
@ -492,7 +492,7 @@ impl VerificationReporterBasic {
let tm = self let tm = self
.create_pus_verif_fail_tm( .create_pus_verif_fail_tm(
buf, buf,
Subservices::TmStepFailure.into(), Subservice::TmStepFailure.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
Some(params.step), Some(params.step),
@ -521,7 +521,7 @@ impl VerificationReporterBasic {
let tm = self let tm = self
.create_pus_verif_success_tm( .create_pus_verif_success_tm(
buf, buf,
Subservices::TmCompletionSuccess.into(), Subservice::TmCompletionSuccess.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
time_stamp, time_stamp,
@ -550,7 +550,7 @@ impl VerificationReporterBasic {
let tm = self let tm = self
.create_pus_verif_fail_tm( .create_pus_verif_fail_tm(
buf, buf,
Subservices::TmCompletionFailure.into(), Subservice::TmCompletionFailure.into(),
seq_counter.get(), seq_counter.get(),
&token.req_id, &token.req_id,
None::<&dyn EcssEnumeration>, None::<&dyn EcssEnumeration>,

3
satrs-example/Cargo.toml
View File

@ -12,7 +12,8 @@ zerocopy = "0.6"
csv = "1" csv = "1"
[dependencies.spacepackets] [dependencies.spacepackets]
path = "../spacepackets" git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
branch = "all_features"
[dependencies.satrs-core] [dependencies.satrs-core]
path = "../satrs-core" path = "../satrs-core"