Merge pull request 'prepare next release candidate' (#78) from prep_v0.11.0-rc.1 into main

Reviewed-on: #78

CHANGELOG.md

@@ -8,6 +8,60 @@ 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.
+
+## Fixed
+
+- CUC timestamp was fixed to include leap second corrections because it is based on the TAI
+  time reference. The default CUC time object do not implement `CcsdsTimeProvider` anymore
+  because the trait methods require cached leap second information. This task is now performed
+  by the `cuc::CucTimeWithLeapSecs` which implements the trait.
+
+## Added
+
+- `From<$EcssEnum$TY> from $TY` for the ECSS enum type definitions.
+- 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`
+- Renamed `cuc::TimeProviderCcsdsEpoch` to `cuc::CucTime`
+- `UnixTimestamp` renamed to `UnixTime`
+- `UnixTime` seconds are now private and can be retrieved using the `secs` member method.
+- `UnixTime::new` renamed to `UnixTime::new_checked`.
+- `UnixTime::secs` renamed to `UnixTime::as_secs`.
+- `UnixTime` now has a nanosecond subsecond precision. The `new` constructor now expects
+   nanoseconds as the second argument.
+- Added new `UnixTime::new_subsec_millis` and `UnixTime::new_subsec_millis_checked` API
+  to still allow creating a timestamp with only millisecond subsecond resolution.
+- `CcsdsTimeProvider` now has a new `subsec_nanos` method in addition to a default
+  implementation for the `subsec_millis` method.
+- `CcsdsTimeProvider::date_time` renamed to `CcsdsTimeProvider::chrono_date_time`.
+- Added `UnixTime::MIN`, `UnixTime::MAX` and `UnixTime::EPOCH`.
+- Added `UnixTime::timelib_date_time`.
+- 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.0"
+version = "0.11.0-rc.1"
 edition = "2021"
 rust-version = "1.61"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
@@ -34,23 +34,37 @@ optional = true
 default-features = false
 features = ["derive"]
 
+[dependencies.time]
+version = "0.3"
+default-features = false
+optional = true
+
 [dependencies.chrono]
 version = "0.4"
 default-features = false
+optional = true
 
 [dependencies.num-traits]
 version = "0.2"
 default-features = false
 
-[dev-dependencies.postcard]
-version = "1"
+[dependencies.defmt]
+version = "0.3"
+optional = true
+
+[dev-dependencies]
+postcard = "1"
+chrono = "0.4"
 
 [features]
 default = ["std"]
 std = ["chrono/std", "chrono/clock", "alloc", "thiserror"]
 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", "doc_cfg", "--generate-link-to-definition"]
+rustdoc-args = ["--cfg", "docs_rs", "--generate-link-to-definition"]

README.md

@@ -43,6 +43,10 @@ deserializing them with an appropriate `serde` provider like
 ## Optional Features
 
  - [`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 'rustdocflags=["--cfg", "doc_cfg"]' --open`.
+   `cargo +nightly doc --all-features --config 'build.rustdocflags=["--cfg", "docs_rs"]' --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`.
+4. Run `cargo test --all-features` or `cargo nextest r --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,6 +20,7 @@ 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
@@ -88,7 +89,6 @@ impl<'data> Lv<'data> {
     /// Helper function to build a string LV. This is especially useful for the file or directory
     /// path LVs
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
     pub fn new_from_string(string: &'data String) -> Result<Lv<'data>, TlvLvError> {
         Self::new(string.as_bytes())
     }

src/cfdp/mod.rs

@@ -18,6 +18,7 @@ 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,
@@ -26,6 +27,7 @@ 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,
@@ -34,6 +36,7 @@ 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,
@@ -42,6 +45,7 @@ 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,
@@ -69,6 +73,7 @@ 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,
@@ -78,6 +83,7 @@ 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,
@@ -86,6 +92,7 @@ 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,
@@ -96,6 +103,7 @@ 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
@@ -118,6 +126,7 @@ 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
@@ -129,6 +138,7 @@ 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
@@ -146,6 +156,7 @@ 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
@@ -167,6 +178,7 @@ 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,6 +15,7 @@ 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,6 +15,7 @@ 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,6 +14,7 @@ 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,
@@ -22,6 +23,7 @@ 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,
@@ -34,6 +36,7 @@ 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,
@@ -219,6 +222,7 @@ 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,6 +15,7 @@ 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,
@@ -55,6 +56,7 @@ 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,
@@ -241,6 +243,7 @@ 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,6 +18,7 @@ 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,
@@ -220,6 +221,7 @@ 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,
@@ -358,6 +360,7 @@ 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,6 +12,7 @@ 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)]),
@@ -31,6 +32,7 @@ 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,
@@ -353,6 +355,7 @@ 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,6 +52,7 @@ 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,
@@ -64,6 +65,7 @@ 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),
@@ -71,6 +73,7 @@ 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,
@@ -118,6 +121,7 @@ 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))]
@@ -224,6 +228,7 @@ 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,
 }
@@ -348,6 +353,7 @@ 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))]
@@ -561,6 +567,7 @@ 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,6 +5,7 @@ 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,6 +74,7 @@ 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,
@@ -150,6 +151,7 @@ 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),
@@ -205,13 +207,12 @@ pub trait PusPacket: CcsdsPacket {
     fn crc16(&self) -> Option<u16>;
 }
 
-pub(crate) fn crc_from_raw_data(raw_data: &[u8]) -> Result<u16, PusError> {
+pub(crate) fn crc_from_raw_data(raw_data: &[u8]) -> Result<u16, ByteConversionError> {
     if raw_data.len() < 2 {
         return Err(ByteConversionError::FromSliceTooSmall {
             found: raw_data.len(),
             expected: 2,
-        }
-        .into());
+        });
     }
     Ok(u16::from_be_bytes(
         raw_data[raw_data.len() - 2..raw_data.len()]
@@ -226,35 +227,16 @@ 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,
     slice: &[u8],
-) -> Result<&[u8], PusError> {
+) -> Result<&[u8], ByteConversionError> {
     match current_idx {
         _ if current_idx > total_len - 2 => Err(ByteConversionError::FromSliceTooSmall {
             found: total_len - 2,
             expected: current_idx,
-        }
-        .into()),
+        }),
         _ => Ok(&slice[current_idx..total_len - 2]),
     }
 }
@@ -360,14 +342,20 @@ impl<TYPE: Debug + Copy + Clone + PartialEq + Eq + ToBeBytes + Into<u64>> EcssEn
 {
 }
 
+impl<T: Copy + Into<u64>> From<T> for GenericEcssEnumWrapper<T> {
+    fn from(value: T) -> Self {
+        Self::new(value)
+    }
+}
+
 macro_rules! generic_ecss_enum_typedefs_and_from_impls {
     ($($ty:ty => $Enum:ident),*) => {
         $(
             pub type $Enum = GenericEcssEnumWrapper<$ty>;
 
-            impl From<$ty> for $Enum {
-                fn from(value: $ty) -> Self {
-                    Self::new(value)
+            impl From<$Enum> for $ty {
+                fn from(value: $Enum) -> Self {
+                    value.value_typed()
                 }
             }
         )*
@@ -424,6 +412,8 @@ mod tests {
         assert_eq!(buf[1], 1);
         assert_eq!(my_enum.value(), 1);
         assert_eq!(my_enum.value_typed(), 1);
+        let enum_as_u8: u8 = my_enum.into();
+        assert_eq!(enum_as_u8, 1);
         let vec = my_enum.to_vec();
         assert_eq!(vec, buf[1..2]);
     }
@@ -441,6 +431,8 @@ mod tests {
         assert_eq!(buf[2], 0x2f);
         assert_eq!(my_enum.value(), 0x1f2f);
         assert_eq!(my_enum.value_typed(), 0x1f2f);
+        let enum_as_raw: u16 = my_enum.into();
+        assert_eq!(enum_as_raw, 0x1f2f);
         let vec = my_enum.to_vec();
         assert_eq!(vec, buf[1..3]);
     }
@@ -476,6 +468,8 @@ mod tests {
         assert_eq!(buf[4], 0x4f);
         assert_eq!(my_enum.value(), 0x1f2f3f4f);
         assert_eq!(my_enum.value_typed(), 0x1f2f3f4f);
+        let enum_as_raw: u32 = my_enum.into();
+        assert_eq!(enum_as_raw, 0x1f2f3f4f);
         let vec = my_enum.to_vec();
         assert_eq!(vec, buf[1..5]);
     }
@@ -512,6 +506,8 @@ mod tests {
         assert_eq!(buf[7], 0x5f);
         assert_eq!(my_enum.value(), 0x1f2f3f4f5f);
         assert_eq!(my_enum.value_typed(), 0x1f2f3f4f5f);
+        let enum_as_raw: u64 = my_enum.into();
+        assert_eq!(enum_as_raw, 0x1f2f3f4f5f);
         assert_eq!(u64::from_be_bytes(buf), 0x1f2f3f4f5f);
         let vec = my_enum.to_vec();
         assert_eq!(vec, buf);

src/ecss/tc.rs

@@ -48,8 +48,6 @@ 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 =
@@ -61,6 +59,7 @@ 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,
@@ -146,6 +145,7 @@ 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,333 +212,6 @@ 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")]
-        #[cfg_attr(doc_cfg, doc(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.
 ///
@@ -549,6 +222,7 @@ pub mod legacy_tc {
 /// 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,
@@ -566,7 +240,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, [PusTc::update_ccsds_data_len] can be called to set
+    ///     field. If this is not set to true, [Self::update_ccsds_data_len] can be called to set
     ///     the correct value to this field manually
     pub fn new(
         sp_header: &mut SpHeader,
@@ -587,19 +261,19 @@ impl<'raw_data> PusTcCreator<'raw_data> {
         pus_tc
     }
 
-    /// Simplified version of the [PusTcCreator::new] function which allows to only specify service
+    /// Simplified version of the [Self::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: Option<&'raw_data [u8]>,
+        app_data: &'raw_data [u8],
         set_ccsds_len: bool,
     ) -> Self {
         Self::new(
             sph,
             PusTcSecondaryHeader::new(service, subservice, ACK_ALL, 0),
-            app_data.unwrap_or(&[]),
+            app_data,
             set_ccsds_len,
         )
     }
@@ -631,7 +305,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 [PusTc::new] call was
+    /// This is called automatically if the `set_ccsds_len` argument in the [Self::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
@@ -641,8 +315,7 @@ impl<'raw_data> PusTcCreator<'raw_data> {
             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.
+    /// This function calculates and returns the CRC16 for the current packet.
     pub fn calc_own_crc16(&self) -> u16 {
         let mut digest = CRC_CCITT_FALSE.digest();
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
@@ -654,8 +327,7 @@ impl<'raw_data> PusTcCreator<'raw_data> {
     }
 
     #[cfg(feature = "alloc")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
-    pub fn append_to_vec(&self, vec: &mut Vec<u8>) -> Result<usize, PusError> {
+    pub fn append_to_vec(&self, vec: &mut Vec<u8>) -> usize {
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
         let mut appended_len = PUS_TC_MIN_LEN_WITHOUT_APP_DATA;
         appended_len += self.app_data.len();
@@ -668,7 +340,7 @@ impl<'raw_data> PusTcCreator<'raw_data> {
         let mut digest = CRC_CCITT_FALSE.digest();
         digest.update(&vec[start_idx..start_idx + appended_len - 2]);
         vec.extend_from_slice(&digest.finalize().to_be_bytes());
-        Ok(appended_len)
+        appended_len
     }
 }
 
@@ -752,6 +424,7 @@ 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],
@@ -763,7 +436,8 @@ pub struct PusTcReader<'raw_data> {
 
 impl<'raw_data> PusTcReader<'raw_data> {
     /// Create a [PusTcReader] instance from a raw slice. On success, it returns a tuple containing
-    /// the instance and the found byte length of the packet.
+    /// the instance and the found byte length of the packet. This function also performs a CRC
+    /// check and will return an appropriate [PusError] if the check fails.
     pub fn new(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 {
@@ -901,12 +575,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, None, true)
+        PusTcCreator::new_simple(&mut sph, 17, 1, &[], 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, Some(app_data), true)
+        PusTcCreator::new_simple(&mut sph, 17, 1, app_data, true)
     }
 
     #[test]
@@ -963,7 +637,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, None, false);
+        let mut tc = PusTcCreator::new_simple(&mut sph, 17, 1, &[], false);
         assert_eq!(tc.data_len(), 0);
         tc.update_ccsds_data_len();
         assert_eq!(tc.data_len(), 6);
@@ -1010,9 +684,7 @@ mod tests {
     fn test_vec_ser_deser() {
         let pus_tc = base_ping_tc_simple_ctor();
         let mut test_vec = Vec::new();
-        let size = pus_tc
-            .append_to_vec(&mut test_vec)
-            .expect("Error writing TC to vector");
+        let size = pus_tc.append_to_vec(&mut test_vec);
         assert_eq!(size, 13);
         verify_test_tc_raw(&test_vec.as_slice());
         verify_crc_no_app_data(&test_vec.as_slice());
@@ -1058,9 +730,7 @@ mod tests {
         let pus_tc = base_ping_tc_simple_ctor_with_app_data(&[1, 2, 3]);
         verify_test_tc(&pus_tc, true, 16);
         let mut test_vec = Vec::new();
-        let size = pus_tc
-            .append_to_vec(&mut test_vec)
-            .expect("Error writing TC to vector");
+        let size = pus_tc.append_to_vec(&mut test_vec);
         assert_eq!(test_vec[11], 1);
         assert_eq!(test_vec[12], 2);
         assert_eq!(test_vec[13], 3);

src/ecss/tm.rs

@@ -19,7 +19,6 @@ use alloc::vec::Vec;
 use delegate::delegate;
 
 use crate::time::{TimeWriter, TimestampError};
-pub use legacy_tm::*;
 
 use self::zc::PusTmSecHeaderWithoutTimestamp;
 
@@ -116,6 +115,7 @@ 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 timestamp: &'stamp [u8],
+    pub time_stamp: &'stamp [u8],
 }
 
 impl<'stamp> PusTmSecondaryHeader<'stamp> {
-    pub fn new_simple(service: u8, subservice: u8, timestamp: &'stamp [u8]) -> Self {
-        Self::new(service, subservice, 0, 0, Some(timestamp))
+    pub fn new_simple(service: u8, subservice: u8, time_stamp: &'stamp [u8]) -> Self {
+        Self::new(service, subservice, 0, 0, time_stamp)
     }
 
     /// 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, None)
+        Self::new(service, subservice, 0, 0, &[])
     }
 
     pub fn new(
@@ -141,7 +141,7 @@ impl<'stamp> PusTmSecondaryHeader<'stamp> {
         subservice: u8,
         msg_counter: u16,
         dest_id: u16,
-        timestamp: Option<&'stamp [u8]>,
+        time_stamp: &'stamp [u8],
     ) -> Self {
         PusTmSecondaryHeader {
             pus_version: PusVersion::PusC,
@@ -150,7 +150,7 @@ impl<'stamp> PusTmSecondaryHeader<'stamp> {
             subservice,
             msg_counter,
             dest_id,
-            timestamp: timestamp.unwrap_or(&[]),
+            time_stamp,
         }
     }
 }
@@ -192,340 +192,11 @@ 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(),
-            timestamp: sec_header.timestamp,
+            time_stamp: 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")]
-        #[cfg_attr(doc_cfg, doc(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.
 ///
@@ -540,16 +211,18 @@ pub mod legacy_tm {
 /// * `'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))]
-pub struct PusTmCreator<'raw_data> {
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub struct PusTmCreator<'time, 'raw_data> {
     pub sp_header: SpHeader,
-    pub sec_header: PusTmSecondaryHeader<'raw_data>,
+    #[cfg_attr(feature = "serde", serde(borrow))]
+    pub sec_header: PusTmSecondaryHeader<'time>,
     source_data: &'raw_data [u8],
-    /// 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.
+    /// If this is set to false, a manual call to [Self::calc_own_crc16] or
+    /// [Self::update_packet_fields] is necessary for the serialized or cached CRC16 to be valid.
     pub calc_crc_on_serialization: bool,
 }
 
-impl<'raw_data> PusTmCreator<'raw_data> {
+impl<'time, 'raw_data> PusTmCreator<'time, 'raw_data> {
     /// Generates a new struct instance.
     ///
     /// # Arguments
@@ -560,11 +233,11 @@ impl<'raw_data> PusTmCreator<'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, [PusTm::update_ccsds_data_len] can be called to set
+    ///     field. If this is not set to true, [Self::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<'raw_data>,
+        sec_header: PusTmSecondaryHeader<'time>,
         source_data: &'raw_data [u8],
         set_ccsds_len: bool,
     ) -> Self {
@@ -587,7 +260,7 @@ impl<'raw_data> PusTmCreator<'raw_data> {
         service: u8,
         subservice: u8,
         time_provider: &impl TimeWriter,
-        stamp_buf: &'raw_data mut [u8],
+        stamp_buf: &'time mut [u8],
         source_data: Option<&'raw_data [u8]>,
         set_ccsds_len: bool,
     ) -> Result<Self, TimestampError> {
@@ -604,14 +277,14 @@ impl<'raw_data> PusTmCreator<'raw_data> {
 
     pub fn new_no_source_data(
         sp_header: &mut SpHeader,
-        sec_header: PusTmSecondaryHeader<'raw_data>,
+        sec_header: PusTmSecondaryHeader<'time>,
         set_ccsds_len: bool,
     ) -> Self {
         Self::new(sp_header, sec_header, &[], set_ccsds_len)
     }
 
     pub fn timestamp(&self) -> &[u8] {
-        self.sec_header.timestamp
+        self.sec_header.time_stamp
     }
 
     pub fn source_data(&self) -> &[u8] {
@@ -632,7 +305,7 @@ impl<'raw_data> PusTmCreator<'raw_data> {
 
     sp_header_impls!();
 
-    /// This is called automatically if the `set_ccsds_len` argument in the [PusTm::new] call was
+    /// This is called automatically if the `set_ccsds_len` argument in the [Self::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
@@ -643,60 +316,32 @@ impl<'raw_data> PusTmCreator<'raw_data> {
     }
 
     /// 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.
+    /// [Self::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.timestamp);
+        digest.update(self.sec_header.time_stamp);
         digest.update(self.source_data);
         digest.finalize()
     }
 
-    /// This helper function calls both [PusTm.update_ccsds_data_len] and [PusTm.calc_own_crc16]
+    /// This helper function calls both [Self::update_ccsds_data_len] and [Self::calc_own_crc16]
     pub fn update_packet_fields(&mut self) {
         self.update_ccsds_data_len();
     }
 
-    /// Append the raw PUS byte representation to a provided [alloc::vec::Vec]
-    #[cfg(feature = "alloc")]
-    #[cfg_attr(doc_cfg, doc(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 + self.sec_header.timestamp.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.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]);
-        vec.extend_from_slice(&digest.finalize().to_be_bytes());
-        Ok(appended_len)
-    }
-}
-
-impl WritablePusPacket for PusTmCreator<'_> {
-    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> {
+    pub fn write_to_bytes(&self, slice: &mut [u8]) -> Result<usize, ByteConversionError> {
         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])?;
@@ -707,9 +352,9 @@ impl WritablePusPacket for PusTmCreator<'_> {
             .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.sec_header.time_stamp.len()]
+            .copy_from_slice(self.sec_header.time_stamp);
+        curr_idx += self.sec_header.time_stamp.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();
@@ -718,9 +363,41 @@ impl WritablePusPacket for PusTmCreator<'_> {
         curr_idx += 2;
         Ok(curr_idx)
     }
+
+    /// 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 + 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.source_data);
+        let mut digest = CRC_CCITT_FALSE.digest();
+        digest.update(&vec[start_idx..start_idx + appended_len - 2]);
+        vec.extend_from_slice(&digest.finalize().to_be_bytes());
+        Ok(appended_len)
+    }
 }
 
-impl PartialEq 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.source_data.len()
+    }
+    /// Write the raw PUS byte representation to a provided buffer.
+    fn write_to_bytes(&self, slice: &mut [u8]) -> Result<usize, PusError> {
+        Ok(Self::write_to_bytes(self, slice)?)
+    }
+}
+
+impl PartialEq for PusTmCreator<'_, '_> {
     fn eq(&self, other: &Self) -> bool {
         self.sp_header == other.sp_header
             && self.sec_header == other.sec_header
@@ -728,11 +405,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;
@@ -748,7 +425,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;
@@ -759,7 +436,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.
@@ -775,6 +452,7 @@ 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>,
@@ -788,6 +466,9 @@ impl<'raw_data> PusTmReader<'raw_data> {
     /// Create a [PusTmReader] 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.
+    ///
+    /// This function will check the CRC-16 of the PUS packet and will return an appropriate
+    /// [PusError] if the check fails.
     pub fn new(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 {
@@ -846,7 +527,7 @@ impl<'raw_data> PusTmReader<'raw_data> {
     }
 
     pub fn timestamp(&self) -> &[u8] {
-        self.sec_header.timestamp
+        self.sec_header.time_stamp
     }
 
     /// This function will return the slice [Self] was constructed from.
@@ -897,15 +578,15 @@ impl GenericPusTmSecondaryHeader for PusTmReader<'_> {
 
 impl IsPusTelemetry for PusTmReader<'_> {}
 
-impl PartialEq<PusTmCreator<'_>> for PusTmReader<'_> {
-    fn eq(&self, other: &PusTmCreator<'_>) -> bool {
+impl PartialEq<PusTmCreator<'_, '_>> for PusTmReader<'_> {
+    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
@@ -1097,7 +778,7 @@ mod tests {
 
     use super::*;
     use crate::ecss::PusVersion::PusC;
-    use crate::time::cds::TimeProvider;
+    use crate::time::cds::CdsTime;
     #[cfg(feature = "serde")]
     use crate::time::CcsdsTimeProvider;
     use crate::SpHeader;
@@ -1117,7 +798,7 @@ mod tests {
         PusTmCreator::new(&mut sph, tm_header, DUMMY_DATA, true)
     }
 
-    fn base_hk_reply<'a>(timestamp: &'a [u8], src_data: &'a [u8]) -> PusTmCreator<'a> {
+    fn base_hk_reply<'a, 'b>(timestamp: &'a [u8], src_data: &'b [u8]) -> PusTmCreator<'a, 'b> {
         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)
@@ -1136,7 +817,7 @@ mod tests {
     #[test]
     fn test_basic_simple_api() {
         let mut sph = SpHeader::tm_unseg(0x123, 0x234, 0).unwrap();
-        let time_provider = TimeProvider::new_with_u16_days(0, 0);
+        let time_provider = CdsTime::new_with_u16_days(0, 0);
         let mut stamp_buf: [u8; 8] = [0; 8];
         let pus_tm =
             PusTmCreator::new_simple(&mut sph, 17, 2, &time_provider, &mut stamp_buf, None, true)
@@ -1260,18 +941,11 @@ mod tests {
         let res = pus_tm.write_to_bytes(&mut buf);
         assert!(res.is_err());
         let error = res.unwrap_err();
-        assert!(matches!(error, PusError::ByteConversion { .. }));
-        match error {
-            PusError::ByteConversion(err) => match err {
-                ByteConversionError::ToSliceTooSmall { found, expected } => {
-                    assert_eq!(expected, 22);
-                    assert_eq!(found, 16);
-                }
-                _ => panic!("Invalid PUS error {:?}", err),
-            },
-            _ => {
-                panic!("Invalid error {:?}", error);
-            }
+        if let ByteConversionError::ToSliceTooSmall { found, expected } = error {
+            assert_eq!(expected, 22);
+            assert_eq!(found, 16);
+        } else {
+            panic!("Invalid error {:?}", error);
         }
     }
 
@@ -1473,7 +1147,7 @@ mod tests {
     #[test]
     fn test_sec_header_without_stamp() {
         let sec_header = PusTmSecondaryHeader::new_simple_no_timestamp(17, 1);
-        assert_eq!(sec_header.timestamp, &[]);
+        assert_eq!(sec_header.time_stamp, &[]);
     }
 
     #[test]
@@ -1534,7 +1208,7 @@ mod tests {
     #[cfg(feature = "serde")]
     fn test_serialization_creator_serde() {
         let mut sph = SpHeader::tm_unseg(0x123, 0x234, 0).unwrap();
-        let time_provider = TimeProvider::new_with_u16_days(0, 0);
+        let time_provider = CdsTime::new_with_u16_days(0, 0);
         let mut stamp_buf: [u8; 8] = [0; 8];
         let pus_tm =
             PusTmCreator::new_simple(&mut sph, 17, 2, &time_provider, &mut stamp_buf, None, true)
@@ -1549,7 +1223,7 @@ mod tests {
     #[cfg(feature = "serde")]
     fn test_serialization_reader_serde() {
         let mut sph = SpHeader::tm_unseg(0x123, 0x234, 0).unwrap();
-        let time_provider = TimeProvider::new_with_u16_days(0, 0);
+        let time_provider = CdsTime::new_with_u16_days(0, 0);
         let mut stamp_buf: [u8; 8] = [0; 8];
         let pus_tm =
             PusTmCreator::new_simple(&mut sph, 17, 2, &time_provider, &mut stamp_buf, None, true)

src/lib.rs

@@ -36,7 +36,11 @@
 //! ### Optional features
 //!
 //!  - [`serde`](https://serde.rs/): Adds `serde` support for most types by adding `Serialize` and
-//!    `Deserialize` `derive`s
+//!    `Deserialize` `derives.
+//!  - [`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
 //!
@@ -55,7 +59,7 @@
 //! println!("{:x?}", &ccsds_buf[0..6]);
 //! ```
 #![no_std]
-#![cfg_attr(doc_cfg, feature(doc_cfg))]
+#![cfg_attr(docs_rs, feature(doc_auto_cfg))]
 #[cfg(feature = "alloc")]
 extern crate alloc;
 #[cfg(any(feature = "std", test))]
@@ -93,6 +97,7 @@ 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 {
@@ -142,6 +147,7 @@ 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,
@@ -165,6 +171,7 @@ 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,
@@ -192,6 +199,7 @@ 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,
@@ -303,6 +311,7 @@ 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,
@@ -463,6 +472,7 @@ 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,
@@ -798,7 +808,7 @@ pub(crate) mod tests {
         let id_default = PacketId::default();
         assert_eq!(id_default.ptype, PacketType::Tm);
         assert_eq!(id_default.apid, 0x000);
-        assert_eq!(id_default.sec_header_flag, false);
+        assert!(!id_default.sec_header_flag);
     }
 
     #[test]
@@ -808,7 +818,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_eq!(packet_id.sec_header_flag, true);
+        assert!(packet_id.sec_header_flag);
         let packet_id_tc = PacketId::tc(true, 0x1ff);
         assert!(packet_id_tc.is_some());
         let packet_id_tc = packet_id_tc.unwrap();

src/time/ascii.rs

@@ -2,11 +2,8 @@
 //! [CCSDS 301.0-B-4](https://public.ccsds.org/Pubs/301x0b4e1.pdf) section 3.5 .
 //! See [chrono::DateTime::format] for a usage example of the generated
 //! [chrono::format::DelayedFormat] structs.
-#[cfg(feature = "alloc")]
-use chrono::{
-    format::{DelayedFormat, StrftimeItems},
-    DateTime, Utc,
-};
+#[cfg(all(feature = "alloc", feature = "chrono"))]
+pub use alloc_mod_chrono::*;
 
 /// Tuple of format string and formatted size for time code A.
 ///
@@ -34,36 +31,37 @@ pub const FMT_STR_CODE_B_WITH_SIZE: (&str, usize) = ("%Y-%jT%T%.3f", 21);
 /// Three digits are used for the decimal fraction and a terminator is added at the end.
 pub const FMT_STR_CODE_B_TERMINATED_WITH_SIZE: (&str, usize) = ("%Y-%jT%T%.3fZ", 22);
 
-/// Generates a time code formatter using the [FMT_STR_CODE_A_WITH_SIZE] format.
-#[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
-pub fn generate_time_code_a(date: &DateTime<Utc>) -> DelayedFormat<StrftimeItems<'static>> {
-    date.format(FMT_STR_CODE_A_WITH_SIZE.0)
-}
+#[cfg(all(feature = "alloc", feature = "chrono"))]
+pub mod alloc_mod_chrono {
+    use super::*;
+    use chrono::{
+        format::{DelayedFormat, StrftimeItems},
+        DateTime, Utc,
+    };
 
-/// Generates a time code formatter using the [FMT_STR_CODE_A_TERMINATED_WITH_SIZE] format.
-#[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
-pub fn generate_time_code_a_terminated(
-    date: &DateTime<Utc>,
-) -> DelayedFormat<StrftimeItems<'static>> {
-    date.format(FMT_STR_CODE_A_TERMINATED_WITH_SIZE.0)
-}
+    /// Generates a time code formatter using the [FMT_STR_CODE_A_WITH_SIZE] format.
+    pub fn generate_time_code_a(date: &DateTime<Utc>) -> DelayedFormat<StrftimeItems<'static>> {
+        date.format(FMT_STR_CODE_A_WITH_SIZE.0)
+    }
 
-/// Generates a time code formatter using the [FMT_STR_CODE_B_WITH_SIZE] format.
-#[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
-pub fn generate_time_code_b(date: &DateTime<Utc>) -> DelayedFormat<StrftimeItems<'static>> {
-    date.format(FMT_STR_CODE_B_WITH_SIZE.0)
-}
+    /// Generates a time code formatter using the [FMT_STR_CODE_A_TERMINATED_WITH_SIZE] format.
+    pub fn generate_time_code_a_terminated(
+        date: &DateTime<Utc>,
+    ) -> DelayedFormat<StrftimeItems<'static>> {
+        date.format(FMT_STR_CODE_A_TERMINATED_WITH_SIZE.0)
+    }
 
-/// Generates a time code formatter using the [FMT_STR_CODE_B_TERMINATED_WITH_SIZE] format.
-#[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
-pub fn generate_time_code_b_terminated(
-    date: &DateTime<Utc>,
-) -> DelayedFormat<StrftimeItems<'static>> {
-    date.format(FMT_STR_CODE_B_TERMINATED_WITH_SIZE.0)
+    /// Generates a time code formatter using the [FMT_STR_CODE_B_WITH_SIZE] format.
+    pub fn generate_time_code_b(date: &DateTime<Utc>) -> DelayedFormat<StrftimeItems<'static>> {
+        date.format(FMT_STR_CODE_B_WITH_SIZE.0)
+    }
+
+    /// Generates a time code formatter using the [FMT_STR_CODE_B_TERMINATED_WITH_SIZE] format.
+    pub fn generate_time_code_b_terminated(
+        date: &DateTime<Utc>,
+    ) -> DelayedFormat<StrftimeItems<'static>> {
+        date.format(FMT_STR_CODE_B_TERMINATED_WITH_SIZE.0)
+    }
 }
 
 #[cfg(test)]
@@ -77,7 +75,7 @@ mod tests {
         let date = Utc::now();
         let stamp_formatter = generate_time_code_a(&date);
         let stamp = format!("{}", stamp_formatter);
-        let t_sep = stamp.find("T");
+        let t_sep = stamp.find('T');
         assert!(t_sep.is_some());
         assert_eq!(t_sep.unwrap(), 10);
         assert_eq!(stamp.len(), FMT_STR_CODE_A_WITH_SIZE.1);
@@ -88,10 +86,10 @@ mod tests {
         let date = Utc::now();
         let stamp_formatter = generate_time_code_a_terminated(&date);
         let stamp = format!("{}", stamp_formatter);
-        let t_sep = stamp.find("T");
+        let t_sep = stamp.find('T');
         assert!(t_sep.is_some());
         assert_eq!(t_sep.unwrap(), 10);
-        let z_terminator = stamp.find("Z");
+        let z_terminator = stamp.find('Z');
         assert!(z_terminator.is_some());
         assert_eq!(
             z_terminator.unwrap(),
@@ -105,7 +103,7 @@ mod tests {
         let date = Utc::now();
         let stamp_formatter = generate_time_code_b(&date);
         let stamp = format!("{}", stamp_formatter);
-        let t_sep = stamp.find("T");
+        let t_sep = stamp.find('T');
         assert!(t_sep.is_some());
         assert_eq!(t_sep.unwrap(), 8);
         assert_eq!(stamp.len(), FMT_STR_CODE_B_WITH_SIZE.1);
@@ -116,10 +114,10 @@ mod tests {
         let date = Utc::now();
         let stamp_formatter = generate_time_code_b_terminated(&date);
         let stamp = format!("{}", stamp_formatter);
-        let t_sep = stamp.find("T");
+        let t_sep = stamp.find('T');
         assert!(t_sep.is_some());
         assert_eq!(t_sep.unwrap(), 8);
-        let z_terminator = stamp.find("Z");
+        let z_terminator = stamp.find('Z');
         assert!(z_terminator.is_some());
         assert_eq!(
             z_terminator.unwrap(),

src/time/mod.rs

@@ -1,6 +1,7 @@
 //! CCSDS Time Code Formats according to [CCSDS 301.0-B-4](https://public.ccsds.org/Pubs/301x0b4e1.pdf)
 use crate::ByteConversionError;
-use chrono::{DateTime, LocalResult, TimeZone, Utc};
+#[cfg(feature = "chrono")]
+use chrono::{TimeZone, Utc};
 use core::cmp::Ordering;
 use core::fmt::{Display, Formatter};
 use core::ops::{Add, AddAssign, Sub};
@@ -13,6 +14,7 @@ use num_traits::float::FloatCore;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
+
 #[cfg(feature = "std")]
 use std::error::Error;
 #[cfg(feature = "std")]
@@ -27,10 +29,12 @@ pub mod cuc;
 pub const DAYS_CCSDS_TO_UNIX: i32 = -4383;
 pub const SECONDS_PER_DAY: u32 = 86400;
 pub const MS_PER_DAY: u32 = SECONDS_PER_DAY * 1000;
+pub const NANOS_PER_SECOND: u32 = 1_000_000_000;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum CcsdsTimeCodes {
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub enum CcsdsTimeCode {
     CucCcsdsEpoch = 0b001,
     CucAgencyEpoch = 0b010,
     Cds = 0b100,
@@ -38,16 +42,16 @@ pub enum CcsdsTimeCodes {
     AgencyDefined = 0b110,
 }
 
-impl TryFrom<u8> for CcsdsTimeCodes {
+impl TryFrom<u8> for CcsdsTimeCode {
     type Error = ();
 
     fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
-            x if x == CcsdsTimeCodes::CucCcsdsEpoch as u8 => Ok(CcsdsTimeCodes::CucCcsdsEpoch),
-            x if x == CcsdsTimeCodes::CucAgencyEpoch as u8 => Ok(CcsdsTimeCodes::CucAgencyEpoch),
-            x if x == CcsdsTimeCodes::Cds as u8 => Ok(CcsdsTimeCodes::Cds),
-            x if x == CcsdsTimeCodes::Ccs as u8 => Ok(CcsdsTimeCodes::Ccs),
-            x if x == CcsdsTimeCodes::AgencyDefined as u8 => Ok(CcsdsTimeCodes::AgencyDefined),
+            x if x == CcsdsTimeCode::CucCcsdsEpoch as u8 => Ok(CcsdsTimeCode::CucCcsdsEpoch),
+            x if x == CcsdsTimeCode::CucAgencyEpoch as u8 => Ok(CcsdsTimeCode::CucAgencyEpoch),
+            x if x == CcsdsTimeCode::Cds as u8 => Ok(CcsdsTimeCode::Cds),
+            x if x == CcsdsTimeCode::Ccs as u8 => Ok(CcsdsTimeCode::Ccs),
+            x if x == CcsdsTimeCode::AgencyDefined as u8 => Ok(CcsdsTimeCode::AgencyDefined),
             _ => Err(()),
         }
     }
@@ -55,20 +59,34 @@ impl TryFrom<u8> for CcsdsTimeCodes {
 
 /// Retrieve the CCSDS time code from the p-field. If no valid time code identifier is found, the
 /// value of the raw time code identification field is returned.
-pub fn ccsds_time_code_from_p_field(pfield: u8) -> Result<CcsdsTimeCodes, u8> {
+pub fn ccsds_time_code_from_p_field(pfield: u8) -> Result<CcsdsTimeCode, u8> {
     let raw_bits = (pfield >> 4) & 0b111;
-    CcsdsTimeCodes::try_from(raw_bits).map_err(|_| raw_bits)
+    CcsdsTimeCode::try_from(raw_bits).map_err(|_| raw_bits)
 }
 
 #[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 {
+    fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
+        write!(f, "date before ccsds epoch: {:?}", self.0)
+    }
+}
+
+#[cfg(feature = "std")]
+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: CcsdsTimeCodes, found: u8 },
+    InvalidTimeCode { expected: CcsdsTimeCode, found: u8 },
     ByteConversion(ByteConversionError),
     Cds(cds::CdsError),
     Cuc(cuc::CucError),
-    DateBeforeCcsdsEpoch(DateTime<Utc>),
     CustomEpochNotSupported,
 }
 
@@ -90,9 +108,6 @@ impl Display for TimestampError {
             TimestampError::ByteConversion(e) => {
                 write!(f, "time stamp: {e}")
             }
-            TimestampError::DateBeforeCcsdsEpoch(e) => {
-                write!(f, "datetime with date before ccsds epoch: {e}")
-            }
             TimestampError::CustomEpochNotSupported => {
                 write!(f, "custom epochs are not supported")
             }
@@ -111,6 +126,7 @@ impl Error for TimestampError {
         }
     }
 }
+
 impl From<cds::CdsError> for TimestampError {
     fn from(e: cds::CdsError) -> Self {
         TimestampError::Cds(e)
@@ -124,7 +140,6 @@ impl From<cuc::CucError> for TimestampError {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
 pub mod std_mod {
     use crate::time::TimestampError;
     use std::time::SystemTimeError;
@@ -132,7 +147,7 @@ pub mod std_mod {
 
     #[derive(Debug, Clone, Error)]
     pub enum StdTimestampError {
-        #[error("system time error: {0}")]
+        #[error("system time error: {0:?}")]
         SystemTime(#[from] SystemTimeError),
         #[error("timestamp error: {0}")]
         Timestamp(#[from] TimestampError),
@@ -140,7 +155,6 @@ pub mod std_mod {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
 pub fn seconds_since_epoch() -> f64 {
     SystemTime::now()
         .duration_since(SystemTime::UNIX_EPOCH)
@@ -175,7 +189,6 @@ pub const fn ccsds_epoch_to_unix_epoch(ccsds_epoch: i64) -> i64 {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
 pub fn ms_of_day_using_sysclock() -> u32 {
     ms_of_day(seconds_since_epoch())
 }
@@ -196,7 +209,6 @@ pub trait TimeWriter {
     fn write_to_bytes(&self, bytes: &mut [u8]) -> Result<usize, TimestampError>;
 
     #[cfg(feature = "alloc")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
     fn to_vec(&self) -> Result<alloc::vec::Vec<u8>, TimestampError> {
         let mut vec = alloc::vec![0; self.len_written()];
         self.write_to_bytes(&mut vec)?;
@@ -204,16 +216,15 @@ pub trait TimeWriter {
     }
 }
 
-pub trait TimeReader {
-    fn from_bytes(buf: &[u8]) -> Result<Self, TimestampError>
-    where
-        Self: Sized;
+pub trait TimeReader: Sized {
+    fn from_bytes(buf: &[u8]) -> Result<Self, TimestampError>;
 }
 
 /// Trait for generic CCSDS time providers.
 ///
-/// The UNIX helper methods and the [Self::date_time] method are not strictly necessary but extremely
+/// The UNIX helper methods and the helper method are not strictly necessary but extremely
 /// practical because they are a very common and simple exchange format for time information.
+/// Therefore, it was decided to keep them in this trait as well.
 pub trait CcsdsTimeProvider {
     fn len_as_bytes(&self) -> usize;
 
@@ -222,125 +233,203 @@ pub trait CcsdsTimeProvider {
     /// entry denotes the length of the pfield and the second entry is the value of the pfield
     /// in big endian format.
     fn p_field(&self) -> (usize, [u8; 2]);
-    fn ccdsd_time_code(&self) -> CcsdsTimeCodes;
+    fn ccdsd_time_code(&self) -> CcsdsTimeCode;
 
-    fn unix_seconds(&self) -> i64;
-    fn subsecond_millis(&self) -> u16;
-    fn unix_stamp(&self) -> UnixTimestamp {
-        UnixTimestamp::const_new(self.unix_seconds(), self.subsecond_millis())
+    fn unix_secs(&self) -> i64;
+    fn subsec_nanos(&self) -> u32;
+
+    fn subsec_millis(&self) -> u16 {
+        (self.subsec_nanos() / 1_000_000) as u16
     }
 
-    fn date_time(&self) -> Option<DateTime<Utc>>;
+    fn unix_time(&self) -> UnixTime {
+        UnixTime::new(self.unix_secs(), self.subsec_nanos())
+    }
+
+    #[cfg(feature = "chrono")]
+    fn chrono_date_time(&self) -> chrono::LocalResult<chrono::DateTime<chrono::Utc>> {
+        chrono::Utc.timestamp_opt(self.unix_secs(), self.subsec_nanos())
+    }
+
+    #[cfg(feature = "timelib")]
+    fn timelib_date_time(&self) -> Result<time::OffsetDateTime, time::error::ComponentRange> {
+        Ok(time::OffsetDateTime::from_unix_timestamp(self.unix_secs())?
+            + time::Duration::nanoseconds(self.subsec_nanos().into()))
+    }
 }
 
-/// UNIX timestamp: Elapsed seconds since 1970-01-01T00:00:00+00:00.
+/// UNIX time: Elapsed non-leap seconds since 1970-01-01T00:00:00+00:00 UTC.
 ///
-/// Also can optionally include subsecond millisecond for greater accuracy.
+/// This is a commonly used time format and can therefore also be used as a generic format to
+/// convert other CCSDS time formats to and from. The subsecond precision is in nanoseconds
+/// similarly to other common time formats and libraries.
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct UnixTimestamp {
-    pub unix_seconds: i64,
-    subsecond_millis: u16,
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub struct UnixTime {
+    secs: i64,
+    subsec_nanos: u32,
 }
 
-impl UnixTimestamp {
-    /// Returns [None] if the subsecond millisecond value is larger than 999.
-    pub fn new(unix_seconds: i64, subsec_millis: u16) -> Option<Self> {
-        if subsec_millis > 999 {
+impl UnixTime {
+    /// The UNIX epoch time: 1970-01-01T00:00:00+00:00 UTC.
+    pub const EPOCH: Self = Self {
+        secs: 0,
+        subsec_nanos: 0,
+    };
+
+    /// The minimum possible `UnixTime`.
+    pub const MIN: Self = Self {
+        secs: i64::MIN,
+        subsec_nanos: 0,
+    };
+
+    /// The maximum possible `UnixTime`.
+    pub const MAX: Self = Self {
+        secs: i64::MAX,
+        subsec_nanos: NANOS_PER_SECOND - 1,
+    };
+
+    /// Returns [None] if the subsecond nanosecond value is invalid (larger than fraction of a
+    /// second)
+    pub fn new_checked(unix_seconds: i64, subsec_nanos: u32) -> Option<Self> {
+        if subsec_nanos >= NANOS_PER_SECOND {
             return None;
         }
-        Some(Self::const_new(unix_seconds, subsec_millis))
+        Some(Self::new(unix_seconds, subsec_nanos))
     }
 
-    /// Like [Self::new] but const. Panics if the subsecond value is larger than 999.
-    pub const fn const_new(unix_seconds: i64, subsecond_millis: u16) -> Self {
-        if subsecond_millis > 999 {
-            panic!("subsec milliseconds exceeds 999");
+    /// Returns [None] if the subsecond millisecond value is invalid (larger than fraction of a
+    /// second)
+    pub fn new_subsec_millis_checked(unix_seconds: i64, subsec_millis: u16) -> Option<Self> {
+        if subsec_millis >= 1000 {
+            return None;
+        }
+        Self::new_checked(unix_seconds, subsec_millis as u32 * 1_000_000)
+    }
+
+    /// This function will panic if the subsecond value is larger than the fraction of a second.
+    /// Use [Self::new_checked] if you want to handle this case without a panic.
+    pub const fn new(unix_seconds: i64, subsecond_nanos: u32) -> Self {
+        if subsecond_nanos >= NANOS_PER_SECOND {
+            panic!("invalid subsecond nanos value");
         }
         Self {
-            unix_seconds,
-            subsecond_millis,
+            secs: unix_seconds,
+            subsec_nanos: subsecond_nanos,
         }
     }
 
-    pub fn new_only_seconds(unix_seconds: i64) -> Self {
+    /// This function will panic if the subsecond value is larger than the fraction of a second.
+    /// Use [Self::new_subsec_millis_checked] if you want to handle this case without a panic.
+    pub const fn new_subsec_millis(unix_seconds: i64, subsecond_millis: u16) -> Self {
+        if subsecond_millis >= 1000 {
+            panic!("invalid subsecond millisecond value");
+        }
         Self {
-            unix_seconds,
-            subsecond_millis: 0,
+            secs: unix_seconds,
+            subsec_nanos: subsecond_millis as u32 * 1_000_000,
         }
     }
 
-    pub fn subsecond_millis(&self) -> u16 {
-        self.subsecond_millis
-    }
-
-    #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
-    pub fn from_now() -> Result<Self, SystemTimeError> {
-        let now = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)?;
-        let epoch = now.as_secs();
-        Ok(Self::const_new(epoch as i64, now.subsec_millis() as u16))
+    pub fn new_only_secs(unix_seconds: i64) -> Self {
+        Self {
+            secs: unix_seconds,
+            subsec_nanos: 0,
+        }
     }
 
     #[inline]
-    pub fn unix_seconds_f64(&self) -> f64 {
-        self.unix_seconds as f64 + (self.subsecond_millis as f64 / 1000.0)
+    pub fn subsec_millis(&self) -> u16 {
+        (self.subsec_nanos / 1_000_000) as u16
     }
 
-    pub fn as_date_time(&self) -> LocalResult<DateTime<Utc>> {
-        Utc.timestamp_opt(
-            self.unix_seconds,
-            self.subsecond_millis as u32 * 10_u32.pow(6),
-        )
+    pub fn subsec_nanos(&self) -> u32 {
+        self.subsec_nanos
+    }
+
+    #[cfg(feature = "std")]
+    pub fn now() -> Result<Self, SystemTimeError> {
+        let now = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)?;
+        let epoch = now.as_secs();
+        Ok(Self::new(epoch as i64, now.subsec_nanos()))
+    }
+
+    #[inline]
+    pub fn unix_secs_f64(&self) -> f64 {
+        self.secs as f64 + (self.subsec_nanos as f64 / 1_000_000_000.0)
+    }
+
+    pub fn as_secs(&self) -> i64 {
+        self.secs
+    }
+
+    #[cfg(feature = "chrono")]
+    pub fn chrono_date_time(&self) -> chrono::LocalResult<chrono::DateTime<chrono::Utc>> {
+        Utc.timestamp_opt(self.secs, self.subsec_nanos)
+    }
+
+    #[cfg(feature = "timelib")]
+    pub fn timelib_date_time(&self) -> Result<time::OffsetDateTime, time::error::ComponentRange> {
+        Ok(time::OffsetDateTime::from_unix_timestamp(self.as_secs())?
+            + time::Duration::nanoseconds(self.subsec_nanos().into()))
     }
 
     // Calculate the difference in milliseconds between two UnixTimestamps
-    pub fn difference_in_millis(&self, other: &UnixTimestamp) -> i64 {
-        let seconds_difference = self.unix_seconds - other.unix_seconds;
+    pub fn diff_in_millis(&self, other: &UnixTime) -> Option<i64> {
+        let seconds_difference = self.secs.checked_sub(other.secs)?;
         // Convert seconds difference to milliseconds
-        let milliseconds_difference = seconds_difference * 1000;
+        let milliseconds_difference = seconds_difference.checked_mul(1000)?;
 
         // Calculate the difference in subsecond milliseconds directly
-        let subsecond_difference = self.subsecond_millis as i64 - other.subsecond_millis as i64;
+        let subsecond_difference_nanos = self.subsec_nanos as i64 - other.subsec_nanos as i64;
 
         // Combine the differences
-        milliseconds_difference + subsecond_difference
+        Some(milliseconds_difference + (subsecond_difference_nanos / 1_000_000))
     }
 }
 
-impl From<DateTime<Utc>> for UnixTimestamp {
-    fn from(value: DateTime<Utc>) -> Self {
-        Self::const_new(value.timestamp(), value.timestamp_subsec_millis() as u16)
+#[cfg(feature = "chrono")]
+impl From<chrono::DateTime<chrono::Utc>> for UnixTime {
+    fn from(value: chrono::DateTime<chrono::Utc>) -> Self {
+        Self::new(value.timestamp(), value.timestamp_subsec_nanos())
     }
 }
 
-impl PartialOrd for UnixTimestamp {
+#[cfg(feature = "timelib")]
+impl From<time::OffsetDateTime> for UnixTime {
+    fn from(value: time::OffsetDateTime) -> Self {
+        Self::new(value.unix_timestamp(), value.nanosecond())
+    }
+}
+
+impl PartialOrd for UnixTime {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
     }
 }
 
-impl Ord for UnixTimestamp {
+impl Ord for UnixTime {
     fn cmp(&self, other: &Self) -> Ordering {
         if self == other {
             return Ordering::Equal;
         }
-        match self.unix_seconds.cmp(&other.unix_seconds) {
+        match self.secs.cmp(&other.secs) {
             Ordering::Less => return Ordering::Less,
             Ordering::Greater => return Ordering::Greater,
             _ => (),
         }
 
-        match self.subsecond_millis().cmp(&other.subsecond_millis()) {
+        match self.subsec_millis().cmp(&other.subsec_millis()) {
             Ordering::Less => {
-                return if self.unix_seconds < 0 {
+                return if self.secs < 0 {
                     Ordering::Greater
                 } else {
                     Ordering::Less
                 }
             }
             Ordering::Greater => {
-                return if self.unix_seconds < 0 {
+                return if self.secs < 0 {
                     Ordering::Less
                 } else {
                     Ordering::Greater
@@ -360,12 +449,12 @@ pub struct StampDiff {
     pub duration_absolute: Duration,
 }
 
-impl Sub for UnixTimestamp {
-    type Output = StampDiff;
+impl Sub for UnixTime {
+    type Output = Option<StampDiff>;
 
     fn sub(self, rhs: Self) -> Self::Output {
-        let difference = self.difference_in_millis(&rhs);
-        if difference < 0 {
+        let difference = self.diff_in_millis(&rhs)?;
+        Some(if difference < 0 {
             StampDiff {
                 positive_duration: false,
                 duration_absolute: Duration::from_millis(-difference as u64),
@@ -375,16 +464,13 @@ impl Sub for UnixTimestamp {
                 positive_duration: true,
                 duration_absolute: Duration::from_millis(difference as u64),
             }
-        }
+        })
     }
 }
 
-fn get_new_stamp_after_addition(
-    current_stamp: &UnixTimestamp,
-    duration: Duration,
-) -> UnixTimestamp {
-    let mut new_subsec_millis = current_stamp.subsecond_millis() + duration.subsec_millis() as u16;
-    let mut new_unix_seconds = current_stamp.unix_seconds;
+fn get_new_stamp_after_addition(current_stamp: &UnixTime, duration: Duration) -> UnixTime {
+    let mut new_subsec_nanos = current_stamp.subsec_nanos() + duration.subsec_nanos();
+    let mut new_unix_seconds = current_stamp.secs;
     let mut increment_seconds = |value: u32| {
         if new_unix_seconds < 0 {
             new_unix_seconds = new_unix_seconds
@@ -396,8 +482,8 @@ fn get_new_stamp_after_addition(
                 .expect("new unix seconds would exceed i64::MAX");
         }
     };
-    if new_subsec_millis >= 1000 {
-        new_subsec_millis -= 1000;
+    if new_subsec_nanos >= 1_000_000_000 {
+        new_subsec_nanos -= 1_000_000_000;
         increment_seconds(1);
     }
     increment_seconds(
@@ -406,7 +492,7 @@ fn get_new_stamp_after_addition(
             .try_into()
             .expect("duration seconds exceeds u32::MAX"),
     );
-    UnixTimestamp::const_new(new_unix_seconds, new_subsec_millis)
+    UnixTime::new(new_unix_seconds, new_subsec_nanos)
 }
 
 /// Please note that this operation will panic on the following conditions:
@@ -414,7 +500,7 @@ fn get_new_stamp_after_addition(
 /// - Unix seconds after subtraction for stamps before the unix epoch exceeds [i64::MIN].
 /// - Unix seconds after addition  exceeds [i64::MAX].
 /// - Seconds from duration to add exceeds [u32::MAX].
-impl AddAssign<Duration> for UnixTimestamp {
+impl AddAssign<Duration> for UnixTime {
     fn add_assign(&mut self, duration: Duration) {
         *self = get_new_stamp_after_addition(self, duration);
     }
@@ -425,7 +511,7 @@ impl AddAssign<Duration> for UnixTimestamp {
 /// - Unix seconds after subtraction for stamps before the unix epoch exceeds [i64::MIN].
 /// - Unix seconds after addition  exceeds [i64::MAX].
 /// - Unix seconds exceeds [u32::MAX].
-impl Add<Duration> for UnixTimestamp {
+impl Add<Duration> for UnixTime {
     type Output = Self;
 
     fn add(self, duration: Duration) -> Self::Output {
@@ -433,8 +519,8 @@ impl Add<Duration> for UnixTimestamp {
     }
 }
 
-impl Add<Duration> for &UnixTimestamp {
-    type Output = UnixTimestamp;
+impl Add<Duration> for &UnixTime {
+    type Output = UnixTime;
 
     fn add(self, duration: Duration) -> Self::Output {
         get_new_stamp_after_addition(self, duration)
@@ -445,10 +531,15 @@ impl Add<Duration> for &UnixTimestamp {
 mod tests {
     use alloc::string::ToString;
     use chrono::{Datelike, Timelike};
-    use std::format;
+    use std::{format, println};
 
     use super::{cuc::CucError, *};
 
+    #[allow(dead_code)]
+    const UNIX_STAMP_CONST: UnixTime = UnixTime::new(5, 999_999_999);
+    #[allow(dead_code)]
+    const UNIX_STAMP_CONST_2: UnixTime = UnixTime::new_subsec_millis(5, 999);
+
     #[test]
     fn test_days_conversion() {
         assert_eq!(unix_to_ccsds_days(DAYS_CCSDS_TO_UNIX.into()), 0);
@@ -484,28 +575,29 @@ mod tests {
 
     #[test]
     fn basic_unix_stamp_test() {
-        let stamp = UnixTimestamp::new_only_seconds(-200);
-        assert_eq!(stamp.unix_seconds, -200);
-        assert_eq!(stamp.subsecond_millis(), 0);
-        let stamp = UnixTimestamp::new_only_seconds(250);
-        assert_eq!(stamp.unix_seconds, 250);
-        assert_eq!(stamp.subsecond_millis(), 0);
+        let stamp = UnixTime::new_only_secs(-200);
+        assert_eq!(stamp.secs, -200);
+        assert_eq!(stamp.subsec_millis(), 0);
+        let stamp = UnixTime::new_only_secs(250);
+        assert_eq!(stamp.secs, 250);
+        assert_eq!(stamp.subsec_millis(), 0);
     }
 
     #[test]
     fn basic_float_unix_stamp_test() {
-        let stamp = UnixTimestamp::new(500, 600).unwrap();
-        assert_eq!(stamp.unix_seconds, 500);
-        let subsec_millis = stamp.subsecond_millis();
+        let stamp = UnixTime::new_subsec_millis_checked(500, 600).unwrap();
+        assert_eq!(stamp.secs, 500);
+        let subsec_millis = stamp.subsec_millis();
         assert_eq!(subsec_millis, 600);
-        assert!((500.6 - stamp.unix_seconds_f64()).abs() < 0.0001);
+        println!("{:?}", (500.6 - stamp.unix_secs_f64()).to_string());
+        assert!((500.6 - stamp.unix_secs_f64()).abs() < 0.0001);
     }
 
     #[test]
     fn test_ord_larger() {
-        let stamp0 = UnixTimestamp::new_only_seconds(5);
-        let stamp1 = UnixTimestamp::new(5, 500).unwrap();
-        let stamp2 = UnixTimestamp::new_only_seconds(6);
+        let stamp0 = UnixTime::new_only_secs(5);
+        let stamp1 = UnixTime::new_subsec_millis_checked(5, 500).unwrap();
+        let stamp2 = UnixTime::new_only_secs(6);
         assert!(stamp1 > stamp0);
         assert!(stamp2 > stamp0);
         assert!(stamp2 > stamp1);
@@ -513,9 +605,9 @@ mod tests {
 
     #[test]
     fn test_ord_smaller() {
-        let stamp0 = UnixTimestamp::new_only_seconds(5);
-        let stamp1 = UnixTimestamp::new(5, 500).unwrap();
-        let stamp2 = UnixTimestamp::new_only_seconds(6);
+        let stamp0 = UnixTime::new_only_secs(5);
+        let stamp1 = UnixTime::new_subsec_millis_checked(5, 500).unwrap();
+        let stamp2 = UnixTime::new_only_secs(6);
         assert!(stamp0 < stamp1);
         assert!(stamp0 < stamp2);
         assert!(stamp1 < stamp2);
@@ -523,9 +615,9 @@ mod tests {
 
     #[test]
     fn test_ord_larger_neg_numbers() {
-        let stamp0 = UnixTimestamp::new_only_seconds(-5);
-        let stamp1 = UnixTimestamp::new(-5, 500).unwrap();
-        let stamp2 = UnixTimestamp::new_only_seconds(-6);
+        let stamp0 = UnixTime::new_only_secs(-5);
+        let stamp1 = UnixTime::new_subsec_millis_checked(-5, 500).unwrap();
+        let stamp2 = UnixTime::new_only_secs(-6);
         assert!(stamp0 > stamp1);
         assert!(stamp0 > stamp2);
         assert!(stamp1 > stamp2);
@@ -535,9 +627,9 @@ mod tests {
 
     #[test]
     fn test_ord_smaller_neg_numbers() {
-        let stamp0 = UnixTimestamp::new_only_seconds(-5);
-        let stamp1 = UnixTimestamp::new(-5, 500).unwrap();
-        let stamp2 = UnixTimestamp::new_only_seconds(-6);
+        let stamp0 = UnixTime::new_only_secs(-5);
+        let stamp1 = UnixTime::new_subsec_millis_checked(-5, 500).unwrap();
+        let stamp2 = UnixTime::new_only_secs(-6);
         assert!(stamp2 < stamp1);
         assert!(stamp2 < stamp0);
         assert!(stamp1 < stamp0);
@@ -548,8 +640,8 @@ mod tests {
     #[allow(clippy::nonminimal_bool)]
     #[test]
     fn test_eq() {
-        let stamp0 = UnixTimestamp::new(5, 0).unwrap();
-        let stamp1 = UnixTimestamp::new_only_seconds(5);
+        let stamp0 = UnixTime::new(5, 0);
+        let stamp1 = UnixTime::new_only_secs(5);
         assert_eq!(stamp0, stamp1);
         assert!(stamp0 <= stamp1);
         assert!(stamp0 >= stamp1);
@@ -559,27 +651,27 @@ mod tests {
 
     #[test]
     fn test_addition() {
-        let mut stamp0 = UnixTimestamp::new_only_seconds(1);
+        let mut stamp0 = UnixTime::new_only_secs(1);
         stamp0 += Duration::from_secs(5);
-        assert_eq!(stamp0.unix_seconds, 6);
-        assert_eq!(stamp0.subsecond_millis(), 0);
+        assert_eq!(stamp0.as_secs(), 6);
+        assert_eq!(stamp0.subsec_millis(), 0);
         let stamp1 = stamp0 + Duration::from_millis(500);
-        assert_eq!(stamp1.unix_seconds, 6);
-        assert_eq!(stamp1.subsecond_millis(), 500);
+        assert_eq!(stamp1.secs, 6);
+        assert_eq!(stamp1.subsec_millis(), 500);
     }
 
     #[test]
     fn test_addition_on_ref() {
-        let stamp0 = &UnixTimestamp::new(20, 500).unwrap();
+        let stamp0 = &UnixTime::new_subsec_millis_checked(20, 500).unwrap();
         let stamp1 = stamp0 + Duration::from_millis(2500);
-        assert_eq!(stamp1.unix_seconds, 23);
-        assert_eq!(stamp1.subsecond_millis(), 0);
+        assert_eq!(stamp1.secs, 23);
+        assert_eq!(stamp1.subsec_millis(), 0);
     }
 
     #[test]
     fn test_as_dt() {
-        let stamp = UnixTimestamp::new_only_seconds(0);
-        let dt = stamp.as_date_time().unwrap();
+        let stamp = UnixTime::new_only_secs(0);
+        let dt = stamp.chrono_date_time().unwrap();
         assert_eq!(dt.year(), 1970);
         assert_eq!(dt.month(), 1);
         assert_eq!(dt.day(), 1);
@@ -590,55 +682,55 @@ mod tests {
 
     #[test]
     fn test_from_now() {
-        let stamp_now = UnixTimestamp::from_now().unwrap();
-        let dt_now = stamp_now.as_date_time().unwrap();
+        let stamp_now = UnixTime::now().unwrap();
+        let dt_now = stamp_now.chrono_date_time().unwrap();
         assert!(dt_now.year() >= 2020);
     }
 
     #[test]
     fn test_stamp_diff_positive_0() {
-        let stamp_later = UnixTimestamp::new(2, 0).unwrap();
+        let stamp_later = UnixTime::new(2, 0);
         let StampDiff {
             positive_duration,
             duration_absolute,
-        } = stamp_later - UnixTimestamp::new(1, 0).unwrap();
+        } = (stamp_later - UnixTime::new(1, 0)).expect("stamp diff error");
         assert!(positive_duration);
         assert_eq!(duration_absolute, Duration::from_secs(1));
     }
 
     #[test]
     fn test_stamp_diff_positive_1() {
-        let stamp_later = UnixTimestamp::new(3, 800).unwrap();
-        let stamp_earlier = UnixTimestamp::new(1, 900).unwrap();
+        let stamp_later = UnixTime::new(3, 800 * 1_000_000);
+        let stamp_earlier = UnixTime::new_subsec_millis_checked(1, 900).unwrap();
         let StampDiff {
             positive_duration,
             duration_absolute,
-        } = stamp_later - stamp_earlier;
+        } = (stamp_later - stamp_earlier).expect("stamp diff error");
         assert!(positive_duration);
         assert_eq!(duration_absolute, Duration::from_millis(1900));
     }
 
     #[test]
     fn test_stamp_diff_negative() {
-        let stamp_later = UnixTimestamp::new(3, 800).unwrap();
-        let stamp_earlier = UnixTimestamp::new(1, 900).unwrap();
+        let stamp_later = UnixTime::new_subsec_millis_checked(3, 800).unwrap();
+        let stamp_earlier = UnixTime::new_subsec_millis_checked(1, 900).unwrap();
         let StampDiff {
             positive_duration,
             duration_absolute,
-        } = stamp_earlier - stamp_later;
+        } = (stamp_earlier - stamp_later).expect("stamp diff error");
         assert!(!positive_duration);
         assert_eq!(duration_absolute, Duration::from_millis(1900));
     }
 
     #[test]
     fn test_addition_spillover() {
-        let mut stamp0 = UnixTimestamp::new(1, 900).unwrap();
+        let mut stamp0 = UnixTime::new_subsec_millis_checked(1, 900).unwrap();
         stamp0 += Duration::from_millis(100);
-        assert_eq!(stamp0.unix_seconds, 2);
-        assert_eq!(stamp0.subsecond_millis(), 0);
+        assert_eq!(stamp0.secs, 2);
+        assert_eq!(stamp0.subsec_millis(), 0);
         stamp0 += Duration::from_millis(1100);
-        assert_eq!(stamp0.unix_seconds, 3);
-        assert_eq!(stamp0.subsecond_millis(), 100);
+        assert_eq!(stamp0.secs, 3);
+        assert_eq!(stamp0.subsec_millis(), 100);
     }
 
     #[test]
@@ -647,4 +739,26 @@ mod tests {
         let stamp_error = TimestampError::from(cuc_error);
         assert_eq!(stamp_error.to_string(), format!("cuc error: {cuc_error}"));
     }
+
+    #[test]
+    #[cfg(feature = "timelib")]
+    fn test_unix_stamp_as_timelib_datetime() {
+        let stamp_epoch = UnixTime::EPOCH;
+        let timelib_dt = stamp_epoch.timelib_date_time().unwrap();
+        assert_eq!(timelib_dt.year(), 1970);
+        assert_eq!(timelib_dt.month(), time::Month::January);
+        assert_eq!(timelib_dt.day(), 1);
+        assert_eq!(timelib_dt.hour(), 0);
+        assert_eq!(timelib_dt.minute(), 0);
+        assert_eq!(timelib_dt.second(), 0);
+    }
+
+    #[test]
+    #[cfg(feature = "timelib")]
+    fn test_unix_stamp_from_timelib_datetime() {
+        let timelib_dt = time::OffsetDateTime::UNIX_EPOCH;
+        let unix_time = UnixTime::from(timelib_dt);
+        let timelib_converted_back = unix_time.timelib_date_time().unwrap();
+        assert_eq!(timelib_dt, timelib_converted_back);
+    }
 }

src/util.rs

@@ -77,7 +77,6 @@ pub trait UnsignedEnum {
     fn value(&self) -> u64;
 
     #[cfg(feature = "alloc")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
     fn to_vec(&self) -> alloc::vec::Vec<u8> {
         let mut buf = alloc::vec![0; self.size()];
         self.write_to_be_bytes(&mut buf).unwrap();
@@ -132,6 +131,7 @@ 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,6 +221,7 @@ 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,
 }