rust/ops-sat-rs
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

can_pus_handler #4

Merged
muellerr merged 6 commits from can_pus_handler into main 2024-04-10 15:01:46 +02:00
Conversation 0 Commits 6 Files Changed 8 +4 -4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 88d1956dbf - Show all commits

2
src/interface/can.rs
View File

@ -1 +1 @@
/// This is a preliminary implementation of the necessary infrastructure to enable communication over OPS-SAT's internal CAN Bus. //! This is a preliminary implementation of the necessary infrastructure to enable communication over OPS-SAT's internal CAN Bus.

2
src/interface/mod.rs
View File

@ -1,3 +1,3 @@
pub mod can;
pub mod tcp; pub mod tcp;
pub mod udp; pub mod udp;
pub mod can;

2
src/interface/udp.rs
View File

@ -82,6 +82,7 @@ mod tests {
sync::{Arc, Mutex}, sync::{Arc, Mutex},
}; };
use ops_sat_rs::config::{components, OBSW_SERVER_ADDR};
use satrs::{ use satrs::{
spacepackets::{ spacepackets::{
ecss::{tc::PusTcCreator, WritablePusPacket}, ecss::{tc::PusTcCreator, WritablePusPacket},
@ -89,7 +90,6 @@ mod tests {
}, },
tmtc::ReceivesTcCore, tmtc::ReceivesTcCore,
}; };
use ops_sat_rs::config::{components, OBSW_SERVER_ADDR};
use super::*; use super::*;

2
src/tmtc/mod.rs
View File

@ -10,8 +10,8 @@ use satrs::{
use std::sync::mpsc::{self, SendError, Sender, TryRecvError}; use std::sync::mpsc::{self, SendError, Sender, TryRecvError};
use thiserror::Error; use thiserror::Error;
pub mod tm_funnel;
pub mod ccsds; pub mod ccsds;
pub mod tm_funnel;
#[derive(Debug, Clone, PartialEq, Eq, Error)] #[derive(Debug, Clone, PartialEq, Eq, Error)]
pub enum MpscStoreAndSendError { pub enum MpscStoreAndSendError {