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

some clippy fixes for sat-rs example

Browse Source
This commit is contained in:
Robin Müller 2023-07-02 17:40:16 +02:00
parent 989f458bfe
commit c3cb871913
Signed by: muellerr
GPG Key ID: A649FB78196E3849
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
satrs-example/src/main.rs
View File

@ -72,7 +72,7 @@ fn main() {
let seq_count_provider = SeqCountProviderSyncClonable::default(); let seq_count_provider = SeqCountProviderSyncClonable::default();
let seq_count_provider_verif = seq_count_provider.clone(); let seq_count_provider_verif = seq_count_provider.clone();
let seq_count_provider_tmtc = seq_count_provider.clone(); let seq_count_provider_tmtc = seq_count_provider;
let sock_addr = SocketAddr::new(IpAddr::V4(OBSW_SERVER_ADDR), SERVER_PORT); let sock_addr = SocketAddr::new(IpAddr::V4(OBSW_SERVER_ADDR), SERVER_PORT);
let (tc_source_tx, tc_source_rx) = channel(); let (tc_source_tx, tc_source_rx) = channel();
let (tm_funnel_tx, tm_funnel_rx) = channel(); let (tm_funnel_tx, tm_funnel_rx) = channel();

13
satrs-example/src/pus.rs
View File

@ -17,6 +17,7 @@ use satrs_core::pus::verification::{
}; };
use satrs_core::pus::{event, GenericTcCheckError}; use satrs_core::pus::{event, GenericTcCheckError};
use satrs_core::res_code::ResultU16; use satrs_core::res_code::ResultU16;
use satrs_core::seq_count::{SeqCountProviderSyncClonable, SequenceCountProviderCore};
use satrs_core::spacepackets::ecss::{scheduling, PusServiceId}; use satrs_core::spacepackets::ecss::{scheduling, PusServiceId};
use satrs_core::spacepackets::time::CcsdsTimeProvider; use satrs_core::spacepackets::time::CcsdsTimeProvider;
use satrs_core::tmtc::tm_helper::PusTmWithCdsShortHelper; use satrs_core::tmtc::tm_helper::PusTmWithCdsShortHelper;
@ -31,7 +32,6 @@ use std::collections::HashMap;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::rc::Rc; use std::rc::Rc;
use std::sync::mpsc::{Receiver, Sender}; use std::sync::mpsc::{Receiver, Sender};
use satrs_core::seq_count::{SeqCountProviderSyncClonable, SequenceCountProvider, SequenceCountProviderCore};
pub struct PusReceiver { pub struct PusReceiver {
pub tm_helper: PusTmWithCdsShortHelper, pub tm_helper: PusTmWithCdsShortHelper,
@ -57,6 +57,7 @@ impl PusTmArgs {
} }
} }
#[allow(dead_code)]
pub struct PusTcHandlerBase { pub struct PusTcHandlerBase {
pub tc_store: Box<dyn PoolProvider>, pub tc_store: Box<dyn PoolProvider>,
pub receiver: Receiver<(StoreAddr, VerificationToken<TcStateAccepted>)>, pub receiver: Receiver<(StoreAddr, VerificationToken<TcStateAccepted>)>,
@ -68,16 +69,19 @@ pub trait TestHandlerNoPing {
fn handle_no_ping_tc(&mut self, tc: PusTc); fn handle_no_ping_tc(&mut self, tc: PusTc);
} }
#[allow(dead_code)]
pub struct PusTestTcHandler { pub struct PusTestTcHandler {
pub base: PusTcHandlerBase, pub base: PusTcHandlerBase,
handler: Option<Box<dyn TestHandlerNoPing>>, handler: Option<Box<dyn TestHandlerNoPing>>,
} }
#[allow(dead_code)]
pub struct PusScheduleTcHandler { pub struct PusScheduleTcHandler {
pub base: PusTestTcHandler, pub base: PusTestTcHandler,
} }
impl PusTestTcHandler { impl PusTestTcHandler {
#[allow(dead_code)]
pub fn operation(&mut self) { pub fn operation(&mut self) {
let (addr, token) = self.base.receiver.recv().unwrap(); let (addr, token) = self.base.receiver.recv().unwrap();
let data = self.base.tc_store.read(&addr).unwrap(); let data = self.base.tc_store.read(&addr).unwrap();
@ -216,7 +220,12 @@ impl PusReceiver {
.verif_reporter .verif_reporter
.start_success(token, Some(self.stamp_helper.stamp())) .start_success(token, Some(self.stamp_helper.stamp()))
.expect("Error sending start success"); .expect("Error sending start success");
let ping_reply = self.tm_helper.create_pus_tm_timestamp_now(17, 2, None, self.tm_args.seq_count_provider.get()); let ping_reply = self.tm_helper.create_pus_tm_timestamp_now(
17,
2,
None,
self.tm_args.seq_count_provider.get(),
);
let addr = self.tm_args.tm_store.add_pus_tm(&ping_reply); let addr = self.tm_args.tm_store.add_pus_tm(&ping_reply);
self.tm_args self.tm_args
.tm_tx .tm_tx