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

basic TMTC interaction established

Browse Source
This commit is contained in:
Robin Müller 2022-08-29 00:44:34 +02:00
parent 9b791b1de1
commit cc21785687
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fsrc-core/src/hal/host/udp_server.rs
View File

@ -42,10 +42,10 @@ impl<E> UdpTcServer<E> {
let res = match self.socket.recv_from(&mut self.recv_buf) {
Ok(res) => res,
Err(e) => {
if e.kind() != ErrorKind::WouldBlock {
return Err(ReceiveResult::WouldBlock);
return if e.kind() == ErrorKind::WouldBlock {
Err(ReceiveResult::WouldBlock)
} else {
return Err(ReceiveResult::OtherIoError(e));
Err(ReceiveResult::OtherIoError(e))
}
}
};

9
fsrc-example/src/bin/client.rs
View File

@ -2,6 +2,7 @@ use fsrc_example::{OBSW_SERVER_ADDR, SERVER_PORT};
use spacepackets::tc::PusTc;
use spacepackets::SpHeader;
use std::net::{IpAddr, SocketAddr, UdpSocket};
use std::time::Duration;
fn main() {
let mut buf = [0; 32];
@ -13,4 +14,12 @@ fn main() {
client
.send_to(&buf[0..size], &addr)
.expect(&*format!("Sending to {:?} failed", addr));
client
.set_read_timeout(Some(Duration::from_secs(2)))
.expect("Setting read timeout failed");
if let Ok(len) = client.recv(&mut buf) {
println!("Received TM with {} bytes", len);
} else {
println!("No reply received for 2 seconds or timeout");
}
}

74
fsrc-example/src/bin/obsw.rs
View File

@ -11,8 +11,8 @@ use spacepackets::tm::{PusTm, PusTmSecondaryHeader};
use spacepackets::{CcsdsPacket, SpHeader};
use std::net::{IpAddr, SocketAddr};
use std::sync::{mpsc, Arc, Mutex};
use std::sync::mpsc::TryRecvError;
use std::thread;
use std::time::Duration;
const PUS_APID: u16 = 0x02;
@ -96,12 +96,12 @@ struct TmStore {
impl TmStore {
fn add_pus_tm(&mut self, pus_tm: &PusTm) -> StoreAddr {
let (addr, mut buf) = self
let (addr, buf) = self
.pool
.free_element(pus_tm.len_packed())
.expect("Store error");
pus_tm
.write_to(&mut buf)
.write_to(buf)
.expect("Writing PUS TM to store failed");
addr
}
@ -144,39 +144,49 @@ fn main() {
let mut udp_tmtc_server = UdpTmtcServer {
udp_tc_server,
tm_rx: tm_server_rx,
tm_store: tm_store.clone(),
tm_store
};
loop {
let res = udp_tmtc_server.udp_tc_server.try_recv_tc();
match res {
Ok(_) => (),
Err(e) => match e {
ReceiveResult::ReceiverError(e) => match e {
CcsdsError::PacketError(e) => {
println!("Got packet error: {e:?}");
loop {
match udp_tmtc_server.udp_tc_server.try_recv_tc() {
Ok(_) => (),
Err(e) => match e {
ReceiveResult::ReceiverError(e) => match e {
CcsdsError::PacketError(e) => {
println!("Got packet error: {e:?}");
}
CcsdsError::CustomError(_) => {
println!("Unknown receiver error")
}
},
ReceiveResult::OtherIoError(e) => {
println!("IO error {e}");
break;
}
CcsdsError::CustomError(_) => {
println!("Unknown receiver error")
ReceiveResult::WouldBlock => {
if let Some(recv_addr) = udp_tmtc_server.udp_tc_server.last_sender() {
// TODO: Send TM Here
while let Ok(addr) = udp_tmtc_server.tm_rx.try_recv() {
let mut store_lock = udp_tmtc_server
.tm_store
.lock()
.expect("Locking TM store failed");
let pg = store_lock.pool.read_with_guard(addr);
let buf = pg.read().expect("Error reading TM pool data");
println!("Sending TM");
udp_tmtc_server
.udp_tc_server
.socket
.send_to(buf, recv_addr)
.expect("Sending TM failed");
}
}
break;
}
},
ReceiveResult::OtherIoError(e) => {
println!("IO error {e}");
}
ReceiveResult::WouldBlock => {
if let Some(recv_addr) = udp_tmtc_server.udp_tc_server.last_sender() {
// TODO: Send TM Here
match udp_tmtc_server.tm_rx.try_recv() {
Ok(addr) => {
udp_tmtc_server.tm_store.lock().expect("Locking TM store failed").pool.read()
udp_tmtc_server.udp_tc_server.socket.send_to()
}
Err(_) => {}
}
}
}
},
}
}
thread::sleep(Duration::from_millis(400));
}
});
let jh1 = thread::spawn(move || {
@ -185,9 +195,7 @@ fn main() {
tm_funnel_rx,
};
loop {
let res = tm_funnel.tm_funnel_rx.recv();
if res.is_ok() {
let addr = res.unwrap();
if let Ok(addr) = tm_funnel.tm_funnel_rx.recv() {
tm_funnel
.tm_server_tx
.send(addr)