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

bump used spacepackets version

Browse Source
This commit is contained in:
Robin Müller
2023-01-21 12:19:05 +01:00
parent e03620542c
commit 1f27c23447
9 changed files with 116 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
satrs-core/Cargo.toml
View File

@ -53,8 +53,11 @@ default-features = false
optional = true
[dependencies.spacepackets]
# git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
version = "0.4.0"
git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
# path = "../spacepackets"
# version = "0.4.0"
rev = "1e9079307273e414a6333bf575322c1eb302c93e"
default-features = false
[dev-dependencies]

2
satrs-core/src/pus/event.rs
View File

@ -181,7 +181,7 @@ impl EventReporterBase {
subservice.into(),
self.msg_count,
self.dest_id,
time_stamp,
Some(time_stamp),
);
let mut current_idx = 0;
event_id.write_to_be_bytes(&mut buf[0..event_id.byte_width()])?;

2
satrs-core/src/pus/mod.rs
View File

@ -15,6 +15,8 @@ use spacepackets::{ByteConversionError, SizeMissmatch};
pub mod event;
pub mod event_man;
pub mod hk;
#[cfg(feature = "std")]
pub mod scheduling;
pub mod verification;
#[derive(Debug, Clone)]

27
satrs-core/src/pus/scheduling.rs Normal file
View File

@ -0,0 +1,27 @@
use crate::pool::StoreAddr;
use spacepackets::time::cds;
use spacepackets::time::cds::TimeProvider;
use std::collections::BTreeMap;
pub struct PusScheduler {
tc_map: BTreeMap<cds::TimeProvider, StoreAddr>,
}
impl PusScheduler {
pub fn insert_tc(&mut self, time_stamp: TimeProvider, addr: StoreAddr) {
self.tc_map.insert(time_stamp, addr);
}
}
#[cfg(test)]
mod tests {
use crate::pus::scheduling::PusScheduler;
use std::collections::BTreeMap;
#[test]
fn wtf() {
let scheduler = PusScheduler {
tc_map: BTreeMap::new(),
};
}
}

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

@ -260,14 +260,14 @@ impl<STATE> VerificationToken<STATE> {
/// Composite helper struct to pass failure parameters to the [VerificationReporter]
pub struct FailParams<'stamp, 'fargs> {
time_stamp: &'stamp [u8],
time_stamp: Option<&'stamp [u8]>,
failure_code: &'fargs dyn EcssEnumeration,
failure_data: Option<&'fargs [u8]>,
}
impl<'stamp, 'fargs> FailParams<'stamp, 'fargs> {
pub fn new(
time_stamp: &'stamp [u8],
time_stamp: Option<&'stamp [u8]>,
failure_code: &'fargs impl EcssEnumeration,
failure_data: Option<&'fargs [u8]>,
) -> Self {
@ -287,7 +287,7 @@ pub struct FailParamsWithStep<'stamp, 'fargs> {
impl<'stamp, 'fargs> FailParamsWithStep<'stamp, 'fargs> {
pub fn new(
time_stamp: &'stamp [u8],
time_stamp: Option<&'stamp [u8]>,
step: &'fargs impl EcssEnumeration,
failure_code: &'fargs impl EcssEnumeration,
failure_data: Option<&'fargs [u8]>,
@ -457,7 +457,7 @@ impl VerificationReporterCore {
subservice: u8,
token: VerificationToken<State>,
seq_counter: &(impl SequenceCountProviderCore<u16> + ?Sized),
time_stamp: &'src_data [u8],
time_stamp: Option<&'src_data [u8]>,
) -> Result<
VerificationSendable<'src_data, State, VerifSuccess>,
VerificationErrorWithToken<State>,
@ -508,7 +508,7 @@ impl VerificationReporterCore {
src_data_buf: &'src_data mut [u8],
token: VerificationToken<TcStateNone>,
seq_counter: &(impl SequenceCountProviderCore<u16> + ?Sized),
time_stamp: &'src_data [u8],
time_stamp: Option<&'src_data [u8]>,
) -> Result<
VerificationSendable<'src_data, TcStateNone, VerifSuccess>,
VerificationErrorWithToken<TcStateNone>,
@ -577,7 +577,7 @@ impl VerificationReporterCore {
src_data_buf: &'src_data mut [u8],
token: VerificationToken<TcStateAccepted>,
seq_counter: &(impl SequenceCountProviderCore<u16> + ?Sized),
time_stamp: &'src_data [u8],
time_stamp: Option<&'src_data [u8]>,
) -> Result<
VerificationSendable<'src_data, TcStateAccepted, VerifSuccess>,
VerificationErrorWithToken<TcStateAccepted>,
@ -651,7 +651,7 @@ impl VerificationReporterCore {
src_data_buf: &'src_data mut [u8],
token: &VerificationToken<TcStateStarted>,
seq_counter: &(impl SequenceCountProviderCore<u16> + ?Sized),
time_stamp: &'src_data [u8],
time_stamp: Option<&'src_data [u8]>,
step: impl EcssEnumeration,
) -> Result<VerificationSendable<'src_data, TcStateStarted, VerifSuccess>, EcssTmError> {
Ok(VerificationSendable::new_no_token(
@ -703,7 +703,7 @@ impl VerificationReporterCore {
src_data_buf: &'src_data mut [u8],
token: VerificationToken<TcStateStarted>,
seq_counter: &(impl SequenceCountProviderCore<u16> + ?Sized),
time_stamp: &'src_data [u8],
time_stamp: Option<&'src_data [u8]>,
) -> Result<
VerificationSendable<'src_data, TcStateStarted, VerifSuccess>,
VerificationErrorWithToken<TcStateStarted>,
@ -773,7 +773,7 @@ impl VerificationReporterCore {
subservice: u8,
msg_counter: u16,
req_id: &RequestId,
time_stamp: &'src_data [u8],
time_stamp: Option<&'src_data [u8]>,
step: Option<&(impl EcssEnumeration + ?Sized)>,
) -> Result<PusTm<'src_data>, EcssTmError> {
let mut source_data_len = size_of::<u32>();
@ -850,7 +850,7 @@ impl VerificationReporterCore {
subservice: u8,
msg_counter: u16,
sp_header: &mut SpHeader,
time_stamp: &'src_data [u8],
time_stamp: Option<&'src_data [u8]>,
source_data_len: usize,
) -> PusTm<'src_data> {
let tm_sec_header =
@ -948,7 +948,7 @@ mod alloc_mod {
&mut self,
token: VerificationToken<TcStateNone>,
sender: &mut (impl EcssTmSenderCore<Error = E> + ?Sized),
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
) -> Result<
VerificationToken<TcStateAccepted>,
VerificationOrSendErrorWithToken<E, TcStateNone>,
@ -987,7 +987,7 @@ mod alloc_mod {
&mut self,
token: VerificationToken<TcStateAccepted>,
sender: &mut (impl EcssTmSenderCore<Error = E> + ?Sized),
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
) -> Result<
VerificationToken<TcStateStarted>,
VerificationOrSendErrorWithToken<E, TcStateAccepted>,
@ -1029,7 +1029,7 @@ mod alloc_mod {
&mut self,
token: &VerificationToken<TcStateStarted>,
sender: &mut (impl EcssTmSenderCore<Error = E> + ?Sized),
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
step: impl EcssEnumeration,
) -> Result<(), EcssTmErrorWithSend<E>> {
let sendable = self.reporter.step_success(
@ -1075,7 +1075,7 @@ mod alloc_mod {
&mut self,
token: VerificationToken<TcStateStarted>,
sender: &mut (impl EcssTmSenderCore<Error = E> + ?Sized),
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
) -> Result<(), VerificationOrSendErrorWithToken<E, TcStateStarted>> {
let sendable = self.reporter.completion_success(
self.source_data_buf.as_mut_slice(),
@ -1152,7 +1152,7 @@ mod alloc_mod {
pub fn acceptance_success(
&mut self,
token: VerificationToken<TcStateNone>,
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
) -> Result<
VerificationToken<TcStateAccepted>,
VerificationOrSendErrorWithToken<E, TcStateNone>,
@ -1173,7 +1173,7 @@ mod alloc_mod {
pub fn start_success(
&mut self,
token: VerificationToken<TcStateAccepted>,
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
) -> Result<
VerificationToken<TcStateStarted>,
VerificationOrSendErrorWithToken<E, TcStateAccepted>,
@ -1194,7 +1194,7 @@ mod alloc_mod {
pub fn step_success(
&mut self,
token: &VerificationToken<TcStateStarted>,
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
step: impl EcssEnumeration,
) -> Result<(), EcssTmErrorWithSend<E>> {
self.reporter
@ -1213,7 +1213,7 @@ mod alloc_mod {
pub fn completion_success(
&mut self,
token: VerificationToken<TcStateStarted>,
time_stamp: &[u8],
time_stamp: Option<&[u8]>,
) -> Result<(), VerificationOrSendErrorWithToken<E, TcStateStarted>> {
self.reporter
.completion_success(token, self.sender.as_mut(), time_stamp)