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

no mutex lock for verif reporter required anymore

Browse Source
This commit is contained in:
Robin Müller
2022-11-27 01:19:34 +01:00
parent b8efa8e518
commit 48b686bd95
3 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
satrs-example/src/tmtc.rs
View File

@ -12,7 +12,7 @@ use crate::pus::PusReceiver;
use crate::UdpTmtcServer;
use satrs_core::pool::{SharedPool, StoreAddr};
use satrs_core::pus::event_man::EventRequestWithToken;
use satrs_core::pus::verification::SharedStdVerifReporterWithSender;
use satrs_core::pus::verification::StdVerifReporterWithSender;
use satrs_core::tmtc::{CcsdsDistributor, CcsdsError, PusDistributor};
use spacepackets::tm::PusTm;
@ -45,7 +45,7 @@ pub fn core_tmtc_task(
args: CoreTmtcArgs,
tm_server_rx: mpsc::Receiver<StoreAddr>,
addr: SocketAddr,
verif_reporter: SharedStdVerifReporterWithSender,
verif_reporter: StdVerifReporterWithSender,
) {
let pus_receiver = PusReceiver::new(
PUS_APID,
@ -111,7 +111,13 @@ fn core_tm_handling(udp_tmtc_server: &mut UdpTmtcServer, recv_addr: &SocketAddr)
.expect("Locking TM store failed");
let pg = store_lock.read_with_guard(addr);
let buf = pg.read().expect("Error reading TM pool data");
println!("Sending TM");
if buf.len() > 9 {
let service = buf[7];
let subservice = buf[8];
println!("Sending PUS TM[{},{}]", service, subservice)
} else {
println!("Sending PUS TM");
}
udp_tmtc_server
.udp_tc_server
.socket