Skip to content

Commit

Permalink
Made simulated UHF broadcast and UART port names more descriptive
Browse files Browse the repository at this point in the history
  • Loading branch information
DrakBoul committed Nov 15, 2024
1 parent eed42a7 commit 935cb16
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ex3_ground_station/cli_ground_station/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ async fn main() {
eprintln!("Connecting to Coms handler via TCP at {ipaddr}...");

let mut tcp_interface =
match TcpInterface::new_client(ipaddr.to_string(), ports::SIM_UHF_GS_PORT) {
match TcpInterface::new_client(ipaddr.to_string(), ports::SIM_ESAT_UHF_PORT) {
Ok(ti) => ti,
Err(e) => {
eprintln!("Can't connect to satellite: {e}");
Expand Down
2 changes: 1 addition & 1 deletion ex3_obc_fsw/handlers/coms_handler/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ fn main() {
std::thread::sleep(std::time::Duration::from_secs(1));
//Setup interface for comm with UHF transceiver [ground station] (TCP for now)
let mut tcp_interface =
match TcpInterface::new_client("127.0.0.1".to_string(), ports::SIM_COMMS_PORT) {
match TcpInterface::new_client("127.0.0.1".to_string(), ports::SIM_ESAT_UART_PORT) {
Ok(tcp) => Some(tcp),
Err(e) => {
warn!("Error creating UHF interface: {e}");
Expand Down
4 changes: 2 additions & 2 deletions ex3_shared_libs/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ pub mod ports {
pub const SIM_DFGM_PORT: u16 = 1802;
pub const SIM_ADCS_PORT: u16 = 1803;
pub const SIM_EPS_PORT: u16 = 1804;
pub const SIM_COMMS_PORT: u16 = 1805;
pub const SIM_ESAT_UART_PORT: u16 = 1805;
pub const SIM_IRIS_PORT: u16 = 1806;
pub const SIM_UHF_GS_PORT: u16 = 1808;
pub const SIM_ESAT_UHF_PORT: u16 = 1808;

pub const DFGM_HANDLER_DISPATCHER_PORT: u16 = 1900;
pub const SCHEDULER_DISPATCHER_PORT: u16 = 1901;
Expand Down

0 comments on commit 935cb16

Please sign in to comment.