updated TCP code

This commit is contained in:
2024-04-16 09:59:31 +02:00
parent 192e701785
commit b359ff9d33
7 changed files with 80 additions and 19 deletions

View File

@ -9,13 +9,10 @@ use log::info;
use ops_sat_rs::config::{
components::{CONTROLLER_ID, TCP_SERVER, TCP_SPP_CLIENT, UDP_SERVER},
tasks::{FREQ_MS_CTRL, FREQ_MS_PUS_STACK},
EXPERIMENT_APID,
VALID_PACKET_ID_LIST,
};
use ops_sat_rs::config::{tasks::FREQ_MS_UDP_TMTC, OBSW_SERVER_ADDR, SERVER_PORT};
use satrs::{
hal::std::{tcp_server::ServerConfig, udp_server::UdpTcServer},
spacepackets::PacketId,
};
use satrs::hal::std::{tcp_server::ServerConfig, udp_server::UdpTcServer};
use crate::tmtc::tc_source::TcSourceTaskDynamic;
use crate::tmtc::tm_sink::TmFunnelDynamic;
@ -147,7 +144,7 @@ fn main() {
tcp_server_cfg,
sync_tm_tcp_source.clone(),
tc_source_tx.clone(),
vec![PacketId::new_for_tc(true, EXPERIMENT_APID)],
VALID_PACKET_ID_LIST.to_vec(),
stop_signal.clone(),
)
.expect("tcp server creation failed");
@ -165,8 +162,9 @@ fn main() {
stop_signal.clone(),
);
let mut tcp_spp_client = TcpSppClient::new(TCP_SPP_CLIENT.id(), tc_source_tx)
.expect("creating TCP SPP client failed");
let mut tcp_spp_client =
TcpSppClient::new(TCP_SPP_CLIENT.id(), tc_source_tx, VALID_PACKET_ID_LIST)
.expect("creating TCP SPP client failed");
info!("Starting CTRL task");
let ctrl_stop_signal = stop_signal.clone();