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

this might work better

Browse Source
This commit is contained in:
Robin Müller 2023-08-12 11:02:32 +02:00
parent c1252f949e
commit 1bae0c30bb
Signed by: muellerr
GPG Key ID: 407F9B00F858F270
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
satrs-core/src/cfdp/dest.rs
View File

@ -9,7 +9,6 @@ use super::{
user::{CfdpUser, MetadataReceivedParams}, user::{CfdpUser, MetadataReceivedParams},
State, TransactionId, TransactionStep, CRC_32, State, TransactionId, TransactionStep, CRC_32,
}; };
use alloc::boxed::Box;
use spacepackets::{ use spacepackets::{
cfdp::{ cfdp::{
pdu::{ pdu::{
@ -32,7 +31,7 @@ pub struct DestinationHandler {
state: State, state: State,
transaction_params: TransactionParams, transaction_params: TransactionParams,
packets_to_send_ctx: PacketsToSendContext, packets_to_send_ctx: PacketsToSendContext,
cfdp_user: Box<dyn CfdpUser>, //cfdp_user: Box<dyn CfdpUser>,
} }
#[derive(Debug, Default)] #[derive(Debug, Default)]
@ -123,21 +122,21 @@ pub enum DestError {
} }
impl DestinationHandler { impl DestinationHandler {
pub fn new(id: impl Into<UnsignedByteField>, cfdp_user: Box<dyn CfdpUser>) -> Self { pub fn new(id: impl Into<UnsignedByteField>) -> Self {
Self { Self {
id: id.into(), id: id.into(),
step: TransactionStep::Idle, step: TransactionStep::Idle,
state: State::Idle, state: State::Idle,
transaction_params: Default::default(), transaction_params: Default::default(),
packets_to_send_ctx: Default::default(), packets_to_send_ctx: Default::default(),
cfdp_user, //cfdp_user,
} }
} }
pub fn state_machine(&mut self) -> Result<(), DestError> { pub fn state_machine(&mut self, cfdp_user: &mut impl CfdpUser) -> Result<(), DestError> {
match self.state { match self.state {
State::Idle => todo!(), State::Idle => todo!(),
State::BusyClass1Nacked => self.fsm_nacked(), State::BusyClass1Nacked => self.fsm_nacked(cfdp_user),
State::BusyClass2Acked => todo!(), State::BusyClass2Acked => todo!(),
} }
} }
@ -313,10 +312,10 @@ impl DestinationHandler {
Ok(false) Ok(false)
} }
fn fsm_nacked(&mut self) -> Result<(), DestError> { fn fsm_nacked(&mut self, cfdp_user: &mut impl CfdpUser) -> Result<(), DestError> {
if self.step == TransactionStep::Idle {} if self.step == TransactionStep::Idle {}
if self.step == TransactionStep::TransactionStart { if self.step == TransactionStep::TransactionStart {
self.transaction_start()?; self.transaction_start(cfdp_user)?;
} }
if self.step == TransactionStep::ReceivingFileDataPdus { if self.step == TransactionStep::ReceivingFileDataPdus {
todo!("advance the fsm if everything is finished") todo!("advance the fsm if everything is finished")
@ -345,7 +344,7 @@ impl DestinationHandler {
self.state self.state
} }
fn transaction_start(&mut self) -> Result<(), DestError> { fn transaction_start(&mut self, cfdp_user: &mut impl CfdpUser) -> Result<(), DestError> {
let dest_name = from_utf8( let dest_name = from_utf8(
&self.transaction_params.file_properties.dest_file_name &self.transaction_params.file_properties.dest_file_name
[..self.transaction_params.file_properties.dest_file_name_len], [..self.transaction_params.file_properties.dest_file_name_len],
@ -370,7 +369,7 @@ impl DestinationHandler {
msgs_to_user: &[], msgs_to_user: &[],
}; };
self.transaction_params.transaction_id = Some(id); self.transaction_params.transaction_id = Some(id);
self.cfdp_user cfdp_user
.metadata_recvd_indication(&metadata_recvd_params); .metadata_recvd_indication(&metadata_recvd_params);
let metadata = metadata(dest_path)?; let metadata = metadata(dest_path)?;
@ -488,7 +487,7 @@ mod tests {
fn test_basic() { fn test_basic() {
let test_id = UnsignedByteFieldU8::new(1); let test_id = UnsignedByteFieldU8::new(1);
let test_user = TestCfdpUser {}; let test_user = TestCfdpUser {};
let dest_handler = DestinationHandler::new(test_id, Box::new(test_user)); let dest_handler = DestinationHandler::new(test_id);
assert_eq!(dest_handler.state(), State::Idle); assert_eq!(dest_handler.state(), State::Idle);
assert_eq!(dest_handler.step(), TransactionStep::Idle); assert_eq!(dest_handler.step(), TransactionStep::Idle);
} }