From b4bd587823af0870a171fda5a6cb215ce858cf7e Mon Sep 17 00:00:00 2001 From: Rowan Date: Wed, 9 Oct 2024 08:51:54 -0600 Subject: [PATCH] Attempt at fixing downlink. Swapping to making all compile --- ex3_obc_fsw/bulk_msg_dispatcher/src/main.rs | 9 ++------- ex3_obc_fsw/cmd_dispatcher/src/main.rs | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ex3_obc_fsw/bulk_msg_dispatcher/src/main.rs b/ex3_obc_fsw/bulk_msg_dispatcher/src/main.rs index 61f0c2ec..20e77e1b 100644 --- a/ex3_obc_fsw/bulk_msg_dispatcher/src/main.rs +++ b/ex3_obc_fsw/bulk_msg_dispatcher/src/main.rs @@ -85,13 +85,6 @@ fn main() -> Result<(), IoError> { num_bytes = bulk_msg.msg_body.len() as u64; trace!("Num of 4k msgs: {}", num_of_4kb_msgs); - if let Some(data_fd) = &server.data_fd { - // Want to write to gs_bulk, not BulkMsgDispatcher fd - send_num_msgs_and_bytes_to_gs(num_of_4kb_msgs, bulk_msg.msg_body.len() as u64, data_fd)?; - } else { - warn!("No data file descriptor found in coms_interface."); - } - server.clear_buffer(); } Err(e) => { @@ -101,12 +94,14 @@ fn main() -> Result<(), IoError> { } } if messages.len() > 1 { + // doesn't work right now! Donwlink broken :( if let Some(data_fd) = &server.data_fd { // Want to write to gs_bulk, not BulkMsgDispatcher fd send_num_msgs_and_bytes_to_gs(num_of_4kb_msgs, num_bytes, data_fd)?; } else { warn!("No data file descriptor found in coms_interface."); } + messages = Vec::new(); server.clear_buffer(); } } diff --git a/ex3_obc_fsw/cmd_dispatcher/src/main.rs b/ex3_obc_fsw/cmd_dispatcher/src/main.rs index ec08449e..f4271b40 100644 --- a/ex3_obc_fsw/cmd_dispatcher/src/main.rs +++ b/ex3_obc_fsw/cmd_dispatcher/src/main.rs @@ -22,7 +22,6 @@ fn main() { } }).collect(); - println!("GOT {:?}", component_streams.get(8)); // prints BulkMsgDisp connection for x in 0..ComponentIds::LAST as usize { let payload = match ComponentIds::try_from(x as u8) { Ok(p) => {