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

Merge pull request 'added enum subservice ids for scheduling' (#33) from quickfix into main

Browse Source 
Reviewed-on: rust/satrs-launchpad#33
This commit is contained in:
Robin Müller 2023-02-14 16:32:11 +01:00
commit 72e560dd81
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
satrs-example/src/pus.rs
View File

@ -12,6 +12,7 @@ use satrs_core::pus::verification::{
FailParams, StdVerifReporterWithSender, TcStateAccepted, VerificationToken, FailParams, StdVerifReporterWithSender, TcStateAccepted, VerificationToken,
}; };
use satrs_core::res_code::ResultU16; use satrs_core::res_code::ResultU16;
use satrs_core::spacepackets::ecss::scheduling;
use satrs_core::tmtc::tm_helper::PusTmWithCdsShortHelper; use satrs_core::tmtc::tm_helper::PusTmWithCdsShortHelper;
use satrs_core::tmtc::{AddressableId, PusServiceProvider}; use satrs_core::tmtc::{AddressableId, PusServiceProvider};
use satrs_core::{ use satrs_core::{
@ -326,8 +327,26 @@ impl PusReceiver {
} }
self.update_time_stamp(); self.update_time_stamp();
match pus_tc.subservice() {
1 => { let subservice: scheduling::Subservice = match pus_tc.subservice().try_into() {
Ok(subservice) => subservice,
Err(_) => {
self.verif_reporter
.start_failure(
token,
FailParams::new(
Some(&self.time_stamp),
&tmtc_err::NOT_ENOUGH_APP_DATA,
None,
),
)
.expect("Sending start failure TM failed");
return;
}
};
match subservice {
scheduling::Subservice::TcEnableScheduling => {
let start_token = self let start_token = self
.verif_reporter .verif_reporter
.start_success(token, Some(&self.time_stamp)) .start_success(token, Some(&self.time_stamp))
@ -344,7 +363,7 @@ impl PusReceiver {
} }
drop(scheduler); drop(scheduler);
} }
2 => { scheduling::Subservice::TcDisableScheduling => {
let start_token = self let start_token = self
.verif_reporter .verif_reporter
.start_success(token, Some(&self.time_stamp)) .start_success(token, Some(&self.time_stamp))
@ -361,7 +380,7 @@ impl PusReceiver {
} }
drop(scheduler); drop(scheduler);
} }
3 => { scheduling::Subservice::TcResetScheduling => {
let start_token = self let start_token = self
.verif_reporter .verif_reporter
.start_success(token, Some(&self.time_stamp)) .start_success(token, Some(&self.time_stamp))
@ -384,7 +403,7 @@ impl PusReceiver {
.completion_success(start_token, Some(&self.time_stamp)) .completion_success(start_token, Some(&self.time_stamp))
.expect("Error sending completion success"); .expect("Error sending completion success");
} }
4 => { scheduling::Subservice::TcInsertActivity => {
let start_token = self let start_token = self
.verif_reporter .verif_reporter
.start_success(token, Some(&self.time_stamp)) .start_success(token, Some(&self.time_stamp))
@ -406,18 +425,7 @@ impl PusReceiver {
.completion_success(start_token, Some(&self.time_stamp)) .completion_success(start_token, Some(&self.time_stamp))
.expect("Error sending completion success"); .expect("Error sending completion success");
} }
_ => { _ => {}
self.verif_reporter
.start_failure(
token,
FailParams::new(
Some(&self.time_stamp),
&tmtc_err::NOT_ENOUGH_APP_DATA,
None,
),
)
.expect("Sending start failure TM failed");
}
} }
} }
} }