cargo fmt and clippy

This commit is contained in:
2023-02-14 15:53:14 +01:00
parent 707baa8585
commit ec46d94dc7
8 changed files with 19 additions and 25 deletions

View File

@ -1,9 +1,4 @@
use satrs_core::tmtc::AddressableId;
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum AcsHkIds {
TestMgmSet = 1,
}

View File

@ -1,5 +1,5 @@
use satrs_core::events::{EventU32TypedSev, SeverityInfo};
use std::net::Ipv4Addr;
use satrs_core::events::{EventU32, EventU32TypedSev, Severity, SeverityInfo};
use satrs_mib::res_code::{ResultU16, ResultU16Info};
use satrs_mib::resultcode;
@ -51,5 +51,3 @@ pub mod hk_err {
#[resultcode]
pub const COLLECTION_INTERVAL_MISSING: ResultU16 = ResultU16::const_new(GroupId::Hk as u8, 3);
}

View File

@ -4,7 +4,7 @@ mod pus;
mod requests;
mod tmtc;
use crate::hk::{AcsHkIds};
use crate::hk::AcsHkIds;
use crate::requests::{Request, RequestWithToken};
use crate::tmtc::{
core_tmtc_task, OtherArgs, PusTcSource, TcArgs, TcStore, TmArgs, TmFunnel, TmStore, PUS_APID,
@ -13,6 +13,7 @@ use satrs_core::event_man::{
EventManagerWithMpscQueue, MpscEventReceiver, MpscEventU32SendProvider, SendEventProvider,
};
use satrs_core::events::EventU32;
use satrs_core::hk::HkRequest;
use satrs_core::pool::{LocalPool, PoolCfg, StoreAddr};
use satrs_core::pus::event_man::{
DefaultPusMgmtBackendProvider, EventReporter, EventRequest, EventRequestWithToken,
@ -37,7 +38,6 @@ use std::sync::mpsc::{channel, TryRecvError};
use std::sync::{mpsc, Arc, RwLock};
use std::thread;
use std::time::Duration;
use satrs_core::hk::HkRequest;
#[derive(Clone)]
struct EventTmSender {
@ -245,7 +245,6 @@ fn main() {
HkRequest::Disable(_) => {}
HkRequest::ModifyCollectionInterval(_, _) => {}
},
_ => {}
}
let started_token = reporter_aocs
.start_success(request.1, Some(&timestamp))

View File

@ -1,6 +1,8 @@
use crate::requests::{Request, RequestWithToken};
use crate::tmtc::{PusTcSource, TmStore};
use satrs_core::events::EventU32;
use satrs_core::hk::{CollectionIntervalFactor, HkRequest};
use satrs_core::params::Params;
use satrs_core::pool::StoreAddr;
use satrs_core::pus::event;
use satrs_core::pus::event_man::{EventRequest, EventRequestWithToken};
@ -21,8 +23,6 @@ use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::Rc;
use std::sync::mpsc::Sender;
use satrs_core::hk::{CollectionIntervalFactor, HkRequest};
use satrs_core::params::Params;
pub struct PusReceiver {
pub tm_helper: PusTmWithCdsShortHelper,
@ -133,7 +133,9 @@ impl PusReceiver {
}
128 => {
self.update_time_stamp();
self.event_sender.send((TEST_EVENT.into(), None)).expect("Sending test event failed");
self.event_sender
.send((TEST_EVENT.into(), None))
.expect("Sending test event failed");
let start_token = self
.verif_reporter
.start_success(token, Some(&self.time_stamp))

View File

@ -4,7 +4,6 @@ use satrs_core::pus::verification::{TcStateAccepted, VerificationToken};
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
pub enum Request {
HkRequest(HkRequest),
ModeRequest
}
#[derive(Copy, Clone, Eq, PartialEq, Debug)]