From 6385a65c4f1a01a1dfc91ff4609dca5489d63b8a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 20 Nov 2022 19:54:14 +0100 Subject: [PATCH] all name changes --- Cargo.lock | 62 +++++++++++++------------- satrs-core/src/events.rs | 2 +- satrs-core/src/hal/host/udp_server.rs | 4 +- satrs-core/src/objects.rs | 2 +- satrs-core/src/params.rs | 2 +- satrs-core/src/pool.rs | 2 +- satrs-core/src/pus/verification.rs | 4 +- satrs-core/src/tmtc/ccsds_distrib.rs | 4 +- satrs-core/src/tmtc/pus_distrib.rs | 4 +- satrs-core/tests/pools.rs | 2 +- satrs-core/tests/pus_autogen_events.rs | 2 +- satrs-core/tests/pus_events.rs | 12 ++--- satrs-core/tests/pus_verification.rs | 4 +- satrs-example/Cargo.toml | 4 +- satrs-example/src/bin/client.rs | 4 +- satrs-example/src/bin/obsw/ccsds.rs | 2 +- satrs-example/src/bin/obsw/main.rs | 18 ++++---- satrs-example/src/bin/obsw/pus.rs | 14 +++--- satrs-example/src/bin/obsw/tmtc.rs | 14 +++--- 19 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36b9d6c..ea90067 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -306,37 +306,6 @@ dependencies = [ "void", ] -[[package]] -name = "fsrc-core" -version = "0.1.0" -dependencies = [ - "bus", - "crossbeam-channel", - "delegate 0.8.0", - "downcast-rs", - "embed-doc-image", - "hashbrown", - "heapless", - "num-traits", - "once_cell", - "paste", - "postcard", - "serde", - "spacepackets", - "zerocopy", -] - -[[package]] -name = "fsrc-example" -version = "0.1.0" -dependencies = [ - "crossbeam-channel", - "delegate 0.8.0", - "fsrc-core", - "spacepackets", - "zerocopy", -] - [[package]] name = "hash32" version = "0.2.1" @@ -620,6 +589,37 @@ dependencies = [ "semver 1.0.14", ] +[[package]] +name = "satrs-core" +version = "0.1.0" +dependencies = [ + "bus", + "crossbeam-channel", + "delegate 0.8.0", + "downcast-rs", + "embed-doc-image", + "hashbrown", + "heapless", + "num-traits", + "once_cell", + "paste", + "postcard", + "serde", + "spacepackets", + "zerocopy", +] + +[[package]] +name = "satrs-example" +version = "0.1.0" +dependencies = [ + "crossbeam-channel", + "delegate 0.8.0", + "satrs-core", + "spacepackets", + "zerocopy", +] + [[package]] name = "scopeguard" version = "1.1.0" diff --git a/satrs-core/src/events.rs b/satrs-core/src/events.rs index eded68e..1c06945 100644 --- a/satrs-core/src/events.rs +++ b/satrs-core/src/events.rs @@ -18,7 +18,7 @@ //! # Examples //! //! ``` -//! use fsrc_core::events::{EventU16, EventU32, EventU32TypedSev, Severity, SeverityHigh, SeverityInfo}; +//! use satrs_core::events::{EventU16, EventU32, EventU32TypedSev, Severity, SeverityHigh, SeverityInfo}; //! //! const MSG_RECVD: EventU32TypedSev = EventU32TypedSev::const_new(1, 0); //! const MSG_FAILED: EventU32 = EventU32::const_new(Severity::LOW, 1, 1); diff --git a/satrs-core/src/hal/host/udp_server.rs b/satrs-core/src/hal/host/udp_server.rs index dd7ca67..4d597f9 100644 --- a/satrs-core/src/hal/host/udp_server.rs +++ b/satrs-core/src/hal/host/udp_server.rs @@ -18,8 +18,8 @@ use std::vec::Vec; /// /// ``` /// use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}; -/// use fsrc_core::hal::host::udp_server::UdpTcServer; -/// use fsrc_core::tmtc::ReceivesTc; +/// use satrs_core::hal::host::udp_server::UdpTcServer; +/// use satrs_core::tmtc::ReceivesTc; /// use spacepackets::SpHeader; /// use spacepackets::tc::PusTc; /// diff --git a/satrs-core/src/objects.rs b/satrs-core/src/objects.rs index 0654f98..266db7a 100644 --- a/satrs-core/src/objects.rs +++ b/satrs-core/src/objects.rs @@ -10,7 +10,7 @@ //! ```rust //! use std::any::Any; //! use std::error::Error; -//! use fsrc_core::objects::{ManagedSystemObject, ObjectId, ObjectManager, SystemObject}; +//! use satrs_core::objects::{ManagedSystemObject, ObjectId, ObjectManager, SystemObject}; //! //! struct ExampleSysObj { //! id: ObjectId, diff --git a/satrs-core/src/params.rs b/satrs-core/src/params.rs index 3117b65..f1b6c6a 100644 --- a/satrs-core/src/params.rs +++ b/satrs-core/src/params.rs @@ -13,7 +13,7 @@ //! ## Example for primitive type wrapper //! //! ``` -//! use fsrc_core::params::{ParamsRaw, ToBeBytes, U32Pair, WritableToBeBytes}; +//! use satrs_core::params::{ParamsRaw, ToBeBytes, U32Pair, WritableToBeBytes}; //! //! let u32_pair = U32Pair(0x1010, 25); //! assert_eq!(u32_pair.0, 0x1010); diff --git a/satrs-core/src/pool.rs b/satrs-core/src/pool.rs index 8b7c841..70d9dcd 100644 --- a/satrs-core/src/pool.rs +++ b/satrs-core/src/pool.rs @@ -13,7 +13,7 @@ //! # Example //! //! ``` -//! use fsrc_core::pool::{LocalPool, PoolCfg, PoolProvider}; +//! use satrs_core::pool::{LocalPool, PoolCfg, PoolProvider}; //! //! // 4 buckets of 4 bytes, 2 of 8 bytes and 1 of 16 bytes //! let pool_cfg = PoolCfg::new(vec![(4, 4), (2, 8), (1, 16)]); diff --git a/satrs-core/src/pus/verification.rs b/satrs-core/src/pus/verification.rs index 76cfc5c..b9b0949 100644 --- a/satrs-core/src/pus/verification.rs +++ b/satrs-core/src/pus/verification.rs @@ -15,8 +15,8 @@ //! ``` //! use std::sync::{Arc, RwLock}; //! use std::time::Duration; -//! use fsrc_core::pool::{LocalPool, PoolCfg, PoolProvider, SharedPool}; -//! use fsrc_core::pus::verification::{CrossbeamVerifSender, VerificationReporterCfg, VerificationReporterWithSender}; +//! use satrs_core::pool::{LocalPool, PoolCfg, PoolProvider, SharedPool}; +//! use satrs_core::pus::verification::{CrossbeamVerifSender, VerificationReporterCfg, VerificationReporterWithSender}; //! use spacepackets::ecss::PusPacket; //! use spacepackets::SpHeader; //! use spacepackets::tc::{PusTc, PusTcSecondaryHeader}; diff --git a/satrs-core/src/tmtc/ccsds_distrib.rs b/satrs-core/src/tmtc/ccsds_distrib.rs index e09cb6b..cb48f72 100644 --- a/satrs-core/src/tmtc/ccsds_distrib.rs +++ b/satrs-core/src/tmtc/ccsds_distrib.rs @@ -18,8 +18,8 @@ //! # Example //! //! ```rust -//! use fsrc_core::tmtc::ccsds_distrib::{CcsdsPacketHandler, CcsdsDistributor}; -//! use fsrc_core::tmtc::ReceivesTc; +//! use satrs_core::tmtc::ccsds_distrib::{CcsdsPacketHandler, CcsdsDistributor}; +//! use satrs_core::tmtc::ReceivesTc; //! use spacepackets::{CcsdsPacket, SpHeader}; //! use spacepackets::tc::PusTc; //! diff --git a/satrs-core/src/tmtc/pus_distrib.rs b/satrs-core/src/tmtc/pus_distrib.rs index 3171b4b..1a2bf1e 100644 --- a/satrs-core/src/tmtc/pus_distrib.rs +++ b/satrs-core/src/tmtc/pus_distrib.rs @@ -17,8 +17,8 @@ //! # Example //! //! ```rust -//! use fsrc_core::tmtc::pus_distrib::{PusDistributor, PusServiceProvider}; -//! use fsrc_core::tmtc::ReceivesTc; +//! use satrs_core::tmtc::pus_distrib::{PusDistributor, PusServiceProvider}; +//! use satrs_core::tmtc::ReceivesTc; //! use spacepackets::SpHeader; //! use spacepackets::tc::PusTc; //! struct ConcretePusHandler { diff --git a/satrs-core/tests/pools.rs b/satrs-core/tests/pools.rs index 3187fd9..c92570e 100644 --- a/satrs-core/tests/pools.rs +++ b/satrs-core/tests/pools.rs @@ -1,4 +1,4 @@ -use fsrc_core::pool::{LocalPool, PoolCfg, PoolGuard, PoolProvider, StoreAddr}; +use satrs_core::pool::{LocalPool, PoolCfg, PoolGuard, PoolProvider, StoreAddr}; use std::ops::DerefMut; use std::sync::mpsc; use std::sync::mpsc::{Receiver, Sender}; diff --git a/satrs-core/tests/pus_autogen_events.rs b/satrs-core/tests/pus_autogen_events.rs index 03b4006..eaec7e6 100644 --- a/satrs-core/tests/pus_autogen_events.rs +++ b/satrs-core/tests/pus_autogen_events.rs @@ -1,6 +1,6 @@ #![allow(dead_code, unused_imports)] -use fsrc_core::events::{ +use satrs_core::events::{ EventU32, EventU32TypedSev, GenericEvent, HasSeverity, LargestEventRaw, LargestGroupIdRaw, Severity, SeverityInfo, SeverityLow, SeverityMedium, }; diff --git a/satrs-core/tests/pus_events.rs b/satrs-core/tests/pus_events.rs index 37b4fa3..77dc8f2 100644 --- a/satrs-core/tests/pus_events.rs +++ b/satrs-core/tests/pus_events.rs @@ -1,11 +1,11 @@ -use fsrc_core::event_man::{ +use satrs_core::event_man::{ EventManagerWithMpscQueue, MpscEventU32Receiver, MpscEventU32SendProvider, SendEventProvider, }; -use fsrc_core::events::{EventU32, EventU32TypedSev, Severity, SeverityInfo}; -use fsrc_core::params::U32Pair; -use fsrc_core::params::{Params, ParamsHeapless, WritableToBeBytes}; -use fsrc_core::pus::event_man::{DefaultPusMgmtBackendProvider, EventReporter, PusEventDispatcher}; -use fsrc_core::pus::{EcssTmError, EcssTmSender}; +use satrs_core::events::{EventU32, EventU32TypedSev, Severity, SeverityInfo}; +use satrs_core::params::U32Pair; +use satrs_core::params::{Params, ParamsHeapless, WritableToBeBytes}; +use satrs_core::pus::event_man::{DefaultPusMgmtBackendProvider, EventReporter, PusEventDispatcher}; +use satrs_core::pus::{EcssTmError, EcssTmSender}; use spacepackets::ecss::PusPacket; use spacepackets::tm::PusTm; use std::sync::mpsc::{channel, SendError, TryRecvError}; diff --git a/satrs-core/tests/pus_verification.rs b/satrs-core/tests/pus_verification.rs index a158706..b6c36ff 100644 --- a/satrs-core/tests/pus_verification.rs +++ b/satrs-core/tests/pus_verification.rs @@ -1,5 +1,5 @@ -use fsrc_core::pool::{LocalPool, PoolCfg, PoolProvider, SharedPool}; -use fsrc_core::pus::verification::{ +use satrs_core::pool::{LocalPool, PoolCfg, PoolProvider, SharedPool}; +use satrs_core::pus::verification::{ CrossbeamVerifSender, FailParams, RequestId, VerificationReporterCfg, VerificationReporterWithSender, }; diff --git a/satrs-example/Cargo.toml b/satrs-example/Cargo.toml index 066913e..4c6eae7 100644 --- a/satrs-example/Cargo.toml +++ b/satrs-example/Cargo.toml @@ -12,5 +12,5 @@ zerocopy = "0.6" [dependencies.spacepackets] path = "../spacepackets" -[dependencies.fsrc-core] -path = "../fsrc-core" +[dependencies.satrs-core] +path = "../satrs-core" diff --git a/satrs-example/src/bin/client.rs b/satrs-example/src/bin/client.rs index 59ad725..f29a7e9 100644 --- a/satrs-example/src/bin/client.rs +++ b/satrs-example/src/bin/client.rs @@ -1,5 +1,5 @@ -use fsrc_core::pus::verification::RequestId; -use fsrc_example::{OBSW_SERVER_ADDR, SERVER_PORT}; +use satrs_core::pus::verification::RequestId; +use satrs_example::{OBSW_SERVER_ADDR, SERVER_PORT}; use spacepackets::ecss::PusPacket; use spacepackets::tc::PusTc; use spacepackets::tm::PusTm; diff --git a/satrs-example/src/bin/obsw/ccsds.rs b/satrs-example/src/bin/obsw/ccsds.rs index c86be63..cbaf5c7 100644 --- a/satrs-example/src/bin/obsw/ccsds.rs +++ b/satrs-example/src/bin/obsw/ccsds.rs @@ -1,5 +1,5 @@ use crate::tmtc::PUS_APID; -use fsrc_core::tmtc::{CcsdsPacketHandler, PusDistributor, ReceivesCcsdsTc}; +use satrs_core::tmtc::{CcsdsPacketHandler, PusDistributor, ReceivesCcsdsTc}; use spacepackets::{CcsdsPacket, SpHeader}; pub struct CcsdsReceiver { diff --git a/satrs-example/src/bin/obsw/main.rs b/satrs-example/src/bin/obsw/main.rs index 298fda9..e8ab556 100644 --- a/satrs-example/src/bin/obsw/main.rs +++ b/satrs-example/src/bin/obsw/main.rs @@ -3,22 +3,22 @@ mod pus; mod tmtc; use crate::tmtc::{core_tmtc_task, CoreTmtcArgs, TmStore, PUS_APID}; -use fsrc_core::event_man::{ +use satrs_core::event_man::{ EventManagerWithMpscQueue, MpscEventReceiver, MpscEventU32SendProvider, SendEventProvider, }; -use fsrc_core::events::EventU32; -use fsrc_core::hal::host::udp_server::UdpTcServer; -use fsrc_core::pool::{LocalPool, PoolCfg, SharedPool, StoreAddr}; -use fsrc_core::pus::event_man::{ +use satrs_core::events::EventU32; +use satrs_core::hal::host::udp_server::UdpTcServer; +use satrs_core::pool::{LocalPool, PoolCfg, SharedPool, StoreAddr}; +use satrs_core::pus::event_man::{ DefaultPusMgmtBackendProvider, EventReporter, EventRequest, EventRequestWithToken, PusEventDispatcher, }; -use fsrc_core::pus::verification::{ +use satrs_core::pus::verification::{ MpscVerifSender, VerificationReporterCfg, VerificationReporterWithSender, }; -use fsrc_core::pus::{EcssTmError, EcssTmSender}; -use fsrc_core::tmtc::CcsdsError; -use fsrc_example::{OBSW_SERVER_ADDR, SERVER_PORT}; +use satrs_core::pus::{EcssTmError, EcssTmSender}; +use satrs_core::tmtc::CcsdsError; +use satrs_example::{OBSW_SERVER_ADDR, SERVER_PORT}; use spacepackets::time::{CdsShortTimeProvider, TimeWriter}; use spacepackets::tm::PusTm; use std::net::{IpAddr, SocketAddr}; diff --git a/satrs-example/src/bin/obsw/pus.rs b/satrs-example/src/bin/obsw/pus.rs index 5caaf17..836e873 100644 --- a/satrs-example/src/bin/obsw/pus.rs +++ b/satrs-example/src/bin/obsw/pus.rs @@ -1,13 +1,13 @@ use crate::tmtc::TmStore; -use fsrc_core::events::EventU32; -use fsrc_core::pool::StoreAddr; -use fsrc_core::pus::event::Subservices; -use fsrc_core::pus::event_man::{EventRequest, EventRequestWithToken}; -use fsrc_core::pus::verification::{ +use satrs_core::events::EventU32; +use satrs_core::pool::StoreAddr; +use satrs_core::pus::event::Subservices; +use satrs_core::pus::event_man::{EventRequest, EventRequestWithToken}; +use satrs_core::pus::verification::{ FailParams, SharedStdVerifReporterWithSender, TcStateAccepted, VerificationToken, }; -use fsrc_core::tmtc::tm_helper::PusTmWithCdsShortHelper; -use fsrc_core::tmtc::PusServiceProvider; +use satrs_core::tmtc::tm_helper::PusTmWithCdsShortHelper; +use satrs_core::tmtc::PusServiceProvider; use spacepackets::ecss::{EcssEnumU16, PusPacket}; use spacepackets::tc::PusTc; use spacepackets::time::{CdsShortTimeProvider, TimeWriter}; diff --git a/satrs-example/src/bin/obsw/tmtc.rs b/satrs-example/src/bin/obsw/tmtc.rs index 7806347..9fc1d0e 100644 --- a/satrs-example/src/bin/obsw/tmtc.rs +++ b/satrs-example/src/bin/obsw/tmtc.rs @@ -1,6 +1,6 @@ -use fsrc_core::events::EventU32; -use fsrc_core::hal::host::udp_server::{ReceiveResult, UdpTcServer}; -use fsrc_core::params::Params; +use satrs_core::events::EventU32; +use satrs_core::hal::host::udp_server::{ReceiveResult, UdpTcServer}; +use satrs_core::params::Params; use std::net::SocketAddr; use std::sync::mpsc; use std::sync::mpsc::Sender; @@ -10,10 +10,10 @@ use std::time::Duration; use crate::ccsds::CcsdsReceiver; use crate::pus::PusReceiver; use crate::UdpTmtcServer; -use fsrc_core::pool::{SharedPool, StoreAddr}; -use fsrc_core::pus::event_man::EventRequestWithToken; -use fsrc_core::pus::verification::SharedStdVerifReporterWithSender; -use fsrc_core::tmtc::{CcsdsDistributor, CcsdsError, PusDistributor}; +use satrs_core::pool::{SharedPool, StoreAddr}; +use satrs_core::pus::event_man::EventRequestWithToken; +use satrs_core::pus::verification::SharedStdVerifReporterWithSender; +use satrs_core::tmtc::{CcsdsDistributor, CcsdsError, PusDistributor}; use spacepackets::tm::PusTm; pub const PUS_APID: u16 = 0x02;