doc fixes

CHANGELOG.md

@@ -8,8 +8,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 # [unreleased]
 
-# [v0.11.0-rc.1] 2024-04-03
-
 Major API changes for the time API. If you are using the time API, it is strongly recommended
 to check all the API changes in the **Changed** chapter.
 
@@ -26,14 +24,9 @@ to check all the API changes in the **Changed** chapter.
 - Added basic support conversions to the `time` library. Introduce new `chrono` and `timelib`
   feature gate.
 - Added `CcsdsTimeProvider::timelib_date_time`.
-- Optional support for `defmt` by adding optional `defmt::Format` derives for common types.
 
 ## Changed
 
-- `PusTcCreator::new_simple` now expects a valid slice for the source data instead of an optional
-  slice. For telecommands without application data, `&[]` can be passed.
-- `PusTmSecondaryHeader` constructors now expects a valid slice for the time stamp instead of an
-  optional slice.
 - Renamed `CcsdsTimeProvider::date_time` to `CcsdsTimeProvider::chrono_date_time`
 - Renamed `CcsdsTimeCodes` to `CcsdsTimeCode`
 - Renamed `cds::TimeProvider` to `cds::CdsTime`
@@ -54,14 +47,8 @@ to check all the API changes in the **Changed** chapter.
 - Error handling for ECSS and time module is more granular now, with a new
   `DateBeforeCcsdsEpochError` error and a `DateBeforeCcsdsEpoch` enum variant for both
   `CdsError` and `CucError`.
-- `PusTmCreator` now has two lifetimes: One for the raw source data buffer and one for the
-  raw timestamp.
 - Time API `from_now*` API renamed to `now*`.
 
-## Removed
-
-- Legacy `PusTm` and `PusTc` objects.
-
 # [v0.11.0-rc.0] 2024-03-04
 
 ## Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spacepackets"
-version = "0.11.0-rc.1"
+version = "0.11.0-rc.0"
 edition = "2021"
 rust-version = "1.61"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
@@ -48,10 +48,6 @@ optional = true
 version = "0.2"
 default-features = false
 
-[dependencies.defmt]
-version = "0.3"
-optional = true
-
 [dev-dependencies]
 postcard = "1"
 chrono = "0.4"
@@ -63,8 +59,7 @@ serde = ["dep:serde", "chrono/serde"]
 alloc = ["postcard/alloc", "chrono/alloc"]
 chrono = ["dep:chrono"]
 timelib = ["dep:time"]
-defmt = ["dep:defmt"]
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docs_rs", "--generate-link-to-definition"]
+rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]

README.md

@@ -45,8 +45,6 @@ deserializing them with an appropriate `serde` provider like
  - [`serde`](https://serde.rs/): Adds `serde` support for most types by adding `Serialize` and `Deserialize` `derive`s
  - [`chrono`](https://crates.io/crates/chrono): Add basic support for the `chrono` time library.
  - [`timelib`](https://crates.io/crates/time): Add basic support for the `time` time library.
- - [`defmt`](https://defmt.ferrous-systems.com/): Add support for the `defmt` by adding the
-   [`defmt::Format`](https://defmt.ferrous-systems.com/format) derive on many types.
 
 # Examples
 

release-checklist.md

@@ -4,11 +4,11 @@ Checklist for new releases
 # Pre-Release
 
 1. Make sure any new modules are documented sufficiently enough and check docs with
-   `cargo +nightly doc --all-features --config 'build.rustdocflags=["--cfg", "docs_rs"]' --open`.
+   `cargo +nightly doc --all-features --config 'build.rustdocflags=["--cfg", "docsrs"]' --open`.
 2. Bump version specifier in `Cargo.toml`.
 3. Update `CHANGELOG.md`: Convert `unreleased` section into version section with date and add new
    `unreleased` section.
-4. Run `cargo test --all-features` or `cargo nextest r --all-features`.
+4. Run `cargo test --all-features`.
 5. Run `cargo fmt` and `cargo clippy`. Check `cargo msrv` against MSRV in `Cargo.toml`.
 6. Wait for CI/CD results for EGit and Github. These also check cross-compilation for bare-metal
    targets.

src/cfdp/lv.rs

@@ -20,7 +20,6 @@ pub const MIN_LV_LEN: usize = 1;
 ///    this will be the lifetime of that data reference.
 #[derive(Debug, Copy, Clone, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct Lv<'data> {
     data: &'data [u8],
     // If the LV was generated from a raw bytestream, this will contain the start of the

src/cfdp/mod.rs

@@ -18,7 +18,6 @@ pub const CFDP_VERSION_2: u8 = 0b001;
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum PduType {
     FileDirective = 0,
@@ -27,7 +26,6 @@ pub enum PduType {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum Direction {
     TowardsReceiver = 0,
@@ -36,7 +34,6 @@ pub enum Direction {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum TransmissionMode {
     Acknowledged = 0,
@@ -45,7 +42,6 @@ pub enum TransmissionMode {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum CrcFlag {
     NoCrc = 0,
@@ -73,7 +69,6 @@ impl From<CrcFlag> for bool {
 /// Always 0 and ignored for File Directive PDUs (CCSDS 727.0-B-5 P.75)
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum SegmentMetadataFlag {
     NotPresent = 0,
@@ -83,7 +78,6 @@ pub enum SegmentMetadataFlag {
 /// Always 0 and ignored for File Directive PDUs (CCSDS 727.0-B-5 P.75)
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum SegmentationControl {
     NoRecordBoundaryPreservation = 0,
@@ -92,7 +86,6 @@ pub enum SegmentationControl {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum FaultHandlerCode {
     NoticeOfCancellation = 0b0001,
@@ -103,7 +96,6 @@ pub enum FaultHandlerCode {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum ConditionCode {
     /// This is not an error condition for which a faulty handler override can be specified
@@ -126,7 +118,6 @@ pub enum ConditionCode {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum LargeFileFlag {
     /// 32 bit maximum file size and FSS size
@@ -138,7 +129,6 @@ pub enum LargeFileFlag {
 /// Transaction status for the ACK PDU field according to chapter 5.2.4 of the CFDP standard.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum TransactionStatus {
     /// Transaction is not currently active and the CFDP implementation does not retain a
@@ -156,7 +146,6 @@ pub enum TransactionStatus {
 /// [SANA Checksum Types registry](https://sanaregistry.org/r/checksum_identifiers/)
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum ChecksumType {
     /// Modular legacy checksum
@@ -178,7 +167,6 @@ pub const NULL_CHECKSUM_U32: [u8; 4] = [0; 4];
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum TlvLvError {
     DataTooLarge(usize),
     ByteConversion(ByteConversionError),

src/cfdp/pdu/ack.rs

@@ -15,7 +15,6 @@ use serde::{Deserialize, Serialize};
 /// For more information, refer to CFDP chapter 5.2.4.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct AckPdu {
     pdu_header: PduHeader,
     directive_code_of_acked_pdu: FileDirectiveType,

src/cfdp/pdu/eof.rs

@@ -15,7 +15,6 @@ use super::{CfdpPdu, WritablePduPacket};
 /// For more information, refer to CFDP chapter 5.2.2.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct EofPdu {
     pdu_header: PduHeader,
     condition_code: ConditionCode,

src/cfdp/pdu/finished.rs

@@ -14,7 +14,6 @@ use super::{CfdpPdu, WritablePduPacket};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum DeliveryCode {
     Complete = 0,
@@ -23,7 +22,6 @@ pub enum DeliveryCode {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum FileStatus {
     DiscardDeliberately = 0b00,
@@ -36,7 +34,6 @@ pub enum FileStatus {
 ///
 /// For more information, refer to CFDP chapter 5.2.3.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct FinishedPduCreator<'fs_responses> {
     pdu_header: PduHeader,
     condition_code: ConditionCode,
@@ -222,7 +219,6 @@ impl<'buf> Iterator for FilestoreResponseIterator<'buf> {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct FinishedPduReader<'buf> {
     pdu_header: PduHeader,
     condition_code: ConditionCode,

src/cfdp/pdu/metadata.rs

@@ -15,7 +15,6 @@ use super::{CfdpPdu, WritablePduPacket};
 
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct MetadataGenericParams {
     pub closure_requested: bool,
     pub checksum_type: ChecksumType,
@@ -56,7 +55,6 @@ pub fn build_metadata_opts_from_vec(
 /// This abstraction exposes a specialized API for creating metadata PDUs as specified in
 /// CFDP chapter 5.2.5.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct MetadataPduCreator<'src_name, 'dest_name, 'opts> {
     pdu_header: PduHeader,
     metadata_params: MetadataGenericParams,
@@ -243,7 +241,6 @@ impl<'opts> Iterator for OptionsIter<'opts> {
 /// involved.
 #[derive(Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct MetadataPduReader<'buf> {
     pdu_header: PduHeader,
     metadata_params: MetadataGenericParams,

src/cfdp/pdu/mod.rs

@@ -18,7 +18,6 @@ pub mod nak;
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum FileDirectiveType {
     EofPdu = 0x04,
@@ -221,7 +220,6 @@ pub trait CfdpPdu {
 /// same.
 #[derive(Debug, Copy, Clone, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct CommonPduConfig {
     source_entity_id: UnsignedByteField,
     dest_entity_id: UnsignedByteField,
@@ -360,7 +358,6 @@ pub const FIXED_HEADER_LEN: usize = 4;
 /// For detailed information, refer to chapter 5.1 of the CFDP standard.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PduHeader {
     pdu_type: PduType,
     pdu_conf: CommonPduConfig,

src/cfdp/pdu/nak.rs

@@ -12,7 +12,6 @@ use super::{
 /// Helper type to encapsulate both normal file size segment requests and large file size segment
 /// requests.
 #[derive(Debug, PartialEq, Eq, Clone)]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum SegmentRequests<'a> {
     U32Pairs(&'a [(u32, u32)]),
     U64Pairs(&'a [(u64, u64)]),
@@ -32,7 +31,6 @@ impl SegmentRequests<'_> {
 /// It exposes a specialized API which simplifies to generate these NAK PDUs with the
 /// format according to CFDP chapter 5.2.6.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct NakPduCreator<'seg_reqs> {
     pdu_header: PduHeader,
     start_of_scope: u64,
@@ -355,7 +353,6 @@ impl<T: SegReqFromBytes> SegmentRequestIter<'_, T> {
 ///
 /// The NAK format is expected to be conforming to CFDP chapter 5.2.6.
 #[derive(Debug, PartialEq, Eq)]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct NakPduReader<'seg_reqs> {
     pdu_header: PduHeader,
     start_of_scope: u64,

src/cfdp/tlv/mod.rs

@@ -52,7 +52,6 @@ pub trait WritableTlv {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum TlvType {
     FilestoreRequest = 0x00,
@@ -65,7 +64,6 @@ pub enum TlvType {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum TlvTypeField {
     Standard(TlvType),
     Custom(u8),
@@ -73,7 +71,6 @@ pub enum TlvTypeField {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum FilestoreActionCode {
     CreateFile = 0b0000,
@@ -121,7 +118,6 @@ impl From<TlvTypeField> for u8 {
 ///    this will be the lifetime of that data reference.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct Tlv<'data> {
     tlv_type_field: TlvTypeField,
     #[cfg_attr(feature = "serde", serde(borrow))]
@@ -228,7 +224,6 @@ pub(crate) fn verify_tlv_type(raw_type: u8, expected_tlv_type: TlvType) -> Resul
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct EntityIdTlv {
     entity_id: UnsignedByteField,
 }
@@ -353,7 +348,6 @@ pub fn fs_request_has_second_filename(action_code: FilestoreActionCode) -> bool
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 struct FilestoreTlvBase<'first_name, 'second_name> {
     pub action_code: FilestoreActionCode,
     #[cfg_attr(feature = "serde", serde(borrow))]
@@ -567,7 +561,6 @@ impl GenericTlv for FilestoreRequestTlv<'_, '_> {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct FilestoreResponseTlv<'first_name, 'second_name, 'fs_msg> {
     #[cfg_attr(feature = "serde", serde(borrow))]
     base: FilestoreTlvBase<'first_name, 'second_name>,

src/ecss/hk.rs

@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Eq, PartialEq, Copy, Clone, IntoPrimitive, TryFromPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum Subservice {
     // Regular HK

src/ecss/mod.rs

@@ -74,7 +74,6 @@ pub enum PusServiceId {
 /// All PUS versions. Only PUS C is supported by this library.
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[non_exhaustive]
 pub enum PusVersion {
     EsaPus = 0,
@@ -151,7 +150,6 @@ pub enum PfcReal {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum PusError {
     VersionNotSupported(PusVersion),
     ChecksumFailure(u16),
@@ -227,6 +225,24 @@ pub(crate) fn calc_pus_crc16(bytes: &[u8]) -> u16 {
     digest.finalize()
 }
 
+pub(crate) fn crc_procedure(
+    calc_on_serialization: bool,
+    cached_crc16: &Option<u16>,
+    start_idx: usize,
+    curr_idx: usize,
+    slice: &[u8],
+) -> Result<u16, PusError> {
+    let crc16;
+    if calc_on_serialization {
+        crc16 = calc_pus_crc16(&slice[start_idx..curr_idx])
+    } else if cached_crc16.is_none() {
+        return Err(PusError::CrcCalculationMissing);
+    } else {
+        crc16 = cached_crc16.unwrap();
+    }
+    Ok(crc16)
+}
+
 pub(crate) fn user_data_from_raw(
     current_idx: usize,
     total_len: usize,

src/ecss/tc.rs

@@ -48,6 +48,8 @@ use zerocopy::AsBytes;
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 
+pub use legacy_tc::*;
+
 /// PUS C secondary header length is fixed
 pub const PUC_TC_SECONDARY_HEADER_LEN: usize = size_of::<zc::PusTcSecondaryHeader>();
 pub const PUS_TC_MIN_LEN_WITHOUT_APP_DATA: usize =
@@ -59,7 +61,6 @@ pub trait IsPusTelecommand {}
 
 #[derive(Debug, Eq, PartialEq, Copy, Clone, IntoPrimitive, TryFromPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 enum AckOpts {
     Acceptance = 0b1000,
@@ -145,7 +146,6 @@ pub mod zc {
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PusTcSecondaryHeader {
     pub service: u8,
     pub subservice: u8,
@@ -212,6 +212,332 @@ impl PusTcSecondaryHeader {
     }
 }
 
+pub mod legacy_tc {
+    use crate::ecss::tc::{
+        zc, GenericPusTcSecondaryHeader, IsPusTelecommand, PusTcSecondaryHeader, ACK_ALL,
+        PUC_TC_SECONDARY_HEADER_LEN, PUS_TC_MIN_LEN_WITHOUT_APP_DATA,
+    };
+    use crate::ecss::{
+        ccsds_impl, crc_from_raw_data, crc_procedure, sp_header_impls,
+        verify_crc16_ccitt_false_from_raw_to_pus_error, PusError, PusPacket, WritablePusPacket,
+        CCSDS_HEADER_LEN,
+    };
+    use crate::ecss::{user_data_from_raw, PusVersion};
+    use crate::SequenceFlags;
+    use crate::{ByteConversionError, CcsdsPacket, PacketType, SpHeader, CRC_CCITT_FALSE};
+    use core::mem::size_of;
+    use delegate::delegate;
+    use zerocopy::AsBytes;
+
+    #[cfg(feature = "alloc")]
+    use alloc::vec::Vec;
+
+    #[cfg(feature = "serde")]
+    use serde::{Deserialize, Serialize};
+
+    /// This class models the PUS C telecommand packet. It is the primary data structure to generate the
+    /// raw byte representation of a PUS telecommand or to deserialize from one from raw bytes.
+    ///
+    /// This class also derives the [serde::Serialize] and [serde::Deserialize] trait if the
+    /// [serde] feature is used, which allows to send around TC packets in a raw byte format using a
+    /// serde provider like [postcard](https://docs.rs/postcard/latest/postcard/).
+    ///
+    /// There is no spare bytes support yet.
+    ///
+    /// # Lifetimes
+    ///
+    /// * `'raw_data` - If the TC is not constructed from a raw slice, this will be the life time of
+    ///    a buffer where the user provided application data will be serialized into. If it
+    ///    is, this is the lifetime of the raw byte slice it is constructed from.
+    #[derive(Eq, Copy, Clone, Debug)]
+    #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+    pub struct PusTc<'raw_data> {
+        sp_header: SpHeader,
+        pub sec_header: PusTcSecondaryHeader,
+        /// If this is set to false, a manual call to [PusTc::calc_own_crc16] or
+        /// [PusTc::update_packet_fields] is necessary for the serialized or cached CRC16 to be valid.
+        pub calc_crc_on_serialization: bool,
+        #[cfg_attr(feature = "serde", serde(skip))]
+        raw_data: Option<&'raw_data [u8]>,
+        app_data: &'raw_data [u8],
+        crc16: Option<u16>,
+    }
+
+    impl<'raw_data> PusTc<'raw_data> {
+        /// Generates a new struct instance.
+        ///
+        /// # Arguments
+        ///
+        /// * `sp_header` - Space packet header information. The correct packet type will be set
+        ///     automatically
+        /// * `sec_header` - Information contained in the data field header, including the service
+        ///     and subservice type
+        /// * `app_data` - Custom application data
+        /// * `set_ccsds_len` - Can be used to automatically update the CCSDS space packet data length
+        ///     field. If this is not set to true, [PusTc::update_ccsds_data_len] can be called to set
+        ///     the correct value to this field manually
+        #[deprecated(
+            since = "0.7.0",
+            note = "Use specialized PusTcCreator or PusTcReader classes instead"
+        )]
+        pub fn new(
+            sp_header: &mut SpHeader,
+            sec_header: PusTcSecondaryHeader,
+            app_data: Option<&'raw_data [u8]>,
+            set_ccsds_len: bool,
+        ) -> Self {
+            sp_header.set_packet_type(PacketType::Tc);
+            sp_header.set_sec_header_flag();
+            let mut pus_tc = Self {
+                sp_header: *sp_header,
+                raw_data: None,
+                app_data: app_data.unwrap_or(&[]),
+                sec_header,
+                calc_crc_on_serialization: true,
+                crc16: None,
+            };
+            if set_ccsds_len {
+                pus_tc.update_ccsds_data_len();
+            }
+            pus_tc
+        }
+
+        /// Simplified version of the [PusTc::new] function which allows to only specify service and
+        /// subservice instead of the full PUS TC secondary header.
+        #[deprecated(
+            since = "0.7.0",
+            note = "Use specialized PusTcCreator or PusTcReader classes instead"
+        )]
+        pub fn new_simple(
+            sph: &mut SpHeader,
+            service: u8,
+            subservice: u8,
+            app_data: Option<&'raw_data [u8]>,
+            set_ccsds_len: bool,
+        ) -> Self {
+            #[allow(deprecated)]
+            Self::new(
+                sph,
+                PusTcSecondaryHeader::new(service, subservice, ACK_ALL, 0),
+                app_data,
+                set_ccsds_len,
+            )
+        }
+
+        pub fn sp_header(&self) -> &SpHeader {
+            &self.sp_header
+        }
+
+        pub fn set_ack_field(&mut self, ack: u8) -> bool {
+            if ack > 0b1111 {
+                return false;
+            }
+            self.sec_header.ack = ack & 0b1111;
+            true
+        }
+
+        pub fn set_source_id(&mut self, source_id: u16) {
+            self.sec_header.source_id = source_id;
+        }
+
+        sp_header_impls!();
+
+        /// Calculate the CCSDS space packet data length field and sets it
+        /// This is called automatically if the `set_ccsds_len` argument in the [PusTc::new] call was
+        /// used.
+        /// If this was not done or the application data is set or changed after construction,
+        /// this function needs to be called to ensure that the data length field of the CCSDS header
+        /// is set correctly.
+        pub fn update_ccsds_data_len(&mut self) {
+            self.sp_header.data_len =
+                self.len_written() as u16 - size_of::<crate::zc::SpHeader>() as u16 - 1;
+        }
+
+        /// This function should be called before the TC packet is serialized if
+        /// [PusTc::calc_crc_on_serialization] is set to False. It will calculate and cache the CRC16.
+        pub fn calc_own_crc16(&mut self) {
+            let mut digest = CRC_CCITT_FALSE.digest();
+            let sph_zc = crate::zc::SpHeader::from(self.sp_header);
+            digest.update(sph_zc.as_bytes());
+            let pus_tc_header = zc::PusTcSecondaryHeader::try_from(self.sec_header).unwrap();
+            digest.update(pus_tc_header.as_bytes());
+            if !self.app_data.is_empty() {
+                digest.update(self.app_data);
+            }
+            self.crc16 = Some(digest.finalize())
+        }
+
+        /// This helper function calls both [PusTc::update_ccsds_data_len] and [PusTc::calc_own_crc16].
+        pub fn update_packet_fields(&mut self) {
+            self.update_ccsds_data_len();
+            self.calc_own_crc16();
+        }
+
+        #[cfg(feature = "alloc")]
+        pub fn append_to_vec(&self, vec: &mut Vec<u8>) -> Result<usize, PusError> {
+            let sph_zc = crate::zc::SpHeader::from(self.sp_header);
+            let appended_len = PUS_TC_MIN_LEN_WITHOUT_APP_DATA + self.app_data.len();
+            let start_idx = vec.len();
+            let mut ser_len = 0;
+            vec.extend_from_slice(sph_zc.as_bytes());
+            ser_len += sph_zc.as_bytes().len();
+            // The PUS version is hardcoded to PUS C
+            let pus_tc_header = zc::PusTcSecondaryHeader::try_from(self.sec_header).unwrap();
+            vec.extend_from_slice(pus_tc_header.as_bytes());
+            ser_len += pus_tc_header.as_bytes().len();
+            vec.extend_from_slice(self.app_data);
+            ser_len += self.app_data.len();
+            let crc16 = crc_procedure(
+                self.calc_crc_on_serialization,
+                &self.crc16,
+                start_idx,
+                ser_len,
+                &vec[start_idx..ser_len],
+            )?;
+            vec.extend_from_slice(crc16.to_be_bytes().as_slice());
+            Ok(appended_len)
+        }
+
+        /// Create a [PusTc] instance from a raw slice. On success, it returns a tuple containing
+        /// the instance and the found byte length of the packet.
+        #[deprecated(
+            since = "0.7.0",
+            note = "Use specialized PusTcCreator or PusTcReader classes instead"
+        )]
+        pub fn from_bytes(slice: &'raw_data [u8]) -> Result<(Self, usize), PusError> {
+            let raw_data_len = slice.len();
+            if raw_data_len < PUS_TC_MIN_LEN_WITHOUT_APP_DATA {
+                return Err(ByteConversionError::FromSliceTooSmall {
+                    found: raw_data_len,
+                    expected: PUS_TC_MIN_LEN_WITHOUT_APP_DATA,
+                }
+                .into());
+            }
+            let mut current_idx = 0;
+            let (sp_header, _) = SpHeader::from_be_bytes(&slice[0..CCSDS_HEADER_LEN])?;
+            current_idx += CCSDS_HEADER_LEN;
+            let total_len = sp_header.total_len();
+            if raw_data_len < total_len || total_len < PUS_TC_MIN_LEN_WITHOUT_APP_DATA {
+                return Err(ByteConversionError::FromSliceTooSmall {
+                    found: raw_data_len,
+                    expected: total_len,
+                }
+                .into());
+            }
+            let sec_header = zc::PusTcSecondaryHeader::from_bytes(
+                &slice[current_idx..current_idx + PUC_TC_SECONDARY_HEADER_LEN],
+            )
+            .ok_or(ByteConversionError::ZeroCopyFromError)?;
+            current_idx += PUC_TC_SECONDARY_HEADER_LEN;
+            let raw_data = &slice[0..total_len];
+            let pus_tc = Self {
+                sp_header,
+                sec_header: PusTcSecondaryHeader::try_from(sec_header).unwrap(),
+                raw_data: Some(raw_data),
+                app_data: user_data_from_raw(current_idx, total_len, slice)?,
+                calc_crc_on_serialization: false,
+                crc16: Some(crc_from_raw_data(raw_data)?),
+            };
+            verify_crc16_ccitt_false_from_raw_to_pus_error(
+                raw_data,
+                pus_tc.crc16.expect("CRC16 invalid"),
+            )?;
+            Ok((pus_tc, total_len))
+        }
+
+        #[deprecated(since = "0.5.2", note = "use raw_bytes() instead")]
+        pub fn raw(&self) -> Option<&'raw_data [u8]> {
+            self.raw_bytes()
+        }
+
+        /// If [Self] was constructed [Self::from_bytes], this function will return the slice it was
+        /// constructed from. Otherwise, [None] will be returned.
+        pub fn raw_bytes(&self) -> Option<&'raw_data [u8]> {
+            self.raw_data
+        }
+    }
+
+    impl WritablePusPacket for PusTc<'_> {
+        fn len_written(&self) -> usize {
+            PUS_TC_MIN_LEN_WITHOUT_APP_DATA + self.app_data.len()
+        }
+
+        /// Write the raw PUS byte representation to a provided buffer.
+        fn write_to_bytes(&self, slice: &mut [u8]) -> Result<usize, PusError> {
+            let mut curr_idx = 0;
+            let tc_header_len = size_of::<zc::PusTcSecondaryHeader>();
+            let total_size = self.len_written();
+            if total_size > slice.len() {
+                return Err(ByteConversionError::ToSliceTooSmall {
+                    found: slice.len(),
+                    expected: total_size,
+                }
+                .into());
+            }
+            self.sp_header.write_to_be_bytes(slice)?;
+            curr_idx += CCSDS_HEADER_LEN;
+            let sec_header = zc::PusTcSecondaryHeader::try_from(self.sec_header).unwrap();
+            sec_header
+                .write_to_bytes(&mut slice[curr_idx..curr_idx + tc_header_len])
+                .ok_or(ByteConversionError::ZeroCopyToError)?;
+
+            curr_idx += tc_header_len;
+            slice[curr_idx..curr_idx + self.app_data.len()].copy_from_slice(self.app_data);
+            curr_idx += self.app_data.len();
+            let crc16 = crc_procedure(
+                self.calc_crc_on_serialization,
+                &self.crc16,
+                0,
+                curr_idx,
+                slice,
+            )?;
+            slice[curr_idx..curr_idx + 2].copy_from_slice(crc16.to_be_bytes().as_slice());
+            curr_idx += 2;
+            Ok(curr_idx)
+        }
+    }
+
+    impl PartialEq for PusTc<'_> {
+        fn eq(&self, other: &Self) -> bool {
+            self.sp_header == other.sp_header
+                && self.sec_header == other.sec_header
+                && self.app_data == other.app_data
+        }
+    }
+
+    impl CcsdsPacket for PusTc<'_> {
+        ccsds_impl!();
+    }
+
+    impl PusPacket for PusTc<'_> {
+        delegate!(to self.sec_header {
+            fn pus_version(&self) -> PusVersion;
+            fn service(&self) -> u8;
+            fn subservice(&self) -> u8;
+        });
+
+        fn user_data(&self) -> &[u8] {
+            self.app_data
+        }
+
+        fn crc16(&self) -> Option<u16> {
+            self.crc16
+        }
+    }
+
+    impl GenericPusTcSecondaryHeader for PusTc<'_> {
+        delegate!(to self.sec_header {
+            fn pus_version(&self) -> PusVersion;
+            fn service(&self) -> u8;
+            fn subservice(&self) -> u8;
+            fn source_id(&self) -> u16;
+            fn ack_flags(&self) -> u8;
+        });
+    }
+
+    impl IsPusTelecommand for PusTc<'_> {}
+}
+
 /// This class can be used to create PUS C telecommand packet. It is the primary data structure to
 /// generate the raw byte representation of a PUS telecommand.
 ///
@@ -222,7 +548,6 @@ impl PusTcSecondaryHeader {
 /// There is no spare bytes support yet.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PusTcCreator<'raw_data> {
     sp_header: SpHeader,
     pub sec_header: PusTcSecondaryHeader,
@@ -240,7 +565,7 @@ impl<'raw_data> PusTcCreator<'raw_data> {
     ///     and subservice type
     /// * `app_data` - Custom application data
     /// * `set_ccsds_len` - Can be used to automatically update the CCSDS space packet data length
-    ///     field. If this is not set to true, [Self::update_ccsds_data_len] can be called to set
+    ///     field. If this is not set to true, [PusTc::update_ccsds_data_len] can be called to set
     ///     the correct value to this field manually
     pub fn new(
         sp_header: &mut SpHeader,
@@ -261,19 +586,19 @@ impl<'raw_data> PusTcCreator<'raw_data> {
         pus_tc
     }
 
-    /// Simplified version of the [Self::new] function which allows to only specify service
+    /// Simplified version of the [PusTcCreator::new] function which allows to only specify service
     /// and subservice instead of the full PUS TC secondary header.
     pub fn new_simple(
         sph: &mut SpHeader,
         service: u8,
         subservice: u8,
-        app_data: &'raw_data [u8],
+        app_data: Option<&'raw_data [u8]>,
         set_ccsds_len: bool,
     ) -> Self {
         Self::new(
             sph,
             PusTcSecondaryHeader::new(service, subservice, ACK_ALL, 0),
-            app_data,
+            app_data.unwrap_or(&[]),
             set_ccsds_len,
         )
     }
@@ -305,7 +630,7 @@ impl<'raw_data> PusTcCreator<'raw_data> {
     sp_header_impls!();
 
     /// Calculate the CCSDS space packet data length field and sets it
-    /// This is called automatically if the `set_ccsds_len` argument in the [Self::new] call was
+    /// This is called automatically if the `set_ccsds_len` argument in the [PusTc::new] call was
     /// used.
     /// If this was not done or the application data is set or changed after construction,
     /// this function needs to be called to ensure that the data length field of the CCSDS header
@@ -315,7 +640,8 @@ impl<'raw_data> PusTcCreator<'raw_data> {
             self.len_written() as u16 - size_of::<crate::zc::SpHeader>() as u16 - 1;
     }
 
-    /// This function calculates and returns the CRC16 for the current packet.
+    /// This function should be called before the TC packet is serialized if
+    /// [PusTc::calc_crc_on_serialization] is set to False. It will calculate and cache the CRC16.
     pub fn calc_own_crc16(&self) -> u16 {
         let mut digest = CRC_CCITT_FALSE.digest();
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
@@ -424,7 +750,6 @@ impl IsPusTelecommand for PusTcCreator<'_> {}
 /// * `'raw_data` - Lifetime of the provided raw slice.
 #[derive(Eq, Copy, Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PusTcReader<'raw_data> {
     #[cfg_attr(feature = "serde", serde(skip))]
     raw_data: &'raw_data [u8],
@@ -575,12 +900,12 @@ mod tests {
 
     fn base_ping_tc_simple_ctor() -> PusTcCreator<'static> {
         let mut sph = SpHeader::tc_unseg(0x02, 0x34, 0).unwrap();
-        PusTcCreator::new_simple(&mut sph, 17, 1, &[], true)
+        PusTcCreator::new_simple(&mut sph, 17, 1, None, true)
     }
 
     fn base_ping_tc_simple_ctor_with_app_data(app_data: &'static [u8]) -> PusTcCreator<'static> {
         let mut sph = SpHeader::tc_unseg(0x02, 0x34, 0).unwrap();
-        PusTcCreator::new_simple(&mut sph, 17, 1, app_data, true)
+        PusTcCreator::new_simple(&mut sph, 17, 1, Some(app_data), true)
     }
 
     #[test]
@@ -637,7 +962,7 @@ mod tests {
     #[test]
     fn test_update_func() {
         let mut sph = SpHeader::tc_unseg(0x02, 0x34, 0).unwrap();
-        let mut tc = PusTcCreator::new_simple(&mut sph, 17, 1, &[], false);
+        let mut tc = PusTcCreator::new_simple(&mut sph, 17, 1, None, false);
         assert_eq!(tc.data_len(), 0);
         tc.update_ccsds_data_len();
         assert_eq!(tc.data_len(), 6);

src/ecss/tm.rs

@@ -19,6 +19,7 @@ use alloc::vec::Vec;
 use delegate::delegate;
 
 use crate::time::{TimeWriter, TimestampError};
+pub use legacy_tm::*;
 
 use self::zc::PusTmSecHeaderWithoutTimestamp;
 
@@ -115,7 +116,6 @@ pub mod zc {
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PusTmSecondaryHeader<'stamp> {
     pus_version: PusVersion,
     pub sc_time_ref_status: u8,
@@ -123,17 +123,17 @@ pub struct PusTmSecondaryHeader<'stamp> {
     pub subservice: u8,
     pub msg_counter: u16,
     pub dest_id: u16,
-    pub time_stamp: &'stamp [u8],
+    pub timestamp: &'stamp [u8],
 }
 
 impl<'stamp> PusTmSecondaryHeader<'stamp> {
-    pub fn new_simple(service: u8, subservice: u8, time_stamp: &'stamp [u8]) -> Self {
+    pub fn new_simple(service: u8, subservice: u8, timestamp: &'stamp [u8]) -> Self {
-        Self::new(service, subservice, 0, 0, time_stamp)
+        Self::new(service, subservice, 0, 0, Some(timestamp))
     }
 
     /// Like [Self::new_simple] but without a timestamp.
     pub fn new_simple_no_timestamp(service: u8, subservice: u8) -> Self {
-        Self::new(service, subservice, 0, 0, &[])
+        Self::new(service, subservice, 0, 0, None)
     }
 
     pub fn new(
@@ -141,7 +141,7 @@ impl<'stamp> PusTmSecondaryHeader<'stamp> {
         subservice: u8,
         msg_counter: u16,
         dest_id: u16,
-        time_stamp: &'stamp [u8],
+        timestamp: Option<&'stamp [u8]>,
     ) -> Self {
         PusTmSecondaryHeader {
             pus_version: PusVersion::PusC,
@@ -150,7 +150,7 @@ impl<'stamp> PusTmSecondaryHeader<'stamp> {
             subservice,
             msg_counter,
             dest_id,
-            time_stamp,
+            timestamp: timestamp.unwrap_or(&[]),
         }
     }
 }
@@ -192,11 +192,339 @@ impl<'slice> TryFrom<zc::PusTmSecHeader<'slice>> for PusTmSecondaryHeader<'slice
             subservice: sec_header.zc_header.subservice(),
             msg_counter: sec_header.zc_header.msg_counter(),
             dest_id: sec_header.zc_header.dest_id(),
-            time_stamp: sec_header.timestamp,
+            timestamp: sec_header.timestamp,
         })
     }
 }
 
+pub mod legacy_tm {
+    use crate::ecss::tm::{
+        zc, GenericPusTmSecondaryHeader, IsPusTelemetry, PusTmSecondaryHeader,
+        PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA, PUS_TM_MIN_SEC_HEADER_LEN,
+    };
+    use crate::ecss::PusVersion;
+    use crate::ecss::{
+        ccsds_impl, crc_from_raw_data, crc_procedure, sp_header_impls, user_data_from_raw,
+        verify_crc16_ccitt_false_from_raw_to_pus_error, PusError, PusPacket, WritablePusPacket,
+        CCSDS_HEADER_LEN,
+    };
+    use crate::SequenceFlags;
+    use crate::{ByteConversionError, CcsdsPacket, PacketType, SpHeader, CRC_CCITT_FALSE};
+    use core::mem::size_of;
+    use zerocopy::AsBytes;
+
+    #[cfg(feature = "serde")]
+    use serde::{Deserialize, Serialize};
+
+    #[cfg(feature = "alloc")]
+    use alloc::vec::Vec;
+    use delegate::delegate;
+
+    /// This class models the PUS C telemetry packet. It is the primary data structure to generate the
+    /// raw byte representation of PUS telemetry or to deserialize from one from raw bytes.
+    ///
+    /// This class also derives the [serde::Serialize] and [serde::Deserialize] trait if the [serde]
+    /// feature is used which allows to send around TM packets in a raw byte format using a serde
+    /// provider like [postcard](https://docs.rs/postcard/latest/postcard/).
+    ///
+    /// There is no spare bytes support yet.
+    ///
+    /// # Lifetimes
+    ///
+    /// * `'raw_data` - If the TM is not constructed from a raw slice, this will be the life time of
+    ///    a buffer where the user provided time stamp and source data will be serialized into. If it
+    ///    is, this is the lifetime of the raw byte slice it is constructed from.
+    #[derive(Eq, Debug, Copy, Clone)]
+    #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+    pub struct PusTm<'raw_data> {
+        pub sp_header: SpHeader,
+        pub sec_header: PusTmSecondaryHeader<'raw_data>,
+        /// If this is set to false, a manual call to [PusTm::calc_own_crc16] or
+        /// [PusTm::update_packet_fields] is necessary for the serialized or cached CRC16 to be valid.
+        pub calc_crc_on_serialization: bool,
+        #[cfg_attr(feature = "serde", serde(skip))]
+        raw_data: Option<&'raw_data [u8]>,
+        source_data: &'raw_data [u8],
+        crc16: Option<u16>,
+    }
+
+    impl<'raw_data> PusTm<'raw_data> {
+        /// Generates a new struct instance.
+        ///
+        /// # Arguments
+        ///
+        /// * `sp_header` - Space packet header information. The correct packet type will be set
+        ///     automatically
+        /// * `sec_header` - Information contained in the secondary header, including the service
+        ///     and subservice type
+        /// * `app_data` - Custom application data
+        /// * `set_ccsds_len` - Can be used to automatically update the CCSDS space packet data length
+        ///     field. If this is not set to true, [PusTm::update_ccsds_data_len] can be called to set
+        ///     the correct value to this field manually
+        #[deprecated(
+            since = "0.7.0",
+            note = "Use specialized PusTmCreator or PusTmReader classes instead"
+        )]
+        pub fn new(
+            sp_header: &mut SpHeader,
+            sec_header: PusTmSecondaryHeader<'raw_data>,
+            source_data: Option<&'raw_data [u8]>,
+            set_ccsds_len: bool,
+        ) -> Self {
+            sp_header.set_packet_type(PacketType::Tm);
+            sp_header.set_sec_header_flag();
+            let mut pus_tm = PusTm {
+                sp_header: *sp_header,
+                raw_data: None,
+                source_data: source_data.unwrap_or(&[]),
+                sec_header,
+                calc_crc_on_serialization: true,
+                crc16: None,
+            };
+            if set_ccsds_len {
+                pus_tm.update_ccsds_data_len();
+            }
+            pus_tm
+        }
+
+        pub fn timestamp(&self) -> &[u8] {
+            self.sec_header.timestamp
+        }
+
+        pub fn source_data(&self) -> &[u8] {
+            self.source_data
+        }
+
+        pub fn set_dest_id(&mut self, dest_id: u16) {
+            self.sec_header.dest_id = dest_id;
+        }
+
+        pub fn set_msg_counter(&mut self, msg_counter: u16) {
+            self.sec_header.msg_counter = msg_counter
+        }
+
+        pub fn set_sc_time_ref_status(&mut self, sc_time_ref_status: u8) {
+            self.sec_header.sc_time_ref_status = sc_time_ref_status & 0b1111;
+        }
+
+        sp_header_impls!();
+
+        /// This is called automatically if the `set_ccsds_len` argument in the [PusTm::new] call was
+        /// used.
+        /// If this was not done or the time stamp or source data is set or changed after construction,
+        /// this function needs to be called to ensure that the data length field of the CCSDS header
+        /// is set correctly
+        pub fn update_ccsds_data_len(&mut self) {
+            self.sp_header.data_len =
+                self.len_written() as u16 - size_of::<crate::zc::SpHeader>() as u16 - 1;
+        }
+
+        /// This function should be called before the TM packet is serialized if
+        /// [PusTm.calc_crc_on_serialization] is set to False. It will calculate and cache the CRC16.
+        pub fn calc_own_crc16(&mut self) {
+            let mut digest = CRC_CCITT_FALSE.digest();
+            let sph_zc = crate::zc::SpHeader::from(self.sp_header);
+            digest.update(sph_zc.as_bytes());
+            let pus_tc_header =
+                zc::PusTmSecHeaderWithoutTimestamp::try_from(self.sec_header).unwrap();
+            digest.update(pus_tc_header.as_bytes());
+            digest.update(self.sec_header.timestamp);
+            digest.update(self.source_data);
+            self.crc16 = Some(digest.finalize())
+        }
+
+        /// This helper function calls both [PusTm.update_ccsds_data_len] and [PusTm.calc_own_crc16]
+        pub fn update_packet_fields(&mut self) {
+            self.update_ccsds_data_len();
+            self.calc_own_crc16();
+        }
+
+        /// Append the raw PUS byte representation to a provided [alloc::vec::Vec]
+        #[cfg(feature = "alloc")]
+        pub fn append_to_vec(&self, vec: &mut Vec<u8>) -> Result<usize, PusError> {
+            let sph_zc = crate::zc::SpHeader::from(self.sp_header);
+            let mut appended_len = PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA;
+            appended_len += self.sec_header.timestamp.len();
+            appended_len += self.source_data.len();
+            let start_idx = vec.len();
+            let mut ser_len = 0;
+            vec.extend_from_slice(sph_zc.as_bytes());
+            ser_len += sph_zc.as_bytes().len();
+            // The PUS version is hardcoded to PUS C
+            let sec_header = zc::PusTmSecHeaderWithoutTimestamp::try_from(self.sec_header).unwrap();
+            vec.extend_from_slice(sec_header.as_bytes());
+            ser_len += sec_header.as_bytes().len();
+            ser_len += self.sec_header.timestamp.len();
+            vec.extend_from_slice(self.sec_header.timestamp);
+            vec.extend_from_slice(self.source_data);
+            ser_len += self.source_data.len();
+            let crc16 = crc_procedure(
+                self.calc_crc_on_serialization,
+                &self.crc16,
+                start_idx,
+                ser_len,
+                &vec[start_idx..start_idx + ser_len],
+            )?;
+            vec.extend_from_slice(crc16.to_be_bytes().as_slice());
+            Ok(appended_len)
+        }
+
+        /// Create a [PusTm] instance from a raw slice. On success, it returns a tuple containing
+        /// the instance and the found byte length of the packet. The timestamp length needs to be
+        /// known beforehand.
+        #[deprecated(
+            since = "0.7.0",
+            note = "Use specialized PusTmCreator or PusTmReader classes instead"
+        )]
+        pub fn from_bytes(
+            slice: &'raw_data [u8],
+            timestamp_len: usize,
+        ) -> Result<(Self, usize), PusError> {
+            let raw_data_len = slice.len();
+            if raw_data_len < PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA {
+                return Err(ByteConversionError::FromSliceTooSmall {
+                    found: raw_data_len,
+                    expected: PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA,
+                }
+                .into());
+            }
+            let mut current_idx = 0;
+            let (sp_header, _) = SpHeader::from_be_bytes(&slice[0..CCSDS_HEADER_LEN])?;
+            current_idx += 6;
+            let total_len = sp_header.total_len();
+            if raw_data_len < total_len {
+                return Err(ByteConversionError::FromSliceTooSmall {
+                    found: raw_data_len,
+                    expected: PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA,
+                }
+                .into());
+            }
+            if total_len < PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA {
+                return Err(ByteConversionError::FromSliceTooSmall {
+                    found: total_len,
+                    expected: PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA,
+                }
+                .into());
+            }
+            let sec_header_zc = zc::PusTmSecHeaderWithoutTimestamp::from_bytes(
+                &slice[current_idx..current_idx + PUS_TM_MIN_SEC_HEADER_LEN],
+            )
+            .ok_or(ByteConversionError::ZeroCopyFromError)?;
+            current_idx += PUS_TM_MIN_SEC_HEADER_LEN;
+            let zc_sec_header_wrapper = zc::PusTmSecHeader {
+                zc_header: sec_header_zc,
+                timestamp: &slice[current_idx..current_idx + timestamp_len],
+            };
+            current_idx += timestamp_len;
+            let raw_data = &slice[0..total_len];
+            let pus_tm = PusTm {
+                sp_header,
+                sec_header: PusTmSecondaryHeader::try_from(zc_sec_header_wrapper).unwrap(),
+                raw_data: Some(&slice[0..total_len]),
+                source_data: user_data_from_raw(current_idx, total_len, slice)?,
+                calc_crc_on_serialization: false,
+                crc16: Some(crc_from_raw_data(raw_data)?),
+            };
+            verify_crc16_ccitt_false_from_raw_to_pus_error(
+                raw_data,
+                pus_tm.crc16.expect("CRC16 invalid"),
+            )?;
+            Ok((pus_tm, total_len))
+        }
+
+        /// If [Self] was constructed [Self::from_bytes], this function will return the slice it was
+        /// constructed from. Otherwise, [None] will be returned.
+        pub fn raw_bytes(&self) -> Option<&'raw_data [u8]> {
+            self.raw_data
+        }
+    }
+
+    impl WritablePusPacket for PusTm<'_> {
+        fn len_written(&self) -> usize {
+            PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA
+                + self.sec_header.timestamp.len()
+                + self.source_data.len()
+        }
+        /// Write the raw PUS byte representation to a provided buffer.
+        fn write_to_bytes(&self, slice: &mut [u8]) -> Result<usize, PusError> {
+            let mut curr_idx = 0;
+            let total_size = self.len_written();
+            if total_size > slice.len() {
+                return Err(ByteConversionError::ToSliceTooSmall {
+                    found: slice.len(),
+                    expected: total_size,
+                }
+                .into());
+            }
+            self.sp_header
+                .write_to_be_bytes(&mut slice[0..CCSDS_HEADER_LEN])?;
+            curr_idx += CCSDS_HEADER_LEN;
+            let sec_header_len = size_of::<zc::PusTmSecHeaderWithoutTimestamp>();
+            let sec_header = zc::PusTmSecHeaderWithoutTimestamp::try_from(self.sec_header).unwrap();
+            sec_header
+                .write_to_bytes(&mut slice[curr_idx..curr_idx + sec_header_len])
+                .ok_or(ByteConversionError::ZeroCopyToError)?;
+            curr_idx += sec_header_len;
+            slice[curr_idx..curr_idx + self.sec_header.timestamp.len()]
+                .copy_from_slice(self.sec_header.timestamp);
+            curr_idx += self.sec_header.timestamp.len();
+            slice[curr_idx..curr_idx + self.source_data.len()].copy_from_slice(self.source_data);
+            curr_idx += self.source_data.len();
+            let crc16 = crc_procedure(
+                self.calc_crc_on_serialization,
+                &self.crc16,
+                0,
+                curr_idx,
+                slice,
+            )?;
+            slice[curr_idx..curr_idx + 2].copy_from_slice(crc16.to_be_bytes().as_slice());
+            curr_idx += 2;
+            Ok(curr_idx)
+        }
+    }
+
+    impl PartialEq for PusTm<'_> {
+        fn eq(&self, other: &Self) -> bool {
+            self.sp_header == other.sp_header
+                && self.sec_header == other.sec_header
+                && self.source_data == other.source_data
+        }
+    }
+
+    impl CcsdsPacket for PusTm<'_> {
+        ccsds_impl!();
+    }
+
+    impl PusPacket for PusTm<'_> {
+        delegate!(to self.sec_header {
+            fn pus_version(&self) -> PusVersion;
+            fn service(&self) -> u8;
+            fn subservice(&self) -> u8;
+        });
+
+        fn user_data(&self) -> &[u8] {
+            self.source_data
+        }
+
+        fn crc16(&self) -> Option<u16> {
+            self.crc16
+        }
+    }
+
+    impl GenericPusTmSecondaryHeader for PusTm<'_> {
+        delegate!(to self.sec_header {
+            fn pus_version(&self) -> PusVersion;
+            fn service(&self) -> u8;
+            fn subservice(&self) -> u8;
+            fn dest_id(&self) -> u16;
+            fn msg_counter(&self) -> u16;
+            fn sc_time_ref_status(&self) -> u8;
+        });
+    }
+
+    impl IsPusTelemetry for PusTm<'_> {}
+}
+
 /// This class models the PUS C telemetry packet. It is the primary data structure to generate the
 /// raw byte representation of PUS telemetry.
 ///
@@ -211,18 +539,16 @@ impl<'slice> TryFrom<zc::PusTmSecHeader<'slice>> for PusTmSecondaryHeader<'slice
 /// * `'raw_data` - This is the lifetime of the user provided time stamp and source data.
 #[derive(Eq, Debug, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub struct PusTmCreator<'raw_data> {
-pub struct PusTmCreator<'time, 'raw_data> {
     pub sp_header: SpHeader,
-    #[cfg_attr(feature = "serde", serde(borrow))]
+    pub sec_header: PusTmSecondaryHeader<'raw_data>,
-    pub sec_header: PusTmSecondaryHeader<'time>,
     source_data: &'raw_data [u8],
-    /// If this is set to false, a manual call to [Self::calc_own_crc16] or
+    /// If this is set to false, a manual call to [PusTm::calc_own_crc16] or
-    /// [Self::update_packet_fields] is necessary for the serialized or cached CRC16 to be valid.
+    /// [PusTm::update_packet_fields] is necessary for the serialized or cached CRC16 to be valid.
     pub calc_crc_on_serialization: bool,
 }
 
-impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
+impl<'raw_data> PusTmCreator<'raw_data> {
     /// Generates a new struct instance.
     ///
     /// # Arguments
@@ -233,11 +559,11 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
     ///     and subservice type
     /// * `source_data` - Custom application data
     /// * `set_ccsds_len` - Can be used to automatically update the CCSDS space packet data length
-    ///     field. If this is not set to true, [Self::update_ccsds_data_len] can be called to set
+    ///     field. If this is not set to true, [PusTm::update_ccsds_data_len] can be called to set
     ///     the correct value to this field manually
     pub fn new(
         sp_header: &mut SpHeader,
-        sec_header: PusTmSecondaryHeader<'time>,
+        sec_header: PusTmSecondaryHeader<'raw_data>,
         source_data: &'raw_data [u8],
         set_ccsds_len: bool,
     ) -> Self {
@@ -260,7 +586,7 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
         service: u8,
         subservice: u8,
         time_provider: &impl TimeWriter,
-        stamp_buf: &'time mut [u8],
+        stamp_buf: &'raw_data mut [u8],
         source_data: Option<&'raw_data [u8]>,
         set_ccsds_len: bool,
     ) -> Result<Self, TimestampError> {
@@ -277,14 +603,14 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
 
     pub fn new_no_source_data(
         sp_header: &mut SpHeader,
-        sec_header: PusTmSecondaryHeader<'time>,
+        sec_header: PusTmSecondaryHeader<'raw_data>,
         set_ccsds_len: bool,
     ) -> Self {
         Self::new(sp_header, sec_header, &[], set_ccsds_len)
     }
 
     pub fn timestamp(&self) -> &[u8] {
-        self.sec_header.time_stamp
+        self.sec_header.timestamp
     }
 
     pub fn source_data(&self) -> &[u8] {
@@ -305,7 +631,7 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
 
     sp_header_impls!();
 
-    /// This is called automatically if the `set_ccsds_len` argument in the [Self::new] call was
+    /// This is called automatically if the `set_ccsds_len` argument in the [PusTm::new] call was
     /// used.
     /// If this was not done or the time stamp or source data is set or changed after construction,
     /// this function needs to be called to ensure that the data length field of the CCSDS header
@@ -316,19 +642,19 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
     }
 
     /// This function should be called before the TM packet is serialized if
-    /// [Self::calc_crc_on_serialization] is set to False. It will calculate and cache the CRC16.
+    /// [PusTm.calc_crc_on_serialization] is set to False. It will calculate and cache the CRC16.
     pub fn calc_own_crc16(&self) -> u16 {
         let mut digest = CRC_CCITT_FALSE.digest();
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
         digest.update(sph_zc.as_bytes());
         let pus_tc_header = zc::PusTmSecHeaderWithoutTimestamp::try_from(self.sec_header).unwrap();
         digest.update(pus_tc_header.as_bytes());
-        digest.update(self.sec_header.time_stamp);
+        digest.update(self.sec_header.timestamp);
         digest.update(self.source_data);
         digest.finalize()
     }
 
-    /// This helper function calls both [Self::update_ccsds_data_len] and [Self::calc_own_crc16]
+    /// This helper function calls both [PusTm.update_ccsds_data_len] and [PusTm.calc_own_crc16]
     pub fn update_packet_fields(&mut self) {
         self.update_ccsds_data_len();
     }
@@ -352,9 +678,9 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
             .write_to_bytes(&mut slice[curr_idx..curr_idx + sec_header_len])
             .ok_or(ByteConversionError::ZeroCopyToError)?;
         curr_idx += sec_header_len;
-        slice[curr_idx..curr_idx + self.sec_header.time_stamp.len()]
+        slice[curr_idx..curr_idx + self.sec_header.timestamp.len()]
-            .copy_from_slice(self.sec_header.time_stamp);
+            .copy_from_slice(self.sec_header.timestamp);
-        curr_idx += self.sec_header.time_stamp.len();
+        curr_idx += self.sec_header.timestamp.len();
         slice[curr_idx..curr_idx + self.source_data.len()].copy_from_slice(self.source_data);
         curr_idx += self.source_data.len();
         let mut digest = CRC_CCITT_FALSE.digest();
@@ -368,15 +694,14 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
     #[cfg(feature = "alloc")]
     pub fn append_to_vec(&self, vec: &mut Vec<u8>) -> Result<usize, PusError> {
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
-        let mut appended_len =
+        let mut appended_len = PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA + self.sec_header.timestamp.len();
-            PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA + self.sec_header.time_stamp.len();
         appended_len += self.source_data.len();
         let start_idx = vec.len();
         vec.extend_from_slice(sph_zc.as_bytes());
         // The PUS version is hardcoded to PUS C
         let sec_header = zc::PusTmSecHeaderWithoutTimestamp::try_from(self.sec_header).unwrap();
         vec.extend_from_slice(sec_header.as_bytes());
-        vec.extend_from_slice(self.sec_header.time_stamp);
+        vec.extend_from_slice(self.sec_header.timestamp);
         vec.extend_from_slice(self.source_data);
         let mut digest = CRC_CCITT_FALSE.digest();
         digest.update(&vec[start_idx..start_idx + appended_len - 2]);
@@ -385,10 +710,10 @@ impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
     }
 }
 
-impl WritablePusPacket for PusTmCreator<'_, '_> {
+impl WritablePusPacket for PusTmCreator<'_> {
     fn len_written(&self) -> usize {
         PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA
-            + self.sec_header.time_stamp.len()
+            + self.sec_header.timestamp.len()
             + self.source_data.len()
     }
     /// Write the raw PUS byte representation to a provided buffer.
@@ -397,7 +722,7 @@ impl WritablePusPacket for PusTmCreator<'_, '_> {
     }
 }
 
-impl PartialEq for PusTmCreator<'_, '_> {
+impl PartialEq for PusTmCreator<'_> {
     fn eq(&self, other: &Self) -> bool {
         self.sp_header == other.sp_header
             && self.sec_header == other.sec_header
@@ -405,11 +730,11 @@ impl PartialEq for PusTmCreator<'_, '_> {
     }
 }
 
-impl CcsdsPacket for PusTmCreator<'_, '_> {
+impl CcsdsPacket for PusTmCreator<'_> {
     ccsds_impl!();
 }
 
-impl PusPacket for PusTmCreator<'_, '_> {
+impl PusPacket for PusTmCreator<'_> {
     delegate!(to self.sec_header {
         fn pus_version(&self) -> PusVersion;
         fn service(&self) -> u8;
@@ -425,7 +750,7 @@ impl PusPacket for PusTmCreator<'_, '_> {
     }
 }
 
-impl GenericPusTmSecondaryHeader for PusTmCreator<'_, '_> {
+impl GenericPusTmSecondaryHeader for PusTmCreator<'_> {
     delegate!(to self.sec_header {
         fn pus_version(&self) -> PusVersion;
         fn service(&self) -> u8;
@@ -436,7 +761,7 @@ impl GenericPusTmSecondaryHeader for PusTmCreator<'_, '_> {
     });
 }
 
-impl IsPusTelemetry for PusTmCreator<'_, '_> {}
+impl IsPusTelemetry for PusTmCreator<'_> {}
 
 /// This class models the PUS C telemetry packet. It is the primary data structure to read
 /// a telemetry packet from raw bytes.
@@ -452,7 +777,6 @@ impl IsPusTelemetry for PusTmCreator<'_, '_> {}
 /// * `'raw_data` - Lifetime of the raw slice this class is constructed from.
 #[derive(Eq, Debug, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PusTmReader<'raw_data> {
     pub sp_header: SpHeader,
     pub sec_header: PusTmSecondaryHeader<'raw_data>,
@@ -527,7 +851,7 @@ impl<'raw_data> PusTmReader<'raw_data> {
     }
 
     pub fn timestamp(&self) -> &[u8] {
-        self.sec_header.time_stamp
+        self.sec_header.timestamp
     }
 
     /// This function will return the slice [Self] was constructed from.
@@ -578,15 +902,15 @@ impl GenericPusTmSecondaryHeader for PusTmReader<'_> {
 
 impl IsPusTelemetry for PusTmReader<'_> {}
 
-impl PartialEq<PusTmCreator<'_, '_>> for PusTmReader<'_> {
+impl PartialEq<PusTmCreator<'_>> for PusTmReader<'_> {
-    fn eq(&self, other: &PusTmCreator<'_, '_>) -> bool {
+    fn eq(&self, other: &PusTmCreator<'_>) -> bool {
         self.sp_header == other.sp_header
             && self.sec_header == other.sec_header
             && self.source_data == other.source_data
     }
 }
 
-impl PartialEq<PusTmReader<'_>> for PusTmCreator<'_, '_> {
+impl PartialEq<PusTmReader<'_>> for PusTmCreator<'_> {
     fn eq(&self, other: &PusTmReader<'_>) -> bool {
         self.sp_header == other.sp_header
             && self.sec_header == other.sec_header
@@ -798,7 +1122,7 @@ mod tests {
         PusTmCreator::new(&mut sph, tm_header, DUMMY_DATA, true)
     }
 
-    fn base_hk_reply<'a, 'b>(timestamp: &'a [u8], src_data: &'b [u8]) -> PusTmCreator<'a, 'b> {
+    fn base_hk_reply<'a>(timestamp: &'a [u8], src_data: &'a [u8]) -> PusTmCreator<'a> {
         let mut sph = SpHeader::tm_unseg(0x123, 0x234, 0).unwrap();
         let tc_header = PusTmSecondaryHeader::new_simple(3, 5, timestamp);
         PusTmCreator::new(&mut sph, tc_header, src_data, true)
@@ -1147,7 +1471,7 @@ mod tests {
     #[test]
     fn test_sec_header_without_stamp() {
         let sec_header = PusTmSecondaryHeader::new_simple_no_timestamp(17, 1);
-        assert_eq!(sec_header.time_stamp, &[]);
+        assert_eq!(sec_header.timestamp, &[]);
     }
 
     #[test]

src/lib.rs

@@ -36,11 +36,7 @@
 //! ### Optional features
 //!
 //!  - [`serde`](https://serde.rs/): Adds `serde` support for most types by adding `Serialize` and
-//!    `Deserialize` `derives.
+//!    `Deserialize` `derive`s
-//!  - [`chrono`](https://crates.io/crates/chrono): Add basic support for the `chrono` time library.
-//!  - [`timelib`](https://crates.io/crates/time): Add basic support for the `time` time library.
-//!  - [`defmt`](https://defmt.ferrous-systems.com/): Add support for the `defmt` by adding the
-//!    [`defmt::Format`](https://defmt.ferrous-systems.com/format) derive on many types.
 //!
 //! ## Module
 //!
@@ -59,7 +55,7 @@
 //! println!("{:x?}", &ccsds_buf[0..6]);
 //! ```
 #![no_std]
-#![cfg_attr(docs_rs, feature(doc_auto_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #[cfg(feature = "alloc")]
 extern crate alloc;
 #[cfg(any(feature = "std", test))]
@@ -97,7 +93,6 @@ pub const MAX_SEQ_COUNT: u16 = 2u16.pow(14) - 1;
 /// Generic error type when converting to and from raw byte slices.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum ByteConversionError {
     /// The passed slice is too small. Returns the passed slice length and expected minimum size
     ToSliceTooSmall {
@@ -147,7 +142,6 @@ impl Error for ByteConversionError {}
 /// CCSDS packet type enumeration.
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum PacketType {
     Tm = 0,
     Tc = 1,
@@ -171,7 +165,6 @@ pub fn packet_type_in_raw_packet_id(packet_id: u16) -> PacketType {
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum SequenceFlags {
     ContinuationSegment = 0b00,
     FirstSegment = 0b01,
@@ -199,7 +192,6 @@ impl TryFrom<u8> for SequenceFlags {
 /// of the first two bytes in the CCSDS primary header.
 #[derive(Debug, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PacketId {
     pub ptype: PacketType,
     pub sec_header_flag: bool,
@@ -311,7 +303,6 @@ impl From<u16> for PacketId {
 /// third and the fourth byte in the CCSDS primary header.
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct PacketSequenceCtrl {
     pub seq_flags: SequenceFlags,
     seq_count: u16,
@@ -472,7 +463,6 @@ pub trait CcsdsPrimaryHeader {
 /// * `data_len` - Data length field occupies the fifth and the sixth byte of the raw header
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct SpHeader {
     pub version: u8,
     pub packet_id: PacketId,
@@ -808,7 +798,7 @@ pub(crate) mod tests {
         let id_default = PacketId::default();
         assert_eq!(id_default.ptype, PacketType::Tm);
         assert_eq!(id_default.apid, 0x000);
-        assert!(!id_default.sec_header_flag);
+        assert_eq!(id_default.sec_header_flag, false);
     }
 
     #[test]
@@ -818,7 +808,7 @@ pub(crate) mod tests {
         let packet_id = packet_id.unwrap();
         assert_eq!(packet_id.apid(), 0x1ff);
         assert_eq!(packet_id.ptype, PacketType::Tc);
-        assert!(packet_id.sec_header_flag);
+        assert_eq!(packet_id.sec_header_flag, true);
         let packet_id_tc = PacketId::tc(true, 0x1ff);
         assert!(packet_id_tc.is_some());
         let packet_id_tc = packet_id_tc.unwrap();

src/time/cds.rs

@@ -78,7 +78,6 @@ impl ProvidesDaysLength for DaysLen24Bits {
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum LengthOfDaySegment {
     Short16Bits = 0,
     Long24Bits = 1,
@@ -95,7 +94,6 @@ pub enum SubmillisPrecision {
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum CdsError {
     /// CCSDS days value exceeds maximum allowed size or is negative
     InvalidCcsdsDays(i64),

src/time/cuc.rs

@@ -37,7 +37,6 @@ pub const MAX_CUC_LEN_SMALL_PREAMBLE: usize = 8;
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum FractionalResolution {
     /// No fractional part, only second resolution
     Seconds = 0,
@@ -106,7 +105,6 @@ pub fn fractional_part_from_subsec_ns(res: FractionalResolution, ns: u64) -> Fra
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum CucError {
     InvalidCounterWidth(u8),
     /// Invalid counter supplied.
@@ -1385,8 +1383,9 @@ mod tests {
     #[test]
     fn from_unix_stamp() {
         let unix_stamp = UnixTime::new(0, 0);
-        let cuc = CucTime::from_unix_time(&unix_stamp, FractionalResolution::Seconds, LEAP_SECONDS)
+        let cuc =
-            .expect("failed to create cuc from unix stamp");
+            CucTime::from_unix_time(&unix_stamp, FractionalResolution::Seconds, LEAP_SECONDS)
+                .expect("failed to create cuc from unix stamp");
         assert_eq!(
             cuc.counter(),
             (-DAYS_CCSDS_TO_UNIX * SECONDS_PER_DAY as i32) as u32 + LEAP_SECONDS

src/time/mod.rs

@@ -33,7 +33,6 @@ pub const NANOS_PER_SECOND: u32 = 1_000_000_000;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum CcsdsTimeCode {
     CucCcsdsEpoch = 0b001,
     CucAgencyEpoch = 0b010,
@@ -66,7 +65,6 @@ pub fn ccsds_time_code_from_p_field(pfield: u8) -> Result<CcsdsTimeCode, u8> {
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct DateBeforeCcsdsEpochError(UnixTime);
 
 impl Display for DateBeforeCcsdsEpochError {
@@ -80,7 +78,6 @@ impl Error for DateBeforeCcsdsEpochError {}
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[non_exhaustive]
 pub enum TimestampError {
     InvalidTimeCode { expected: CcsdsTimeCode, found: u8 },
@@ -265,7 +262,6 @@ pub trait CcsdsTimeProvider {
 /// similarly to other common time formats and libraries.
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct UnixTime {
     secs: i64,
     subsec_nanos: u32,

src/util.rs

@@ -131,7 +131,6 @@ impl Error for UnsignedByteFieldError {}
 /// Type erased variant.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct UnsignedByteField {
     width: usize,
     value: u64,
@@ -221,7 +220,6 @@ impl UnsignedEnum for UnsignedByteField {
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct GenericUnsignedByteField<TYPE: Copy + Into<u64>> {
     value: TYPE,
 }