cargo fmt
This commit is contained in:
parent
13be7ca1e7
commit
3a71b00198
33
src/lib.rs
33
src/lib.rs
@ -144,7 +144,7 @@ impl Default for PacketId {
|
|||||||
PacketId {
|
PacketId {
|
||||||
ptype: PacketType::Tm,
|
ptype: PacketType::Tm,
|
||||||
sec_header_flag: false,
|
sec_header_flag: false,
|
||||||
apid: 0
|
apid: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -400,16 +400,12 @@ impl Default for SpHeader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SpHeader {
|
impl SpHeader {
|
||||||
pub const fn new(
|
pub const fn new(packet_id: PacketId, psc: PacketSequenceCtrl, data_len: u16) -> Self {
|
||||||
packet_id: PacketId,
|
|
||||||
psc: PacketSequenceCtrl,
|
|
||||||
data_len: u16
|
|
||||||
) -> Self {
|
|
||||||
Self {
|
Self {
|
||||||
version: 0,
|
version: 0,
|
||||||
packet_id,
|
packet_id,
|
||||||
psc,
|
psc,
|
||||||
data_len
|
data_len,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -421,7 +417,7 @@ impl SpHeader {
|
|||||||
apid: u16,
|
apid: u16,
|
||||||
seq_flags: SequenceFlags,
|
seq_flags: SequenceFlags,
|
||||||
seq_count: u16,
|
seq_count: u16,
|
||||||
data_len: u16
|
data_len: u16,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
if seq_count > MAX_SEQ_COUNT {
|
if seq_count > MAX_SEQ_COUNT {
|
||||||
panic!("Sequence count is too large");
|
panic!("Sequence count is too large");
|
||||||
@ -433,7 +429,7 @@ impl SpHeader {
|
|||||||
psc: PacketSequenceCtrl::const_new(seq_flags, seq_count),
|
psc: PacketSequenceCtrl::const_new(seq_flags, seq_count),
|
||||||
packet_id: PacketId::const_new(ptype, sec_header, apid),
|
packet_id: PacketId::const_new(ptype, sec_header, apid),
|
||||||
data_len,
|
data_len,
|
||||||
version: 0
|
version: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -451,7 +447,9 @@ impl SpHeader {
|
|||||||
if seq_count > MAX_SEQ_COUNT || apid > MAX_APID {
|
if seq_count > MAX_SEQ_COUNT || apid > MAX_APID {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
Some(SpHeader::const_new_from_single_fields(ptype, sec_header, apid, seq_flags, seq_count, data_len))
|
Some(SpHeader::const_new_from_single_fields(
|
||||||
|
ptype, sec_header, apid, seq_flags, seq_count, data_len,
|
||||||
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Helper function for telemetry space packet headers. The packet type field will be
|
/// Helper function for telemetry space packet headers. The packet type field will be
|
||||||
@ -643,10 +641,10 @@ pub mod zc {
|
|||||||
mod tests {
|
mod tests {
|
||||||
#[cfg(feature = "serde")]
|
#[cfg(feature = "serde")]
|
||||||
use crate::CcsdsPrimaryHeader;
|
use crate::CcsdsPrimaryHeader;
|
||||||
use crate::{SequenceFlags, SpHeader};
|
|
||||||
use crate::{
|
use crate::{
|
||||||
packet_type_in_raw_packet_id, zc, CcsdsPacket, PacketId, PacketSequenceCtrl, PacketType,
|
packet_type_in_raw_packet_id, zc, CcsdsPacket, PacketId, PacketSequenceCtrl, PacketType,
|
||||||
};
|
};
|
||||||
|
use crate::{SequenceFlags, SpHeader};
|
||||||
use alloc::vec;
|
use alloc::vec;
|
||||||
use num_traits::pow;
|
use num_traits::pow;
|
||||||
#[cfg(feature = "serde")]
|
#[cfg(feature = "serde")]
|
||||||
@ -655,7 +653,7 @@ mod tests {
|
|||||||
const CONST_SP: SpHeader = SpHeader::new(
|
const CONST_SP: SpHeader = SpHeader::new(
|
||||||
PacketId::const_tc(true, 0x36),
|
PacketId::const_tc(true, 0x36),
|
||||||
PacketSequenceCtrl::const_new(SequenceFlags::ContinuationSegment, 0x88),
|
PacketSequenceCtrl::const_new(SequenceFlags::ContinuationSegment, 0x88),
|
||||||
0x90
|
0x90,
|
||||||
);
|
);
|
||||||
|
|
||||||
const PACKET_ID_TM: PacketId = PacketId::const_tm(true, 0x22);
|
const PACKET_ID_TM: PacketId = PacketId::const_tm(true, 0x22);
|
||||||
@ -701,7 +699,10 @@ mod tests {
|
|||||||
fn verify_const_sp_header() {
|
fn verify_const_sp_header() {
|
||||||
assert_eq!(CONST_SP.sec_header_flag(), true);
|
assert_eq!(CONST_SP.sec_header_flag(), true);
|
||||||
assert_eq!(CONST_SP.apid(), 0x36);
|
assert_eq!(CONST_SP.apid(), 0x36);
|
||||||
assert_eq!(CONST_SP.sequence_flags(), SequenceFlags::ContinuationSegment);
|
assert_eq!(
|
||||||
|
CONST_SP.sequence_flags(),
|
||||||
|
SequenceFlags::ContinuationSegment
|
||||||
|
);
|
||||||
assert_eq!(CONST_SP.seq_count(), 0x88);
|
assert_eq!(CONST_SP.seq_count(), 0x88);
|
||||||
assert_eq!(CONST_SP.data_len, 0x90);
|
assert_eq!(CONST_SP.data_len, 0x90);
|
||||||
}
|
}
|
||||||
@ -714,7 +715,8 @@ mod tests {
|
|||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
SequenceFlags::try_from(0b01).expect("SEQ flag creation failed"),
|
SequenceFlags::try_from(0b01).expect("SEQ flag creation failed"),
|
||||||
SequenceFlags::FirstSegment);
|
SequenceFlags::FirstSegment
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
SequenceFlags::try_from(0b10).expect("SEQ flag creation failed"),
|
SequenceFlags::try_from(0b10).expect("SEQ flag creation failed"),
|
||||||
SequenceFlags::LastSegment
|
SequenceFlags::LastSegment
|
||||||
@ -902,7 +904,8 @@ mod tests {
|
|||||||
fn test_zc_sph() {
|
fn test_zc_sph() {
|
||||||
use zerocopy::AsBytes;
|
use zerocopy::AsBytes;
|
||||||
|
|
||||||
let sp_header = SpHeader::tc_unseg(0x7FF, pow(2, 14) - 1, 0).expect("Error creating SP header");
|
let sp_header =
|
||||||
|
SpHeader::tc_unseg(0x7FF, pow(2, 14) - 1, 0).expect("Error creating SP header");
|
||||||
assert_eq!(sp_header.ptype(), PacketType::Tc);
|
assert_eq!(sp_header.ptype(), PacketType::Tc);
|
||||||
assert_eq!(sp_header.apid(), 0x7FF);
|
assert_eq!(sp_header.apid(), 0x7FF);
|
||||||
assert_eq!(sp_header.data_len(), 0);
|
assert_eq!(sp_header.data_len(), 0);
|
||||||
|
@ -276,7 +276,7 @@ mod tests {
|
|||||||
use alloc::format;
|
use alloc::format;
|
||||||
use chrono::{Datelike, Timelike};
|
use chrono::{Datelike, Timelike};
|
||||||
#[cfg(feature = "serde")]
|
#[cfg(feature = "serde")]
|
||||||
use postcard::{to_allocvec, from_bytes};
|
use postcard::{from_bytes, to_allocvec};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_creation() {
|
fn test_creation() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user