rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 22 Wiki Activity

use new public function
All checks were successful
Rust/sat-rs/pipeline/pr-main This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-09-20 15:20:14 +02:00
parent 4017b5afc2
commit 1851b74279
Signed by: muellerr
GPG Key ID: FCE0B2BD2195142F
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
satrs-core/src/encoding/mod.rs
View File

@ -2,7 +2,7 @@ pub mod ccsds;
pub mod cobs; pub mod cobs;
pub use crate::encoding::ccsds::parse_buffer_for_ccsds_space_packets; pub use crate::encoding::ccsds::parse_buffer_for_ccsds_space_packets;
pub use crate::encoding::cobs::parse_buffer_for_cobs_encoded_packets; pub use crate::encoding::cobs::{encode_packet_with_cobs, parse_buffer_for_cobs_encoded_packets};
#[cfg(test)] #[cfg(test)]
pub(crate) mod tests { pub(crate) mod tests {

13
satrs-core/tests/tcp_server_cobs.rs
View File

@ -21,8 +21,8 @@ use std::{
thread, thread,
}; };
use cobs::encode;
use satrs_core::{ use satrs_core::{
encoding::cobs::encode_packet_with_cobs,
hal::std::tcp_server::{ServerConfig, TcpTmtcInCobsServer}, hal::std::tcp_server::{ServerConfig, TcpTmtcInCobsServer},
tmtc::{ReceivesTcCore, TmPacketSourceCore}, tmtc::{ReceivesTcCore, TmPacketSourceCore},
}; };
@ -77,15 +77,6 @@ impl TmPacketSourceCore for SyncTmSource {
} }
} }
// Simple COBS encoder which also inserts the sentinel bytes.
fn encode_simple_packet(encoded_buf: &mut [u8], current_idx: &mut usize) {
encoded_buf[*current_idx] = 0;
*current_idx += 1;
*current_idx += encode(&SIMPLE_PACKET, &mut encoded_buf[*current_idx..]);
encoded_buf[*current_idx] = 0;
*current_idx += 1;
}
const SIMPLE_PACKET: [u8; 5] = [1, 2, 3, 4, 5]; const SIMPLE_PACKET: [u8; 5] = [1, 2, 3, 4, 5];
const INVERTED_PACKET: [u8; 5] = [5, 4, 3, 4, 1]; const INVERTED_PACKET: [u8; 5] = [5, 4, 3, 4, 1];
@ -123,7 +114,7 @@ fn main() {
// Send TC to server now. // Send TC to server now.
let mut encoded_buf: [u8; 16] = [0; 16]; let mut encoded_buf: [u8; 16] = [0; 16];
let mut current_idx = 0; let mut current_idx = 0;
encode_simple_packet(&mut encoded_buf, &mut current_idx); encode_packet_with_cobs(&SIMPLE_PACKET, &mut encoded_buf, &mut current_idx);
let mut stream = TcpStream::connect(dest_addr).expect("connecting to TCP server failed"); let mut stream = TcpStream::connect(dest_addr).expect("connecting to TCP server failed");
stream stream
.write_all(&encoded_buf[..current_idx]) .write_all(&encoded_buf[..current_idx])