thats a larger change
This commit is contained in:
@ -9,7 +9,7 @@ use log::{info, warn};
|
||||
use satrs::{
|
||||
hal::std::tcp_server::{HandledConnectionHandler, ServerConfig, TcpSpacepacketsServer},
|
||||
spacepackets::PacketId,
|
||||
tmtc::{ReceivesTc, TmPacketSource},
|
||||
tmtc::{PacketSenderRaw, TmPacketSource},
|
||||
};
|
||||
|
||||
#[derive(Default)]
|
||||
@ -89,12 +89,12 @@ pub type TcpServer<ReceivesTc, SendError> = TcpSpacepacketsServer<
|
||||
SendError,
|
||||
>;
|
||||
|
||||
pub struct TcpTask<TcSender: ReceivesTc<Error = SendError>, SendError: Debug + 'static>(
|
||||
pub struct TcpTask<TcSender: PacketSenderRaw<Error = SendError>, SendError: Debug + 'static>(
|
||||
pub TcpServer<TcSender, SendError>,
|
||||
PhantomData<SendError>,
|
||||
);
|
||||
|
||||
impl<TcSender: ReceivesTc<Error = SendError>, SendError: Debug + 'static>
|
||||
impl<TcSender: PacketSenderRaw<Error = SendError>, SendError: Debug + 'static>
|
||||
TcpTask<TcSender, SendError>
|
||||
{
|
||||
pub fn new(
|
||||
|
@ -4,7 +4,7 @@ use std::sync::mpsc;
|
||||
|
||||
use log::{info, warn};
|
||||
use satrs::pus::{PusTmAsVec, PusTmInPool};
|
||||
use satrs::tmtc::ReceivesTc;
|
||||
use satrs::tmtc::PacketSenderRaw;
|
||||
use satrs::{
|
||||
hal::std::udp_server::{ReceiveResult, UdpTcServer},
|
||||
pool::{PoolProviderWithGuards, SharedStaticMemoryPool},
|
||||
@ -68,7 +68,7 @@ impl UdpTmHandler for DynamicUdpTmHandler {
|
||||
}
|
||||
|
||||
pub struct UdpTmtcServer<
|
||||
TcSender: ReceivesTc<Error = SendError>,
|
||||
TcSender: PacketSenderRaw<Error = SendError>,
|
||||
TmHandler: UdpTmHandler,
|
||||
SendError,
|
||||
> {
|
||||
@ -77,7 +77,7 @@ pub struct UdpTmtcServer<
|
||||
}
|
||||
|
||||
impl<
|
||||
TcSender: ReceivesTc<Error = SendError>,
|
||||
TcSender: PacketSenderRaw<Error = SendError>,
|
||||
TmHandler: UdpTmHandler,
|
||||
SendError: Debug + 'static,
|
||||
> UdpTmtcServer<TcSender, TmHandler, SendError>
|
||||
@ -126,7 +126,7 @@ mod tests {
|
||||
ecss::{tc::PusTcCreator, WritablePusPacket},
|
||||
SpHeader,
|
||||
},
|
||||
tmtc::ReceivesTc,
|
||||
tmtc::PacketSenderRaw,
|
||||
};
|
||||
use satrs_example::config::{components, OBSW_SERVER_ADDR};
|
||||
|
||||
@ -137,9 +137,9 @@ mod tests {
|
||||
tc_vec: VecDeque<Vec<u8>>,
|
||||
}
|
||||
|
||||
impl ReceivesTc for TestSender {
|
||||
impl PacketSenderRaw for TestSender {
|
||||
type Error = ();
|
||||
fn pass_tc(&mut self, tc_raw: &[u8]) -> Result<(), Self::Error> {
|
||||
fn send_raw_tc(&mut self, tc_raw: &[u8]) -> Result<(), Self::Error> {
|
||||
self.tc_vec.push_back(tc_raw.to_vec());
|
||||
Ok(())
|
||||
}
|
||||
|
@ -24,9 +24,9 @@ pub trait TcReleaser {
|
||||
impl TcReleaser for TcSenderSharedPool {
|
||||
fn release(&mut self, enabled: bool, _info: &TcInfo, tc: &[u8]) -> bool {
|
||||
if enabled {
|
||||
let shared_pool = self.shared_pool.get_mut();
|
||||
// Transfer TC from scheduler TC pool to shared TC pool.
|
||||
let released_tc_addr = self
|
||||
.shared_pool
|
||||
let released_tc_addr = shared_pool
|
||||
.0
|
||||
.write()
|
||||
.expect("locking pool failed")
|
||||
|
Reference in New Issue
Block a user