Merge pull request 'prepare v0.11.0' (#89) from prep_v0.11.0 into main

Reviewed-on: #89

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.61.0
+          toolchain: 1.65.0
           override: true
           profile: minimal
       - uses: actions-rs/cargo@v1

CHANGELOG.md

@@ -8,6 +8,35 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 # [unreleased]
 
+# [v0.11.0] 2024-04-16
+
+## Changed
+
+- Moved `CCSDS_HEADER_LEN` constant to the crate root.
+
+## Added
+
+- Added `SpacePacketHeader` type alias for `SpHeader` type.
+
+# [v0.11.0-rc.2] 2024-04-04
+
+## Changed
+
+- Renamed `PacketId` and `PacketSequenceCtrl` `new` method to `new_checked` and former
+  `new_const` method to `new`.
+- Renamed `tc`, `tm`, `tc_unseg` and `tm_unseg` variants for `PacketId` and `SpHeader`
+  to `new_for_tc_checked`, `new_for_tm_checked`, `new_for_unseg_tc_checked` and
+  `new_for_unseg_tm_checked`.
+- `PusTmCreator` and `PusTcCreator` now expect a regular instance of `SpHeader` instead of
+  a mutable reference.
+
+## Added
+
+- `SpHeader::new_from_apid` and `SpHeader::new_from_apid_checked` constructor.
+- `#[inline]` attribute for a lot of small functions.
+
+# [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.
 
@@ -24,9 +53,14 @@ to check all the API changes in the **Changed** chapter.
 - Added basic support conversions to the `time` library. Introduce new `chrono` and `timelib`
   feature gate.
 - Added `CcsdsTimeProvider::timelib_date_time`.
+- Optional support for `defmt` by adding optional `defmt::Format` derives for common types.
 
 ## Changed
 
+- `PusTcCreator::new_simple` now expects a valid slice for the source data instead of an optional
+  slice. For telecommands without application data, `&[]` can be passed.
+- `PusTmSecondaryHeader` constructors now expects a valid slice for the time stamp instead of an
+  optional slice.
 - Renamed `CcsdsTimeProvider::date_time` to `CcsdsTimeProvider::chrono_date_time`
 - Renamed `CcsdsTimeCodes` to `CcsdsTimeCode`
 - Renamed `cds::TimeProvider` to `cds::CdsTime`
@@ -34,6 +68,7 @@ to check all the API changes in the **Changed** chapter.
 - `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
@@ -43,6 +78,16 @@ to check all the API changes in the **Changed** chapter.
 - `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
 

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "spacepackets"
-version = "0.11.0-rc.0"
+version = "0.11.0"
 edition = "2021"
-rust-version = "1.61"
+rust-version = "1.65"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
 description = "Generic implementations for various CCSDS and ECSS packet standards"
 homepage = "https://egit.irs.uni-stuttgart.de/rust/spacepackets"
@@ -48,6 +48,10 @@ optional = true
 version = "0.2"
 default-features = false
 
+[dependencies.defmt]
+version = "0.3"
+optional = true
+
 [dev-dependencies]
 postcard = "1"
 chrono = "0.4"
@@ -59,7 +63,8 @@ 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

@@ -29,10 +29,6 @@ Currently, this includes the following components:
 
 `spacepackets` supports various runtime environments and is also suitable for `no_std` environments.
 
-It also offers optional support for [`serde`](https://serde.rs/). This allows serializing and
-deserializing them with an appropriate `serde` provider like
-[`postcard`](https://github.com/jamesmunns/postcard).
-
 ## Default features
 
  - [`std`](https://doc.rust-lang.org/std/): Enables functionality relying on the standard library.
@@ -45,6 +41,8 @@ deserializing them with an appropriate `serde` provider like
  - [`serde`](https://serde.rs/): Adds `serde` support for most types by adding `Serialize` and `Deserialize` `derive`s
  - [`chrono`](https://crates.io/crates/chrono): Add basic support for the `chrono` time library.
  - [`timelib`](https://crates.io/crates/time): Add basic support for the `time` time library.
+ - [`defmt`](https://defmt.ferrous-systems.com/): Add support for the `defmt` by adding the
+   [`defmt::Format`](https://defmt.ferrous-systems.com/format) derive on many types.
 
 # Examples
 

automation/Dockerfile

@@ -15,7 +15,10 @@ RUN rustup install nightly && \
     rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \
     rustup component add rustfmt clippy llvm-tools-preview
 
+# Get grcov
 RUN curl -sSL https://github.com/mozilla/grcov/releases/download/v0.8.19/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar -xj --directory /usr/local/bin
+# Get nextest
+RUN curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
 
 # SSH stuff to allow deployment to doc server
 RUN adduser --uid 114 jenkins

automation/Jenkinsfile

@@ -31,7 +31,8 @@ pipeline {
     }
     stage('Test') {
       steps {
-        sh 'cargo test --all-features'
+        sh 'cargo nextest r --all-features'
+        sh 'cargo test --doc'
       }
     }
     stage('Check with all features') {

release-checklist.md

@@ -4,11 +4,12 @@ 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` together with
+   `cargo test --doc`.
 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
@@ -61,6 +62,7 @@ pub(crate) fn generic_len_check_deserialization(
 }
 
 impl<'data> Lv<'data> {
+    #[inline]
     pub fn new(data: &[u8]) -> Result<Lv, TlvLvError> {
         if data.len() > u8::MAX as usize {
             return Err(TlvLvError::DataTooLarge(data.len()));
@@ -72,6 +74,7 @@ impl<'data> Lv<'data> {
     }
 
     /// Creates a LV with an empty value field.
+    #[inline]
     pub fn new_empty() -> Lv<'data> {
         Lv {
             data: &[],
@@ -81,6 +84,7 @@ impl<'data> Lv<'data> {
 
     /// Helper function to build a string LV. This is especially useful for the file or directory
     /// path LVs
+    #[inline]
     pub fn new_from_str(str_slice: &str) -> Result<Lv, TlvLvError> {
         Self::new(str_slice.as_bytes())
     }
@@ -88,38 +92,44 @@ 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")))]
+    #[inline]
     pub fn new_from_string(string: &'data String) -> Result<Lv<'data>, TlvLvError> {
         Self::new(string.as_bytes())
     }
 
     /// Returns the length of the value part, not including the length byte.
+    #[inline]
     pub fn len_value(&self) -> usize {
         self.data.len()
     }
 
     /// Returns the full raw length, including the length byte.
+    #[inline]
     pub fn len_full(&self) -> usize {
         self.len_value() + 1
     }
 
     /// Checks whether the value field is empty.
+    #[inline]
     pub fn is_empty(&self) -> bool {
         self.data.len() == 0
     }
 
+    #[inline]
     pub fn value(&self) -> &[u8] {
         self.data
     }
 
     /// If the LV was generated from a raw bytestream using [Self::from_bytes], the raw start
     /// of the LV can be retrieved with this method.
+    #[inline]
     pub fn raw_data(&self) -> Option<&[u8]> {
         self.raw_data
     }
 
     /// Convenience function to extract the value as a [str]. This is useful if the LV is
     /// known to contain a [str], for example being a file name.
+    #[inline]
     pub fn value_as_str(&self) -> Option<Result<&'data str, Utf8Error>> {
         if self.is_empty() {
             return None;
@@ -135,6 +145,7 @@ impl<'data> Lv<'data> {
     }
 
     /// Reads a LV  from a raw buffer.
+    #[inline]
     pub fn from_bytes(buf: &'data [u8]) -> Result<Lv<'data>, ByteConversionError> {
         generic_len_check_deserialization(buf, MIN_LV_LEN)?;
         Self::from_be_bytes_no_len_check(buf)
@@ -151,6 +162,7 @@ impl<'data> Lv<'data> {
         MIN_LV_LEN + self.data.len()
     }
 
+    #[inline]
     pub(crate) fn from_be_bytes_no_len_check(
         buf: &'data [u8],
     ) -> Result<Lv<'data>, ByteConversionError> {

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,
@@ -149,12 +150,14 @@ impl Error for PduError {
 }
 
 impl From<ByteConversionError> for PduError {
+    #[inline]
     fn from(value: ByteConversionError) -> Self {
         Self::ByteConversion(value)
     }
 }
 
 impl From<TlvLvError> for PduError {
+    #[inline]
     fn from(e: TlvLvError) -> Self {
         Self::TlvLvError(e)
     }
@@ -178,33 +181,42 @@ pub trait WritablePduPacket {
 pub trait CfdpPdu {
     fn pdu_header(&self) -> &PduHeader;
 
+    #[inline]
     fn source_id(&self) -> UnsignedByteField {
         self.pdu_header().common_pdu_conf().source_entity_id
     }
 
+    #[inline]
     fn dest_id(&self) -> UnsignedByteField {
         self.pdu_header().common_pdu_conf().dest_entity_id
     }
 
+    #[inline]
     fn transaction_seq_num(&self) -> UnsignedByteField {
         self.pdu_header().common_pdu_conf().transaction_seq_num
     }
 
+    #[inline]
     fn transmission_mode(&self) -> TransmissionMode {
         self.pdu_header().common_pdu_conf().trans_mode
     }
+
+    #[inline]
     fn direction(&self) -> Direction {
         self.pdu_header().common_pdu_conf().direction
     }
 
+    #[inline]
     fn crc_flag(&self) -> CrcFlag {
         self.pdu_header().common_pdu_conf().crc_flag
     }
 
+    #[inline]
     fn file_flag(&self) -> LargeFileFlag {
         self.pdu_header().common_pdu_conf().file_flag
     }
 
+    #[inline]
     fn pdu_type(&self) -> PduType {
         self.pdu_header().pdu_type()
     }
@@ -220,6 +232,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,
@@ -232,6 +245,7 @@ pub struct CommonPduConfig {
 
 // TODO: Builder pattern might be applicable here..
 impl CommonPduConfig {
+    #[inline]
     pub fn new(
         source_id: impl Into<UnsignedByteField>,
         dest_id: impl Into<UnsignedByteField>,
@@ -263,6 +277,7 @@ impl CommonPduConfig {
         })
     }
 
+    #[inline]
     pub fn new_with_byte_fields(
         source_id: impl Into<UnsignedByteField>,
         dest_id: impl Into<UnsignedByteField>,
@@ -279,10 +294,12 @@ impl CommonPduConfig {
         )
     }
 
+    #[inline]
     pub fn source_id(&self) -> UnsignedByteField {
         self.source_entity_id
     }
 
+    #[inline]
     fn source_dest_id_check(
         source_id: impl Into<UnsignedByteField>,
         dest_id: impl Into<UnsignedByteField>,
@@ -305,6 +322,7 @@ impl CommonPduConfig {
         Ok((source_id, dest_id))
     }
 
+    #[inline]
     pub fn set_source_and_dest_id(
         &mut self,
         source_id: impl Into<UnsignedByteField>,
@@ -316,6 +334,7 @@ impl CommonPduConfig {
         Ok(())
     }
 
+    #[inline]
     pub fn dest_id(&self) -> UnsignedByteField {
         self.dest_entity_id
     }
@@ -324,6 +343,7 @@ impl CommonPduConfig {
 impl Default for CommonPduConfig {
     /// The defaults for the source ID, destination ID and the transaction sequence number is the
     /// [UnsignedByteFieldU8] with an intitial value of 0
+    #[inline]
     fn default() -> Self {
         // The new function can not fail for these input parameters.
         Self::new(
@@ -340,6 +360,7 @@ impl Default for CommonPduConfig {
 }
 
 impl PartialEq for CommonPduConfig {
+    #[inline]
     fn eq(&self, other: &Self) -> bool {
         self.source_entity_id.value() == other.source_entity_id.value()
             && self.dest_entity_id.value() == other.dest_entity_id.value()
@@ -358,6 +379,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,
@@ -367,6 +389,7 @@ pub struct PduHeader {
 }
 
 impl PduHeader {
+    #[inline]
     pub fn new_for_file_data(
         pdu_conf: CommonPduConfig,
         pdu_datafield_len: u16,
@@ -382,6 +405,7 @@ impl PduHeader {
         )
     }
 
+    #[inline]
     pub fn new_for_file_data_default(pdu_conf: CommonPduConfig, pdu_datafield_len: u16) -> Self {
         Self::new_generic(
             PduType::FileData,
@@ -391,6 +415,7 @@ impl PduHeader {
             SegmentationControl::NoRecordBoundaryPreservation,
         )
     }
+    #[inline]
     pub fn new_no_file_data(pdu_conf: CommonPduConfig, pdu_datafield_len: u16) -> Self {
         Self::new_generic(
             PduType::FileDirective,
@@ -401,6 +426,7 @@ impl PduHeader {
         )
     }
 
+    #[inline]
     pub fn new_generic(
         pdu_type: PduType,
         pdu_conf: CommonPduConfig,
@@ -418,6 +444,7 @@ impl PduHeader {
     }
 
     /// Returns only the length of the PDU header when written to a raw buffer.
+    #[inline]
     pub fn header_len(&self) -> usize {
         FIXED_HEADER_LEN
             + self.pdu_conf.source_entity_id.size()
@@ -425,12 +452,14 @@ impl PduHeader {
             + self.pdu_conf.dest_entity_id.size()
     }
 
+    #[inline]
     pub fn pdu_datafield_len(&self) -> usize {
         self.pdu_datafield_len.into()
     }
 
     /// Returns the full length of the PDU when written to a raw buffer, which is the header length
     /// plus the PDU datafield length.
+    #[inline]
     pub fn pdu_len(&self) -> usize {
         self.header_len() + self.pdu_datafield_len as usize
     }
@@ -603,10 +632,13 @@ impl PduHeader {
             current_idx,
         ))
     }
+
+    #[inline]
     pub fn pdu_type(&self) -> PduType {
         self.pdu_type
     }
 
+    #[inline]
     pub fn common_pdu_conf(&self) -> &CommonPduConfig {
         &self.pdu_conf
     }
@@ -614,6 +646,8 @@ impl PduHeader {
     pub fn seg_metadata_flag(&self) -> SegmentMetadataFlag {
         self.seg_metadata_flag
     }
+
+    #[inline]
     pub fn seg_ctrl(&self) -> SegmentationControl {
         self.seg_ctrl
     }

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

@@ -1,8 +1,8 @@
 //! Common definitions and helpers required to create PUS TMTC packets according to
 //! [ECSS-E-ST-70-41C](https://ecss.nl/standard/ecss-e-st-70-41c-space-engineering-telemetry-and-telecommand-packet-utilization-15-april-2016/)
 //!
-//! You can find the PUS telecommand definitions in the [tc] module and ithe PUS telemetry definitions
+//! You can find the PUS telecommand types in the [tc] module and the the PUS telemetry
-//! inside the [tm] module.
+//! types inside the [tm] module.
 use crate::{ByteConversionError, CcsdsPacket, CRC_CCITT_FALSE};
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
@@ -22,7 +22,6 @@ pub mod tm;
 pub mod verification;
 
 pub type CrcType = u16;
-pub const CCSDS_HEADER_LEN: usize = size_of::<crate::zc::SpHeader>();
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, IntoPrimitive, TryFromPrimitive)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -74,6 +73,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 +150,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 +206,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 +226,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]),
     }
 }
@@ -264,7 +245,7 @@ pub(crate) fn verify_crc16_ccitt_false_from_raw_to_pus_error(
     crc16: u16,
 ) -> Result<(), PusError> {
     verify_crc16_ccitt_false_from_raw(raw_data)
-        .then(|| ())
+        .then_some(())
         .ok_or(PusError::ChecksumFailure(crc16))
 }
 
@@ -280,9 +261,13 @@ pub(crate) fn verify_crc16_ccitt_false_from_raw(raw_data: &[u8]) -> bool {
 macro_rules! ccsds_impl {
     () => {
         delegate!(to self.sp_header {
+            #[inline]
             fn ccsds_version(&self) -> u8;
+            #[inline]
             fn packet_id(&self) -> crate::PacketId;
+            #[inline]
             fn psc(&self) -> crate::PacketSequenceCtrl;
+            #[inline]
             fn data_len(&self) -> u16;
         });
     }
@@ -291,8 +276,11 @@ macro_rules! ccsds_impl {
 macro_rules! sp_header_impls {
     () => {
         delegate!(to self.sp_header {
+            #[inline]
             pub fn set_apid(&mut self, apid: u16) -> bool;
+            #[inline]
             pub fn set_seq_count(&mut self, seq_count: u16) -> bool;
+            #[inline]
             pub fn set_seq_flags(&mut self, seq_flag: SequenceFlags);
         });
     }

src/ecss/scheduling.rs

@@ -54,6 +54,7 @@ pub enum SchedStatus {
 }
 
 impl From<bool> for SchedStatus {
+    #[inline]
     fn from(value: bool) -> Self {
         if value {
             SchedStatus::Enabled

src/ecss/tc.rs

@@ -9,9 +9,11 @@
 //! use spacepackets::ecss::tc::{PusTcCreator, PusTcReader, PusTcSecondaryHeader};
 //!
 //! // Create a ping telecommand with no user application data
-//! let mut sph = SpHeader::tc_unseg(0x02, 0x34, 0).unwrap();
+//! let pus_tc = PusTcCreator::new_no_app_data(
-//! let tc_header = PusTcSecondaryHeader::new_simple(17, 1);
+//!     SpHeader::new_from_apid(0x02),
-//! let pus_tc = PusTcCreator::new_no_app_data(&mut sph, tc_header, true);
+//!     PusTcSecondaryHeader::new_simple(17, 1),
+//!     true
+//! );
 //! println!("{:?}", pus_tc);
 //! assert_eq!(pus_tc.service(), 17);
 //! assert_eq!(pus_tc.subservice(), 1);
@@ -48,8 +50,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 +61,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,
@@ -112,22 +113,27 @@ pub mod zc {
     }
 
     impl GenericPusTcSecondaryHeader for PusTcSecondaryHeader {
+        #[inline]
         fn pus_version(&self) -> PusVersion {
             PusVersion::try_from(self.version_ack >> 4 & 0b1111).unwrap_or(PusVersion::Invalid)
         }
 
+        #[inline]
         fn ack_flags(&self) -> u8 {
             self.version_ack & 0b1111
         }
 
+        #[inline]
         fn service(&self) -> u8 {
             self.service
         }
 
+        #[inline]
         fn subservice(&self) -> u8 {
             self.subservice
         }
 
+        #[inline]
         fn source_id(&self) -> u16 {
             self.source_id.get()
         }
@@ -146,6 +152,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,
@@ -155,22 +162,27 @@ pub struct PusTcSecondaryHeader {
 }
 
 impl GenericPusTcSecondaryHeader for PusTcSecondaryHeader {
+    #[inline]
     fn pus_version(&self) -> PusVersion {
         self.version
     }
 
+    #[inline]
     fn ack_flags(&self) -> u8 {
         self.ack
     }
 
+    #[inline]
     fn service(&self) -> u8 {
         self.service
     }
 
+    #[inline]
     fn subservice(&self) -> u8 {
         self.subservice
     }
 
+    #[inline]
     fn source_id(&self) -> u16 {
         self.source_id
     }
@@ -191,6 +203,7 @@ impl TryFrom<zc::PusTcSecondaryHeader> for PusTcSecondaryHeader {
 }
 
 impl PusTcSecondaryHeader {
+    #[inline]
     pub fn new_simple(service: u8, subservice: u8) -> Self {
         PusTcSecondaryHeader {
             service,
@@ -201,6 +214,7 @@ impl PusTcSecondaryHeader {
         }
     }
 
+    #[inline]
     pub fn new(service: u8, subservice: u8, ack: u8, source_id: u16) -> Self {
         PusTcSecondaryHeader {
             service,
@@ -212,333 +226,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,35 +236,37 @@ pub mod legacy_tc {
 /// There is no spare bytes support yet.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct PusTcCreator<'raw_data> {
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub struct PusTcCreator<'app_data> {
     sp_header: SpHeader,
     pub sec_header: PusTcSecondaryHeader,
-    app_data: &'raw_data [u8],
+    app_data: &'app_data [u8],
 }
 
-impl<'raw_data> PusTcCreator<'raw_data> {
+impl<'app_data> PusTcCreator<'app_data> {
     /// Generates a new struct instance.
     ///
     /// # Arguments
     ///
-    /// * `sp_header` - Space packet header information. The correct packet type will be set
+    /// * `sp_header` - Space packet header information. The correct packet type and the secondary
-    ///     automatically
+    ///     header flag are set correctly by the constructor.
     /// * `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
+    ///     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
+    #[inline]
     pub fn new(
-        sp_header: &mut SpHeader,
+        mut sp_header: SpHeader,
         sec_header: PusTcSecondaryHeader,
-        app_data: &'raw_data [u8],
+        app_data: &'app_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,
+            sp_header,
             app_data,
             sec_header,
         };
@@ -587,35 +276,44 @@ 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.
+    #[inline]
     pub fn new_simple(
-        sph: &mut SpHeader,
+        sph: SpHeader,
         service: u8,
         subservice: u8,
-        app_data: Option<&'raw_data [u8]>,
+        app_data: &'app_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,
         )
     }
 
+    #[inline]
     pub fn new_no_app_data(
-        sp_header: &mut SpHeader,
+        sp_header: SpHeader,
         sec_header: PusTcSecondaryHeader,
         set_ccsds_len: bool,
     ) -> Self {
         Self::new(sp_header, sec_header, &[], set_ccsds_len)
     }
 
+    #[inline]
     pub fn sp_header(&self) -> &SpHeader {
         &self.sp_header
     }
 
+    #[inline]
+    pub fn sp_header_mut(&mut self) -> &mut SpHeader {
+        &mut self.sp_header
+    }
+
+    #[inline]
     pub fn set_ack_field(&mut self, ack: u8) -> bool {
         if ack > 0b1111 {
             return false;
@@ -624,6 +322,7 @@ impl<'raw_data> PusTcCreator<'raw_data> {
         true
     }
 
+    #[inline]
     pub fn set_source_id(&mut self, source_id: u16) {
         self.sec_header.source_id = source_id;
     }
@@ -631,18 +330,18 @@ 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
     /// is set correctly.
+    #[inline]
     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
+    /// This function calculates and returns the CRC16 for the current packet.
-    /// [PusTc::calc_crc_on_serialization] is set to False. It will calculate and cache the CRC16.
     pub fn calc_own_crc16(&self) -> u16 {
         let mut digest = CRC_CCITT_FALSE.digest();
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
@@ -654,8 +353,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>) -> usize {
-    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_TC_MIN_LEN_WITHOUT_APP_DATA;
         appended_len += self.app_data.len();
@@ -668,11 +366,12 @@ 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
     }
 }
 
 impl WritablePusPacket for PusTcCreator<'_> {
+    #[inline]
     fn len_written(&self) -> usize {
         PUS_TC_MIN_LEN_WITHOUT_APP_DATA + self.app_data.len()
     }
@@ -713,15 +412,20 @@ impl CcsdsPacket for PusTcCreator<'_> {
 
 impl PusPacket for PusTcCreator<'_> {
     delegate!(to self.sec_header {
+        #[inline]
         fn pus_version(&self) -> PusVersion;
+        #[inline]
         fn service(&self) -> u8;
+        #[inline]
         fn subservice(&self) -> u8;
     });
 
+    #[inline]
     fn user_data(&self) -> &[u8] {
         self.app_data
     }
 
+    #[inline]
     fn crc16(&self) -> Option<u16> {
         Some(self.calc_own_crc16())
     }
@@ -729,10 +433,15 @@ impl PusPacket for PusTcCreator<'_> {
 
 impl GenericPusTcSecondaryHeader for PusTcCreator<'_> {
     delegate!(to self.sec_header {
+        #[inline]
         fn pus_version(&self) -> PusVersion;
+        #[inline]
         fn service(&self) -> u8;
+        #[inline]
         fn subservice(&self) -> u8;
+        #[inline]
         fn source_id(&self) -> u16;
+        #[inline]
         fn ack_flags(&self) -> u8;
     });
 }
@@ -752,6 +461,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 +473,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 {
@@ -808,24 +519,29 @@ impl<'raw_data> PusTcReader<'raw_data> {
         Ok((pus_tc, total_len))
     }
 
+    #[inline]
     pub fn app_data(&self) -> &[u8] {
         self.user_data()
     }
 
+    #[inline]
     pub fn raw_data(&self) -> &[u8] {
         self.raw_data
     }
 
+    #[inline]
     pub fn len_packed(&self) -> usize {
         self.sp_header.total_len()
     }
 
+    #[inline]
     pub fn sp_header(&self) -> &SpHeader {
         &self.sp_header
     }
 }
 
 impl PartialEq for PusTcReader<'_> {
+    #[inline]
     fn eq(&self, other: &Self) -> bool {
         self.raw_data == other.raw_data
     }
@@ -837,15 +553,20 @@ impl CcsdsPacket for PusTcReader<'_> {
 
 impl PusPacket for PusTcReader<'_> {
     delegate!(to self.sec_header {
+        #[inline]
         fn pus_version(&self) -> PusVersion;
+        #[inline]
         fn service(&self) -> u8;
+        #[inline]
         fn subservice(&self) -> u8;
     });
 
+    #[inline]
     fn user_data(&self) -> &[u8] {
         self.app_data
     }
 
+    #[inline]
     fn crc16(&self) -> Option<u16> {
         Some(self.crc16)
     }
@@ -853,10 +574,15 @@ impl PusPacket for PusTcReader<'_> {
 
 impl GenericPusTcSecondaryHeader for PusTcReader<'_> {
     delegate!(to self.sec_header {
+        #[inline]
         fn pus_version(&self) -> PusVersion;
+        #[inline]
         fn service(&self) -> u8;
+        #[inline]
         fn subservice(&self) -> u8;
+        #[inline]
         fn source_id(&self) -> u16;
+        #[inline]
         fn ack_flags(&self) -> u8;
     });
 }
@@ -894,19 +620,19 @@ mod tests {
     use postcard::{from_bytes, to_allocvec};
 
     fn base_ping_tc_full_ctor() -> PusTcCreator<'static> {
-        let mut sph = SpHeader::tc_unseg(0x02, 0x34, 0).unwrap();
+        let sph = SpHeader::new_for_unseg_tc_checked(0x02, 0x34, 0).unwrap();
         let tc_header = PusTcSecondaryHeader::new_simple(17, 1);
-        PusTcCreator::new_no_app_data(&mut sph, tc_header, true)
+        PusTcCreator::new_no_app_data(sph, tc_header, true)
     }
 
     fn base_ping_tc_simple_ctor() -> PusTcCreator<'static> {
-        let mut sph = SpHeader::tc_unseg(0x02, 0x34, 0).unwrap();
+        let sph = SpHeader::new_for_unseg_tc_checked(0x02, 0x34, 0).unwrap();
-        PusTcCreator::new_simple(&mut sph, 17, 1, None, true)
+        PusTcCreator::new_simple(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();
+        let sph = SpHeader::new_for_unseg_tc_checked(0x02, 0x34, 0).unwrap();
-        PusTcCreator::new_simple(&mut sph, 17, 1, Some(app_data), true)
+        PusTcCreator::new_simple(sph, 17, 1, app_data, true)
     }
 
     #[test]
@@ -962,8 +688,8 @@ mod tests {
 
     #[test]
     fn test_update_func() {
-        let mut sph = SpHeader::tc_unseg(0x02, 0x34, 0).unwrap();
+        let sph = SpHeader::new_for_unseg_tc_checked(0x02, 0x34, 0).unwrap();
-        let mut tc = PusTcCreator::new_simple(&mut sph, 17, 1, None, false);
+        let mut tc = PusTcCreator::new_simple(sph, 17, 1, &[], false);
         assert_eq!(tc.data_len(), 0);
         tc.update_ccsds_data_len();
         assert_eq!(tc.data_len(), 6);
@@ -1010,9 +736,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
+        let size = pus_tc.append_to_vec(&mut test_vec);
-            .append_to_vec(&mut test_vec)
-            .expect("Error writing TC to vector");
         assert_eq!(size, 13);
         verify_test_tc_raw(&test_vec.as_slice());
         verify_crc_no_app_data(&test_vec.as_slice());
@@ -1058,9 +782,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
+        let size = pus_tc.append_to_vec(&mut test_vec);
-            .append_to_vec(&mut test_vec)
-            .expect("Error writing TC to vector");
         assert_eq!(test_vec[11], 1);
         assert_eq!(test_vec[12], 2);
         assert_eq!(test_vec[13], 3);
@@ -1139,7 +861,8 @@ mod tests {
         if !has_user_data {
             assert!(tc.user_data().is_empty());
         }
-        let mut comp_header = SpHeader::tc_unseg(0x02, 0x34, exp_full_len as u16 - 7).unwrap();
+        let mut comp_header =
+            SpHeader::new_for_unseg_tc_checked(0x02, 0x34, exp_full_len as u16 - 7).unwrap();
         comp_header.set_sec_header_flag();
         assert_eq!(*tc.sp_header(), comp_header);
     }
@@ -1150,7 +873,8 @@ mod tests {
             assert!(tc.user_data().is_empty());
         }
         assert_eq!(tc.len_packed(), exp_full_len);
-        let mut comp_header = SpHeader::tc_unseg(0x02, 0x34, exp_full_len as u16 - 7).unwrap();
+        let mut comp_header =
+            SpHeader::new_for_unseg_tc_checked(0x02, 0x34, exp_full_len as u16 - 7).unwrap();
         comp_header.set_sec_header_flag();
         assert_eq!(*tc.sp_header(), comp_header);
     }

src/lib.rs

@@ -22,10 +22,6 @@
 //!
 //! `spacepackets` supports various runtime environments and is also suitable for `no_std` environments.
 //!
-//! It also offers optional support for [`serde`](https://serde.rs/). This allows serializing and
-//! deserializing them with an appropriate `serde` provider like
-//! [`postcard`](https://github.com/jamesmunns/postcard).
-//!
 //! ### Default features
 //!
 //!  - [`std`](https://doc.rust-lang.org/std/): Enables functionality relying on the standard library.
@@ -36,7 +32,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
 //!
@@ -48,20 +48,19 @@
 //!
 //! ```rust
 //! use spacepackets::SpHeader;
-//! let sp_header = SpHeader::tc_unseg(0x42, 12, 1).expect("Error creating CCSDS TC header");
+//! let sp_header = SpHeader::new_for_unseg_tc_checked(0x42, 12, 1).expect("error creating CCSDS TC header");
 //! println!("{:?}", sp_header);
 //! let mut ccsds_buf: [u8; 32] = [0; 32];
 //! sp_header.write_to_be_bytes(&mut ccsds_buf).expect("Writing CCSDS TC header failed");
 //! 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))]
 extern crate std;
 
-use crate::ecss::CCSDS_HEADER_LEN;
 use core::{
     fmt::{Debug, Display, Formatter},
     hash::Hash,
@@ -84,6 +83,8 @@ mod private {
     pub trait Sealed {}
 }
 
+pub const CCSDS_HEADER_LEN: usize = core::mem::size_of::<crate::zc::SpHeader>();
+
 /// CRC algorithm used by the PUS standard, the CCSDS TC standard and the CFDP standard.
 pub const CRC_CCITT_FALSE: Crc<u16> = Crc::<u16>::new(&CRC_16_IBM_3740);
 
@@ -93,6 +94,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 +144,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 +168,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 +196,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,
@@ -199,18 +204,21 @@ pub struct PacketId {
 }
 
 impl PartialEq for PacketId {
+    #[inline]
     fn eq(&self, other: &Self) -> bool {
         self.raw().eq(&other.raw())
     }
 }
 
 impl PartialOrd for PacketId {
+    #[inline]
     fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
         Some(self.cmp(other))
     }
 }
 
 impl Ord for PacketId {
+    #[inline]
     fn cmp(&self, other: &Self) -> core::cmp::Ordering {
         self.raw().cmp(&other.raw())
     }
@@ -224,6 +232,7 @@ impl Hash for PacketId {
 }
 
 impl Default for PacketId {
+    #[inline]
     fn default() -> Self {
         PacketId {
             ptype: PacketType::Tm,
@@ -234,23 +243,34 @@ impl Default for PacketId {
 }
 
 impl PacketId {
-    pub const fn const_tc(sec_header: bool, apid: u16) -> Self {
+    /// This constructor will panic if the passed APID exceeds [MAX_APID].
-        Self::const_new(PacketType::Tc, sec_header, apid)
+    /// Use the checked constructor variants to avoid panics.
-    }
+    #[inline]
-
+    pub const fn new_for_tc(sec_header: bool, apid: u16) -> Self {
-    pub const fn const_tm(sec_header: bool, apid: u16) -> Self {
-        Self::const_new(PacketType::Tm, sec_header, apid)
-    }
-
-    pub fn tc(sec_header: bool, apid: u16) -> Option<Self> {
         Self::new(PacketType::Tc, sec_header, apid)
     }
 
-    pub fn tm(sec_header: bool, apid: u16) -> Option<Self> {
+    /// This constructor will panic if the passed APID exceeds [MAX_APID].
+    /// Use the checked constructor variants to avoid panics.
+    #[inline]
+    pub const fn new_for_tm(sec_header: bool, apid: u16) -> Self {
         Self::new(PacketType::Tm, sec_header, apid)
     }
 
-    pub const fn const_new(ptype: PacketType, sec_header: bool, apid: u16) -> Self {
+    #[inline]
+    pub fn new_for_tc_checked(sec_header: bool, apid: u16) -> Option<Self> {
+        Self::new_checked(PacketType::Tc, sec_header, apid)
+    }
+
+    #[inline]
+    pub fn new_for_tm_checked(sec_header: bool, apid: u16) -> Option<Self> {
+        Self::new_checked(PacketType::Tm, sec_header, apid)
+    }
+
+    /// This constructor will panic if the passed APID exceeds [MAX_APID].
+    /// Use the checked variants to avoid panics.
+    #[inline]
+    pub const fn new(ptype: PacketType, sec_header: bool, apid: u16) -> Self {
         if apid > MAX_APID {
             panic!("APID too large");
         }
@@ -261,16 +281,18 @@ impl PacketId {
         }
     }
 
-    pub fn new(ptype: PacketType, sec_header_flag: bool, apid: u16) -> Option<PacketId> {
+    #[inline]
+    pub fn new_checked(ptype: PacketType, sec_header_flag: bool, apid: u16) -> Option<PacketId> {
         if apid > MAX_APID {
             return None;
         }
-        Some(PacketId::const_new(ptype, sec_header_flag, apid))
+        Some(PacketId::new(ptype, sec_header_flag, apid))
     }
 
     /// Set a new Application Process ID (APID). If the passed number is invalid, the APID will
     /// not be set and false will be returned. The maximum allowed value for the 11-bit field is
     /// 2047
+    #[inline]
     pub fn set_apid(&mut self, apid: u16) -> bool {
         if apid > MAX_APID {
             return false;
@@ -279,6 +301,7 @@ impl PacketId {
         true
     }
 
+    #[inline]
     pub fn apid(&self) -> u16 {
         self.apid
     }
@@ -303,15 +326,17 @@ 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,
 }
 
 impl PacketSequenceCtrl {
-    /// const variant of [PacketSequenceCtrl::new], but panics if the sequence count exceeds
+    /// This constructor panics if the sequence count exceeds [MAX_SEQ_COUNT].
-    /// [MAX_SEQ_COUNT].
+    /// Use [Self::new_checked] to avoid panics.
-    pub const fn const_new(seq_flags: SequenceFlags, seq_count: u16) -> PacketSequenceCtrl {
+    #[inline]
+    pub const fn new(seq_flags: SequenceFlags, seq_count: u16) -> PacketSequenceCtrl {
         if seq_count > MAX_SEQ_COUNT {
             panic!("Sequence count too large");
         }
@@ -322,18 +347,22 @@ impl PacketSequenceCtrl {
     }
 
     /// Returns [None] if the passed sequence count exceeds [MAX_SEQ_COUNT].
-    pub fn new(seq_flags: SequenceFlags, seq_count: u16) -> Option<PacketSequenceCtrl> {
+    #[inline]
+    pub fn new_checked(seq_flags: SequenceFlags, seq_count: u16) -> Option<PacketSequenceCtrl> {
         if seq_count > MAX_SEQ_COUNT {
             return None;
         }
-        Some(PacketSequenceCtrl::const_new(seq_flags, seq_count))
+        Some(PacketSequenceCtrl::new(seq_flags, seq_count))
     }
+
+    #[inline]
     pub fn raw(&self) -> u16 {
         ((self.seq_flags as u16) << 14) | self.seq_count
     }
 
     /// Set a new sequence count. If the passed number is invalid, the sequence count will not be
     /// set and false will be returned. The maximum allowed value for the 14-bit field is 16383.
+    #[inline]
     pub fn set_seq_count(&mut self, ssc: u16) -> bool {
         if ssc > MAX_SEQ_COUNT {
             return false;
@@ -342,6 +371,7 @@ impl PacketSequenceCtrl {
         true
     }
 
+    #[inline]
     pub fn seq_count(&self) -> u16 {
         self.seq_count
     }
@@ -383,6 +413,7 @@ pub trait CcsdsPacket {
     /// Retrieve data length field
     fn data_len(&self) -> u16;
     /// Retrieve the total packet size based on the data length field
+    #[inline]
     fn total_len(&self) -> usize {
         usize::from(self.data_len()) + CCSDS_HEADER_LEN + 1
     }
@@ -463,6 +494,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,
@@ -470,9 +502,12 @@ pub struct SpHeader {
     pub data_len: u16,
 }
 
+pub type SpacePacketHeader = SpHeader;
+
 impl Default for SpHeader {
     /// The default function sets the sequence flag field to [SequenceFlags::Unsegmented]. The data
     /// length field is set to 1, which denotes an empty space packets.
+    #[inline]
     fn default() -> Self {
         SpHeader {
             version: 0,
@@ -487,6 +522,7 @@ impl Default for SpHeader {
 }
 
 impl SpHeader {
+    #[inline]
     pub const fn new(packet_id: PacketId, psc: PacketSequenceCtrl, data_len: u16) -> Self {
         Self {
             version: 0,
@@ -496,9 +532,43 @@ impl SpHeader {
         }
     }
 
-    /// const variant of the [SpHeader::new_fron_single_fields] function. Panics if the passed
+    /// This constructor sets the sequence flag field to [SequenceFlags::Unsegmented]. The data
-    /// APID exceeds [MAX_APID] or the passed packet sequence count exceeds [MAX_SEQ_COUNT].
+    /// length field is set to 1, which denotes an empty space packets.
-    const fn const_new_from_single_fields(
+    ///
+    /// This constructor will panic if the APID exceeds [MAX_APID].
+    #[inline]
+    pub const fn new_from_apid(apid: u16) -> Self {
+        SpHeader {
+            version: 0,
+            packet_id: PacketId::new(PacketType::Tm, false, apid),
+            psc: PacketSequenceCtrl {
+                seq_flags: SequenceFlags::Unsegmented,
+                seq_count: 0,
+            },
+            data_len: 1,
+        }
+    }
+
+    /// Checked variant of [Self::new_from_apid].
+    #[inline]
+    pub fn new_from_apid_checked(apid: u16) -> Option<Self> {
+        Some(SpHeader {
+            version: 0,
+            packet_id: PacketId::new_checked(PacketType::Tm, false, apid)?,
+            psc: PacketSequenceCtrl {
+                seq_flags: SequenceFlags::Unsegmented,
+                seq_count: 0,
+            },
+            data_len: 1,
+        })
+    }
+
+    /// This constructor panics if the passed APID exceeds [MAX_APID] or the passed packet sequence
+    /// count exceeds [MAX_SEQ_COUNT].
+    ///
+    /// The checked constructor variants can be used to avoid panics.
+    #[inline]
+    const fn new_from_fields(
         ptype: PacketType,
         sec_header: bool,
         apid: u16,
@@ -513,17 +583,20 @@ impl SpHeader {
             panic!("APID is too large");
         }
         Self {
-            psc: PacketSequenceCtrl::const_new(seq_flags, seq_count),
+            psc: PacketSequenceCtrl::new(seq_flags, seq_count),
-            packet_id: PacketId::const_new(ptype, sec_header, apid),
+            packet_id: PacketId::new(ptype, sec_header, apid),
             data_len,
             version: 0,
         }
     }
 
     /// Create a new Space Packet Header instance which can be used to create generic
-    /// Space Packets. This will return [None] if the APID or sequence count argument
+    /// Space Packets.
+    ///
+    /// This will return [None] if the APID or sequence count argument
     /// exceed [MAX_APID] or [MAX_SEQ_COUNT] respectively. The version field is set to 0b000.
-    pub fn new_from_single_fields(
+    #[inline]
+    pub fn new_from_fields_checked(
         ptype: PacketType,
         sec_header: bool,
         apid: u16,
@@ -534,56 +607,117 @@ impl SpHeader {
         if seq_count > MAX_SEQ_COUNT || apid > MAX_APID {
             return None;
         }
-        Some(SpHeader::const_new_from_single_fields(
+        Some(SpHeader::new_from_fields(
             ptype, sec_header, apid, seq_flags, seq_count, data_len,
         ))
     }
 
     /// Helper function for telemetry space packet headers. The packet type field will be
     /// set accordingly. The secondary header flag field is set to false.
-    pub fn tm(apid: u16, seq_flags: SequenceFlags, seq_count: u16, data_len: u16) -> Option<Self> {
+    #[inline]
-        Self::new_from_single_fields(PacketType::Tm, false, apid, seq_flags, seq_count, data_len)
+    pub fn new_for_tm_checked(
+        apid: u16,
+        seq_flags: SequenceFlags,
+        seq_count: u16,
+        data_len: u16,
+    ) -> Option<Self> {
+        Self::new_from_fields_checked(PacketType::Tm, false, apid, seq_flags, seq_count, data_len)
     }
 
     /// Helper function for telemetry space packet headers. The packet type field will be
     /// set accordingly. The secondary header flag field is set to false.
-    pub fn tc(apid: u16, seq_flags: SequenceFlags, seq_count: u16, data_len: u16) -> Option<Self> {
+    #[inline]
-        Self::new_from_single_fields(PacketType::Tc, false, apid, seq_flags, seq_count, data_len)
+    pub fn new_for_tc_checked(
+        apid: u16,
+        seq_flags: SequenceFlags,
+        seq_count: u16,
+        data_len: u16,
+    ) -> Option<Self> {
+        Self::new_from_fields_checked(PacketType::Tc, false, apid, seq_flags, seq_count, data_len)
     }
 
-    /// Variant of [SpHeader::tm] which sets the sequence flag field to [SequenceFlags::Unsegmented]
+    /// This is an unchecked constructor which can panic on invalid input.
-    pub fn tm_unseg(apid: u16, seq_count: u16, data_len: u16) -> Option<Self> {
+    #[inline]
-        Self::tm(apid, SequenceFlags::Unsegmented, seq_count, data_len)
+    pub const fn new_for_tm(
+        apid: u16,
+        seq_flags: SequenceFlags,
+        seq_count: u16,
+        data_len: u16,
+    ) -> Self {
+        Self::new_from_fields(PacketType::Tm, false, apid, seq_flags, seq_count, data_len)
     }
 
-    /// Variant of [SpHeader::tc] which sets the sequence flag field to [SequenceFlags::Unsegmented]
+    /// This is an unchecked constructor which can panic on invalid input.
-    pub fn tc_unseg(apid: u16, seq_count: u16, data_len: u16) -> Option<Self> {
+    #[inline]
-        Self::tc(apid, SequenceFlags::Unsegmented, seq_count, data_len)
+    pub const fn new_for_tc(
+        apid: u16,
+        seq_flags: SequenceFlags,
+        seq_count: u16,
+        data_len: u16,
+    ) -> Self {
+        Self::new_from_fields(PacketType::Tc, false, apid, seq_flags, seq_count, data_len)
     }
 
-    //noinspection RsTraitImplementation
+    /// Variant of [SpHeader::new_for_tm_checked] which sets the sequence flag field to [SequenceFlags::Unsegmented]
-    delegate!(to self.packet_id {
+    #[inline]
-        /// Returns [false] and fails if the APID exceeds [MAX_APID]
+    pub fn new_for_unseg_tm_checked(apid: u16, seq_count: u16, data_len: u16) -> Option<Self> {
-        pub fn set_apid(&mut self, apid: u16) -> bool;
+        Self::new_for_tm_checked(apid, SequenceFlags::Unsegmented, seq_count, data_len)
-    });
+    }
 
-    delegate!(to self.psc {
+    /// Variant of [SpHeader::new_for_tc_checked] which sets the sequence flag field to [SequenceFlags::Unsegmented]
-        /// Returns [false] and fails if the sequence count exceeds [MAX_SEQ_COUNT]
+    #[inline]
-        pub fn set_seq_count(&mut self, seq_count: u16) -> bool;
+    pub fn new_for_unseg_tc_checked(apid: u16, seq_count: u16, data_len: u16) -> Option<Self> {
-    });
+        Self::new_for_tc_checked(apid, SequenceFlags::Unsegmented, seq_count, data_len)
+    }
 
+    /// Variant of [SpHeader::new_for_tc] which sets the sequence flag field to [SequenceFlags::Unsegmented].
+    ///
+    /// This is an unchecked constructor which can panic on invalid input.
+    #[inline]
+    pub const fn new_for_unseg_tc(apid: u16, seq_count: u16, data_len: u16) -> Self {
+        Self::new_for_tc(apid, SequenceFlags::Unsegmented, seq_count, data_len)
+    }
+
+    /// Variant of [SpHeader::new_for_tm] which sets the sequence flag field to [SequenceFlags::Unsegmented].
+    ///
+    /// This is an unchecked constructor which can panic on invalid input.
+    #[inline]
+    pub const fn new_for_unseg_tm(apid: u16, seq_count: u16, data_len: u16) -> Self {
+        Self::new_for_tm(apid, SequenceFlags::Unsegmented, seq_count, data_len)
+    }
+
+    delegate! {
+        to self.packet_id {
+            /// Returns [false] and fails if the APID exceeds [MAX_APID]
+            #[inline]
+            pub fn set_apid(&mut self, apid: u16) -> bool;
+        }
+    }
+
+    delegate! {
+        to self.psc {
+            /// Returns [false] and fails if the sequence count exceeds [MAX_SEQ_COUNT]
+            #[inline]
+            pub fn set_seq_count(&mut self, seq_count: u16) -> bool;
+        }
+    }
+
+    #[inline]
     pub fn set_seq_flags(&mut self, seq_flags: SequenceFlags) {
         self.psc.seq_flags = seq_flags;
     }
 
+    #[inline]
     pub fn set_sec_header_flag(&mut self) {
         self.packet_id.sec_header_flag = true;
     }
 
+    #[inline]
     pub fn clear_sec_header_flag(&mut self) {
         self.packet_id.sec_header_flag = false;
     }
 
+    #[inline]
     pub fn set_packet_type(&mut self, packet_type: PacketType) {
         self.packet_id.ptype = packet_type;
     }
@@ -646,6 +780,7 @@ impl CcsdsPacket for SpHeader {
 }
 
 impl CcsdsPrimaryHeader for SpHeader {
+    #[inline]
     fn from_composite_fields(
         packet_id: PacketId,
         psc: PacketSequenceCtrl,
@@ -713,9 +848,12 @@ pub mod zc {
             ((self.version_packet_id.get() >> 13) as u8) & 0b111
         }
 
+        #[inline]
         fn packet_id(&self) -> PacketId {
             PacketId::from(self.packet_id_raw())
         }
+
+        #[inline]
         fn psc(&self) -> PacketSequenceCtrl {
             PacketSequenceCtrl::from(self.psc_raw())
         }
@@ -725,10 +863,12 @@ pub mod zc {
             self.data_len.get()
         }
 
+        #[inline]
         fn packet_id_raw(&self) -> u16 {
             self.version_packet_id.get() & (!VERSION_MASK)
         }
 
+        #[inline]
         fn psc_raw(&self) -> u16 {
             self.psc.get()
         }
@@ -752,6 +892,8 @@ pub mod zc {
 pub(crate) mod tests {
     use std::collections::HashSet;
 
+    #[allow(unused_imports)]
+    use crate::ByteConversionError;
     #[cfg(feature = "serde")]
     use crate::CcsdsPrimaryHeader;
     use crate::{
@@ -768,12 +910,12 @@ pub(crate) mod tests {
     use serde::{de::DeserializeOwned, Serialize};
 
     const CONST_SP: SpHeader = SpHeader::new(
-        PacketId::const_tc(true, 0x36),
+        PacketId::new_for_tc(true, 0x36),
-        PacketSequenceCtrl::const_new(SequenceFlags::ContinuationSegment, 0x88),
+        PacketSequenceCtrl::new(SequenceFlags::ContinuationSegment, 0x88),
         0x90,
     );
 
-    const PACKET_ID_TM: PacketId = PacketId::const_tm(true, 0x22);
+    const PACKET_ID_TM: PacketId = PacketId::new_for_tm(true, 0x22);
 
     #[cfg(feature = "serde")]
     pub(crate) fn generic_serde_test<T: Serialize + DeserializeOwned + PartialEq + Debug>(
@@ -785,11 +927,12 @@ pub(crate) mod tests {
     }
 
     #[test]
+    #[allow(clippy::assertions_on_constants)]
     fn verify_const_packet_id() {
         assert_eq!(PACKET_ID_TM.apid(), 0x22);
         assert!(PACKET_ID_TM.sec_header_flag);
         assert_eq!(PACKET_ID_TM.ptype, PacketType::Tm);
-        let const_tc_id = PacketId::const_tc(true, 0x23);
+        let const_tc_id = PacketId::new_for_tc(true, 0x23);
         assert_eq!(const_tc_id.ptype, PacketType::Tc);
     }
 
@@ -798,32 +941,32 @@ 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]
     fn test_packet_id_ctors() {
-        let packet_id = PacketId::new(PacketType::Tc, true, 0x1ff);
+        let packet_id = PacketId::new_checked(PacketType::Tc, true, 0x1ff);
         assert!(packet_id.is_some());
         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);
+        let packet_id_tc = PacketId::new_for_tc_checked(true, 0x1ff);
         assert!(packet_id_tc.is_some());
         let packet_id_tc = packet_id_tc.unwrap();
         assert_eq!(packet_id_tc, packet_id);
-        let packet_id_tm = PacketId::tm(true, 0x2ff);
+        let packet_id_tm = PacketId::new_for_tm_checked(true, 0x2ff);
         assert!(packet_id_tm.is_some());
         let packet_id_tm = packet_id_tm.unwrap();
-        assert_eq!(packet_id_tm.sec_header_flag, true);
+        assert!(packet_id_tm.sec_header_flag);
         assert_eq!(packet_id_tm.ptype, PacketType::Tm);
         assert_eq!(packet_id_tm.apid, 0x2ff);
     }
 
     #[test]
     fn verify_const_sp_header() {
-        assert_eq!(CONST_SP.sec_header_flag(), true);
+        assert!(CONST_SP.sec_header_flag());
         assert_eq!(CONST_SP.apid(), 0x36);
         assert_eq!(
             CONST_SP.sequence_flags(),
@@ -864,7 +1007,7 @@ pub(crate) mod tests {
     #[test]
     fn test_packet_id() {
         let packet_id =
-            PacketId::new(PacketType::Tm, false, 0x42).expect("Packet ID creation failed");
+            PacketId::new_checked(PacketType::Tm, false, 0x42).expect("Packet ID creation failed");
         assert_eq!(packet_id.raw(), 0x0042);
         let packet_id_from_raw = PacketId::from(packet_id.raw());
         assert_eq!(
@@ -872,26 +1015,26 @@ pub(crate) mod tests {
             PacketType::Tm
         );
         assert_eq!(packet_id_from_raw, packet_id);
-        let packet_id_from_new = PacketId::new(PacketType::Tm, false, 0x42).unwrap();
+        let packet_id_from_new = PacketId::new_checked(PacketType::Tm, false, 0x42).unwrap();
         assert_eq!(packet_id_from_new, packet_id);
     }
 
     #[test]
     fn test_invalid_packet_id() {
-        let packet_id_invalid = PacketId::new(PacketType::Tc, true, 0xFFFF);
+        let packet_id_invalid = PacketId::new_checked(PacketType::Tc, true, 0xFFFF);
         assert!(packet_id_invalid.is_none());
     }
 
     #[test]
     fn test_invalid_apid_setter() {
         let mut packet_id =
-            PacketId::new(PacketType::Tm, false, 0x42).expect("Packet ID creation failed");
+            PacketId::new_checked(PacketType::Tm, false, 0x42).expect("Packet ID creation failed");
         assert!(!packet_id.set_apid(0xffff));
     }
 
     #[test]
     fn test_invalid_seq_count() {
-        let mut psc = PacketSequenceCtrl::new(SequenceFlags::ContinuationSegment, 77)
+        let mut psc = PacketSequenceCtrl::new_checked(SequenceFlags::ContinuationSegment, 77)
             .expect("PSC creation failed");
         assert_eq!(psc.seq_count(), 77);
         assert!(!psc.set_seq_count(0xffff));
@@ -899,7 +1042,7 @@ pub(crate) mod tests {
 
     #[test]
     fn test_packet_seq_ctrl() {
-        let mut psc = PacketSequenceCtrl::new(SequenceFlags::ContinuationSegment, 77)
+        let mut psc = PacketSequenceCtrl::new_checked(SequenceFlags::ContinuationSegment, 77)
             .expect("PSC creation failed");
         assert_eq!(psc.raw(), 77);
         let psc_from_raw = PacketSequenceCtrl::from(psc.raw());
@@ -908,16 +1051,18 @@ pub(crate) mod tests {
         assert!(!psc.set_seq_count(2u16.pow(15)));
         assert_eq!(psc.raw(), 77);
 
-        let psc_invalid = PacketSequenceCtrl::new(SequenceFlags::FirstSegment, 0xFFFF);
+        let psc_invalid = PacketSequenceCtrl::new_checked(SequenceFlags::FirstSegment, 0xFFFF);
         assert!(psc_invalid.is_none());
-        let psc_from_new = PacketSequenceCtrl::new(SequenceFlags::ContinuationSegment, 77).unwrap();
+        let psc_from_new =
+            PacketSequenceCtrl::new_checked(SequenceFlags::ContinuationSegment, 77).unwrap();
         assert_eq!(psc_from_new, psc);
     }
 
     #[test]
     #[cfg(feature = "serde")]
     fn test_serde_sph() {
-        let sp_header = SpHeader::tc_unseg(0x42, 12, 0).expect("Error creating SP header");
+        let sp_header =
+            SpHeader::new_for_unseg_tc_checked(0x42, 12, 0).expect("Error creating SP header");
         assert_eq!(sp_header.ccsds_version(), 0b000);
         assert!(sp_header.is_tc());
         assert!(!sp_header.sec_header_flag());
@@ -939,7 +1084,8 @@ pub(crate) mod tests {
         assert_eq!(sp_header.ccsds_version(), 0b000);
         assert_eq!(sp_header.data_len, 0);
 
-        let sp_header = SpHeader::tm_unseg(0x7, 22, 36).expect("Error creating SP header");
+        let sp_header =
+            SpHeader::new_for_unseg_tm_checked(0x7, 22, 36).expect("Error creating SP header");
         assert_eq!(sp_header.ccsds_version(), 0b000);
         assert!(sp_header.is_tm());
         assert!(!sp_header.sec_header_flag());
@@ -953,8 +1099,8 @@ pub(crate) mod tests {
         assert_eq!(sp_header.ccsds_version(), 0b000);
 
         let from_comp_fields = SpHeader::from_composite_fields(
-            PacketId::new(PacketType::Tc, true, 0x42).unwrap(),
+            PacketId::new(PacketType::Tc, true, 0x42),
-            PacketSequenceCtrl::new(SequenceFlags::Unsegmented, 0x7).unwrap(),
+            PacketSequenceCtrl::new(SequenceFlags::Unsegmented, 0x7),
             0,
             None,
         );
@@ -971,7 +1117,7 @@ pub(crate) mod tests {
 
     #[test]
     fn test_setters() {
-        let sp_header = SpHeader::tc(0x42, SequenceFlags::Unsegmented, 25, 0);
+        let sp_header = SpHeader::new_for_tc_checked(0x42, SequenceFlags::Unsegmented, 25, 0);
         assert!(sp_header.is_some());
         let mut sp_header = sp_header.unwrap();
         sp_header.set_apid(0x12);
@@ -989,7 +1135,7 @@ pub(crate) mod tests {
 
     #[test]
     fn test_tc_ctor() {
-        let sp_header = SpHeader::tc(0x42, SequenceFlags::Unsegmented, 25, 0);
+        let sp_header = SpHeader::new_for_tc_checked(0x42, SequenceFlags::Unsegmented, 25, 0);
         assert!(sp_header.is_some());
         let sp_header = sp_header.unwrap();
         verify_sp_fields(PacketType::Tc, &sp_header);
@@ -997,23 +1143,35 @@ pub(crate) mod tests {
 
     #[test]
     fn test_tc_ctor_unseg() {
-        let sp_header = SpHeader::tc_unseg(0x42, 25, 0);
+        let sp_header = SpHeader::new_for_unseg_tc_checked(0x42, 25, 0);
         assert!(sp_header.is_some());
         let sp_header = sp_header.unwrap();
         verify_sp_fields(PacketType::Tc, &sp_header);
     }
 
+    #[test]
+    fn test_tc_ctor_unseg_const() {
+        let sp_header = SpHeader::new_for_unseg_tc(0x42, 25, 0);
+        verify_sp_fields(PacketType::Tc, &sp_header);
+    }
+
     #[test]
     fn test_tm_ctor() {
-        let sp_header = SpHeader::tm(0x42, SequenceFlags::Unsegmented, 25, 0);
+        let sp_header = SpHeader::new_for_tm_checked(0x42, SequenceFlags::Unsegmented, 25, 0);
         assert!(sp_header.is_some());
         let sp_header = sp_header.unwrap();
         verify_sp_fields(PacketType::Tm, &sp_header);
     }
 
+    #[test]
+    fn test_tm_ctor_const() {
+        let sp_header = SpHeader::new_for_tm(0x42, SequenceFlags::Unsegmented, 25, 0);
+        verify_sp_fields(PacketType::Tm, &sp_header);
+    }
+
     #[test]
     fn test_tm_ctor_unseg() {
-        let sp_header = SpHeader::tm_unseg(0x42, 25, 0);
+        let sp_header = SpHeader::new_for_unseg_tm_checked(0x42, 25, 0);
         assert!(sp_header.is_some());
         let sp_header = sp_header.unwrap();
         verify_sp_fields(PacketType::Tm, &sp_header);
@@ -1031,8 +1189,8 @@ pub(crate) mod tests {
     fn test_zc_sph() {
         use zerocopy::AsBytes;
 
-        let sp_header =
+        let sp_header = SpHeader::new_for_unseg_tc_checked(0x7FF, pow(2, 14) - 1, 0)
-            SpHeader::tc_unseg(0x7FF, pow(2, 14) - 1, 0).expect("Error creating SP header");
+            .expect("Error creating SP header");
         assert_eq!(sp_header.ptype(), PacketType::Tc);
         assert_eq!(sp_header.apid(), 0x7FF);
         assert_eq!(sp_header.data_len(), 0);
@@ -1097,4 +1255,28 @@ pub(crate) mod tests {
         let mut id_set = HashSet::new();
         id_set.insert(PacketId::from(1_u16));
     }
+
+    #[test]
+    fn sp_header_from_apid() {
+        let sp_header = SpHeader::new_from_apid(0x03);
+        assert_eq!(sp_header.apid(), 0x03);
+    }
+
+    #[test]
+    fn sp_header_from_apid_checked() {
+        let sp_header = SpHeader::new_from_apid_checked(0x03).unwrap();
+        assert_eq!(sp_header.apid(), 0x03);
+    }
+
+    #[cfg(feature = "defmt")]
+    fn is_defmt_format<T: defmt::Format>(_t: T) {}
+
+    #[test]
+    #[cfg(feature = "defmt")]
+    fn test_defmt_format() {
+        is_defmt_format(ByteConversionError::ToSliceTooSmall {
+            found: 1,
+            expected: 2,
+        });
+    }
 }

src/time/ascii.rs

@@ -40,13 +40,11 @@ pub mod alloc_mod_chrono {
     };
 
     /// Generates a time code formatter using the [FMT_STR_CODE_A_WITH_SIZE] format.
-    #[cfg_attr(doc_cfg, doc(cfg(all(feature = "alloc", feature = "chrono"))))]
     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_A_TERMINATED_WITH_SIZE] format.
-    #[cfg_attr(doc_cfg, doc(cfg(all(feature = "alloc", feature = "chrono"))))]
     pub fn generate_time_code_a_terminated(
         date: &DateTime<Utc>,
     ) -> DelayedFormat<StrftimeItems<'static>> {
@@ -54,13 +52,11 @@ pub mod alloc_mod_chrono {
     }
 
     /// Generates a time code formatter using the [FMT_STR_CODE_B_WITH_SIZE] format.
-    #[cfg_attr(doc_cfg, doc(cfg(all(feature = "alloc", feature = "chrono"))))]
     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.
-    #[cfg_attr(doc_cfg, doc(cfg(all(feature = "alloc", feature = "chrono"))))]
     pub fn generate_time_code_b_terminated(
         date: &DateTime<Utc>,
     ) -> DelayedFormat<StrftimeItems<'static>> {

src/time/cds.rs

@@ -1,7 +1,7 @@
 //! Module to generate or read CCSDS Day Segmented (CDS) timestamps as specified in
 //! [CCSDS 301.0-B-4](https://public.ccsds.org/Pubs/301x0b4e1.pdf) section 3.3 .
 //!
-//! The core data structure to do this is the [TimeProvider] struct and the
+//! The core data structure to do this is the [CdsTime] struct and the
 //! [get_dyn_time_provider_from_bytes] function to retrieve correct instances of the
 //! struct from a bytestream.
 use crate::private::Sealed;
@@ -34,8 +34,9 @@ use core::any::Any;
 use serde::{Deserialize, Serialize};
 
 use super::{
-    ccsds_to_unix_days, unix_to_ccsds_days, CcsdsTimeCode, CcsdsTimeProvider, TimeReader,
+    ccsds_to_unix_days, unix_to_ccsds_days, CcsdsTimeCode, CcsdsTimeProvider,
-    TimeWriter, TimestampError, UnixTime, MS_PER_DAY, SECONDS_PER_DAY,
+    DateBeforeCcsdsEpochError, TimeReader, TimeWriter, TimestampError, UnixTime, MS_PER_DAY,
+    SECONDS_PER_DAY,
 };
 
 /// Base value for the preamble field for a time field parser to determine the time field type.
@@ -58,7 +59,7 @@ pub trait ProvidesDaysLength: Sealed + Clone {
         + Into<i64>;
 }
 
-/// Type level token to be used as a generic parameter to [TimeProvider].
+/// Type level token to be used as a generic parameter to [CdsTime].
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 pub struct DaysLen16Bits {}
 
@@ -67,7 +68,7 @@ impl ProvidesDaysLength for DaysLen16Bits {
     type FieldType = u16;
 }
 
-/// Type level token to be used as a generic parameter to [TimeProvider].
+/// Type level token to be used as a generic parameter to [CdsTime].
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 pub struct DaysLen24Bits {}
 impl Sealed for DaysLen24Bits {}
@@ -77,6 +78,7 @@ impl ProvidesDaysLength for DaysLen24Bits {
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum LengthOfDaySegment {
     Short16Bits = 0,
     Long24Bits = 1,
@@ -93,12 +95,14 @@ pub enum SubmillisPrecision {
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum CdsError {
     /// CCSDS days value exceeds maximum allowed size or is negative
     InvalidCcsdsDays(i64),
     /// There are distinct constructors depending on the days field width detected in the preamble
     /// field. This error will be returned if there is a missmatch.
     InvalidCtorForDaysOfLenInPreamble(LengthOfDaySegment),
+    DateBeforeCcsdsEpoch(DateBeforeCcsdsEpochError),
 }
 
 impl Display for CdsError {
@@ -113,12 +117,27 @@ impl Display for CdsError {
                     "wrong constructor for length of day {length_of_day:?} detected in preamble",
                 )
             }
+            CdsError::DateBeforeCcsdsEpoch(e) => write!(f, "date before CCSDS epoch: {e}"),
         }
     }
 }
 
 #[cfg(feature = "std")]
-impl Error for CdsError {}
+impl Error for CdsError {
+    fn source(&self) -> Option<&(dyn Error + 'static)> {
+        match self {
+            CdsError::DateBeforeCcsdsEpoch(e) => Some(e),
+            _ => None,
+        }
+    }
+}
+
+impl From<DateBeforeCcsdsEpochError> for CdsError {
+    fn from(value: DateBeforeCcsdsEpochError) -> Self {
+        Self::DateBeforeCcsdsEpoch(value)
+    }
+}
+
 pub fn length_of_day_segment_from_pfield(pfield: u8) -> LengthOfDaySegment {
     if (pfield >> 2) & 0b1 == 1 {
         return LengthOfDaySegment::Long24Bits;
@@ -126,6 +145,7 @@ pub fn length_of_day_segment_from_pfield(pfield: u8) -> LengthOfDaySegment {
     LengthOfDaySegment::Short16Bits
 }
 
+#[inline]
 pub fn precision_from_pfield(pfield: u8) -> SubmillisPrecision {
     match pfield & 0b11 {
         0b01 => SubmillisPrecision::Microseconds,
@@ -156,19 +176,19 @@ pub fn precision_from_pfield(pfield: u8) -> SubmillisPrecision {
 ///
 /// ```
 /// use core::time::Duration;
-/// use spacepackets::time::cds::{TimeProvider, length_of_day_segment_from_pfield, LengthOfDaySegment};
+/// use spacepackets::time::cds::{CdsTime, length_of_day_segment_from_pfield, LengthOfDaySegment};
-/// use spacepackets::time::{TimeWriter, CcsdsTimeCodes, CcsdsTimeProvider};
+/// use spacepackets::time::{TimeWriter, CcsdsTimeCode, CcsdsTimeProvider};
 ///
-/// let timestamp_now = TimeProvider::from_now_with_u16_days().unwrap();
+/// let timestamp_now = CdsTime::now_with_u16_days().unwrap();
 /// let mut raw_stamp = [0; 7];
 /// {
 ///     let written = timestamp_now.write_to_bytes(&mut raw_stamp).unwrap();
-///     assert_eq!((raw_stamp[0] >> 4) & 0b111, CcsdsTimeCodes::Cds as u8);
+///     assert_eq!((raw_stamp[0] >> 4) & 0b111, CcsdsTimeCode::Cds as u8);
 ///     assert_eq!(written, 7);
 /// }
 /// {
 ///     assert_eq!(length_of_day_segment_from_pfield(raw_stamp[0]), LengthOfDaySegment::Short16Bits);
-///     let read_result = TimeProvider::from_bytes_with_u16_days(&raw_stamp);
+///     let read_result = CdsTime::from_bytes_with_u16_days(&raw_stamp);
 ///     assert!(read_result.is_ok());
 ///     let stamp_deserialized = read_result.unwrap();
 ///     assert_eq!(stamp_deserialized.len_as_bytes(), 7);
@@ -188,7 +208,7 @@ pub struct CdsTime<DaysLen: ProvidesDaysLength = DaysLen16Bits> {
     submillis: u32,
     /// This is not strictly necessary but still cached because it significantly simplifies the
     /// calculation of [`DateTime<Utc>`].
-    unix_stamp: UnixTime,
+    unix_time: UnixTime,
 }
 
 /// Common properties for all CDS time providers.
@@ -226,11 +246,11 @@ impl ConversionFromUnix {
         unix_seconds: i64,
         subsec_nanos: u32,
         precision: SubmillisPrecision,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, DateBeforeCcsdsEpochError> {
         let (unix_days, secs_of_day) = calc_unix_days_and_secs_of_day(unix_seconds);
         let ccsds_days = unix_to_ccsds_days(unix_days);
         if ccsds_days == 0 && (secs_of_day > 0 || subsec_nanos > 0) || ccsds_days < 0 {
-            return Err(TimestampError::DateBeforeCcsdsEpoch(
+            return Err(DateBeforeCcsdsEpochError(
                 UnixTime::new_checked(unix_seconds, subsec_nanos)
                     .expect("unix timestamp creation failed"),
             ));
@@ -253,24 +273,29 @@ impl ConversionFromUnix {
 }
 
 impl CdsCommon for ConversionFromUnix {
+    #[inline]
     fn submillis_precision(&self) -> SubmillisPrecision {
         self.submilis_prec
     }
 
+    #[inline]
     fn ms_of_day(&self) -> u32 {
         self.ms_of_day
     }
 
+    #[inline]
     fn ccsds_days_as_u32(&self) -> u32 {
         self.ccsds_days
     }
 
+    #[inline]
     fn submillis(&self) -> u32 {
         self.submillis
     }
 }
 
 impl CdsConverter for ConversionFromUnix {
+    #[inline]
     fn unix_days_seconds(&self) -> i64 {
         self.unix_days_seconds
     }
@@ -283,24 +308,31 @@ struct ConversionFromChronoDatetime {
 }
 
 impl CdsCommon for ConversionFromChronoDatetime {
+    #[inline]
     fn submillis_precision(&self) -> SubmillisPrecision {
         self.submillis_prec
     }
 
     delegate! {
         to self.unix_conversion {
+            #[inline]
             fn ms_of_day(&self) -> u32;
+            #[inline]
             fn ccsds_days_as_u32(&self) -> u32;
         }
     }
 
+    #[inline]
     fn submillis(&self) -> u32 {
         self.submillis
     }
 }
 
 impl CdsConverter for ConversionFromChronoDatetime {
-    delegate! {to self.unix_conversion { fn unix_days_seconds(&self) -> i64; }}
+    delegate! {to self.unix_conversion {
+        #[inline]
+        fn unix_days_seconds(&self) -> i64;
+    }}
 }
 
 #[inline]
@@ -318,19 +350,19 @@ fn calc_unix_days_and_secs_of_day(unix_seconds: i64) -> (i64, u32) {
 
 #[cfg(feature = "chrono")]
 impl ConversionFromChronoDatetime {
-    fn new(dt: &chrono::DateTime<chrono::Utc>) -> Result<Self, TimestampError> {
+    fn new(dt: &chrono::DateTime<chrono::Utc>) -> Result<Self, DateBeforeCcsdsEpochError> {
         Self::new_generic(dt, SubmillisPrecision::Absent)
     }
 
     fn new_with_submillis_us_prec(
         dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, DateBeforeCcsdsEpochError> {
         Self::new_generic(dt, SubmillisPrecision::Microseconds)
     }
 
     fn new_with_submillis_ps_prec(
         dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, DateBeforeCcsdsEpochError> {
         Self::new_generic(dt, SubmillisPrecision::Picoseconds)
     }
 
@@ -338,10 +370,10 @@ impl ConversionFromChronoDatetime {
     fn new_generic(
         dt: &chrono::DateTime<chrono::Utc>,
         prec: SubmillisPrecision,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, DateBeforeCcsdsEpochError> {
         // The CDS timestamp does not support timestamps before the CCSDS epoch.
         if dt.year() < 1958 {
-            return Err(TimestampError::DateBeforeCcsdsEpoch(UnixTime::from(*dt)));
+            return Err(DateBeforeCcsdsEpochError(UnixTime::from(*dt)));
         }
         // The contained values in the conversion should be all positive now
         let unix_conversion =
@@ -434,31 +466,28 @@ impl CdsConverter for ConversionFromNow {
 }
 
 #[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
 pub trait DynCdsTimeProvider: CcsdsTimeProvider + CdsTimestamp + TimeWriter + Any {}
 #[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
 impl DynCdsTimeProvider for CdsTime<DaysLen16Bits> {}
 #[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
 impl DynCdsTimeProvider for CdsTime<DaysLen24Bits> {}
 
-/// This function returns the correct [TimeProvider] instance from a raw byte array
+/// This function returns the correct [CdsTime] instance from a raw byte array
 /// by checking the length of days field. It also checks the CCSDS time code for correctness.
 ///
 /// # Example
 ///
 /// ```
 /// use spacepackets::time::cds::{
-///     TimeProvider, LengthOfDaySegment, get_dyn_time_provider_from_bytes, SubmillisPrecision,
+///     CdsTime, LengthOfDaySegment, get_dyn_time_provider_from_bytes, SubmillisPrecision,
 /// };
-/// use spacepackets::time::{TimeWriter, CcsdsTimeCodes, CcsdsTimeProvider};
+/// use spacepackets::time::{TimeWriter, CcsdsTimeCode, CcsdsTimeProvider};
 ///
-/// let timestamp_now = TimeProvider::new_with_u16_days(24, 24);
+/// let timestamp_now = CdsTime::new_with_u16_days(24, 24);
 /// let mut raw_stamp = [0; 7];
 /// {
 ///     let written = timestamp_now.write_to_bytes(&mut raw_stamp).unwrap();
-///     assert_eq!((raw_stamp[0] >> 4) & 0b111, CcsdsTimeCodes::Cds as u8);
+///     assert_eq!((raw_stamp[0] >> 4) & 0b111, CcsdsTimeCode::Cds as u8);
 ///     assert_eq!(written, 7);
 /// }
 /// {
@@ -470,7 +499,6 @@ impl DynCdsTimeProvider for CdsTime<DaysLen24Bits> {}
 /// }
 /// ```
 #[cfg(feature = "alloc")]
-#[cfg_attr(doc_cfg, doc(cfg(feature = "alloc")))]
 pub fn get_dyn_time_provider_from_bytes(
     buf: &[u8],
 ) -> Result<Box<dyn DynCdsTimeProvider>, TimestampError> {
@@ -641,7 +669,7 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CdsTime<ProvidesDaysLen> {
         if let Some(precision) = self.precision_as_ns() {
             subsec_nanos += precision;
         }
-        self.unix_stamp = UnixTime::new(unix_days_seconds, subsec_nanos);
+        self.unix_time = UnixTime::new(unix_days_seconds, subsec_nanos);
     }
 
     fn length_check(&self, buf: &[u8], len_as_bytes: usize) -> Result<(), TimestampError> {
@@ -668,7 +696,7 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CdsTime<ProvidesDaysLen> {
             pfield: Self::generate_p_field(days_len, SubmillisPrecision::Absent),
             ccsds_days,
             ms_of_day,
-            unix_stamp: Default::default(),
+            unix_time: Default::default(),
             submillis: 0,
         };
         let unix_days_seconds = ccsds_to_unix_days(i64::from(ccsds_days)) * SECONDS_PER_DAY as i64;
@@ -680,7 +708,7 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CdsTime<ProvidesDaysLen> {
     fn from_dt_generic(
         dt: &chrono::DateTime<chrono::Utc>,
         days_len: LengthOfDaySegment,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         let conv_from_dt = ConversionFromChronoDatetime::new(dt)?;
         Self::generic_from_conversion(days_len, conv_from_dt)
     }
@@ -689,7 +717,7 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CdsTime<ProvidesDaysLen> {
     fn from_dt_generic_us_prec(
         dt: &chrono::DateTime<chrono::Utc>,
         days_len: LengthOfDaySegment,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         let conv_from_dt = ConversionFromChronoDatetime::new_with_submillis_us_prec(dt)?;
         Self::generic_from_conversion(days_len, conv_from_dt)
     }
@@ -698,7 +726,7 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CdsTime<ProvidesDaysLen> {
     fn from_dt_generic_ps_prec(
         dt: &chrono::DateTime<chrono::Utc>,
         days_len: LengthOfDaySegment,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         let conv_from_dt = ConversionFromChronoDatetime::new_with_submillis_ps_prec(dt)?;
         Self::generic_from_conversion(days_len, conv_from_dt)
     }
@@ -707,48 +735,46 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CdsTime<ProvidesDaysLen> {
         unix_stamp: &UnixTime,
         days_len: LengthOfDaySegment,
         submillis_prec: SubmillisPrecision,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         let conv_from_dt =
             ConversionFromUnix::new(unix_stamp.secs, unix_stamp.subsec_nanos, submillis_prec)?;
         Self::generic_from_conversion(days_len, conv_from_dt)
     }
 
     #[cfg(feature = "std")]
-    fn from_now_generic(days_len: LengthOfDaySegment) -> Result<Self, StdTimestampError> {
+    fn now_generic(days_len: LengthOfDaySegment) -> Result<Self, StdTimestampError> {
         let conversion_from_now = ConversionFromNow::new()?;
         Self::generic_from_conversion(days_len, conversion_from_now)
-            .map_err(StdTimestampError::Timestamp)
+            .map_err(|e| StdTimestampError::Timestamp(TimestampError::from(e)))
     }
 
     #[cfg(feature = "std")]
-    fn from_now_generic_us_prec(days_len: LengthOfDaySegment) -> Result<Self, StdTimestampError> {
+    fn now_generic_with_us_prec(days_len: LengthOfDaySegment) -> Result<Self, StdTimestampError> {
         let conversion_from_now = ConversionFromNow::new_with_submillis_us_prec()?;
         Self::generic_from_conversion(days_len, conversion_from_now)
-            .map_err(StdTimestampError::Timestamp)
+            .map_err(|e| StdTimestampError::Timestamp(TimestampError::from(e)))
     }
 
     #[cfg(feature = "std")]
     fn from_now_generic_ps_prec(days_len: LengthOfDaySegment) -> Result<Self, StdTimestampError> {
         let conversion_from_now = ConversionFromNow::new_with_submillis_ps_prec()?;
         Self::generic_from_conversion(days_len, conversion_from_now)
-            .map_err(StdTimestampError::Timestamp)
+            .map_err(|e| StdTimestampError::Timestamp(TimestampError::from(e)))
     }
 
     fn generic_from_conversion<C: CdsConverter>(
         days_len: LengthOfDaySegment,
         converter: C,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
-        let ccsds_days: ProvidesDaysLen::FieldType =
+        let ccsds_days: ProvidesDaysLen::FieldType = converter
-            converter.ccsds_days_as_u32().try_into().map_err(|_| {
+            .ccsds_days_as_u32()
-                TimestampError::Cds(CdsError::InvalidCcsdsDays(
+            .try_into()
-                    converter.ccsds_days_as_u32().into(),
+            .map_err(|_| CdsError::InvalidCcsdsDays(converter.ccsds_days_as_u32().into()))?;
-                ))
-            })?;
         let mut provider = Self {
             pfield: Self::generate_p_field(days_len, converter.submillis_precision()),
             ccsds_days,
             ms_of_day: converter.ms_of_day(),
-            unix_stamp: Default::default(),
+            unix_time: Default::default(),
             submillis: converter.submillis(),
         };
         provider.setup(converter.unix_days_seconds(), converter.ms_of_day());
@@ -776,7 +802,6 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CdsTime<ProvidesDaysLen> {
     }
 
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
     pub fn update_from_now(&mut self) -> Result<(), StdTimestampError> {
         let conversion_from_now = self.generic_conversion_from_now()?;
         let ccsds_days: ProvidesDaysLen::FieldType = conversion_from_now
@@ -812,22 +837,19 @@ impl CdsTime<DaysLen24Bits> {
 
     /// Generate a time stamp from the current time using the system clock.
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    pub fn now_with_u24_days() -> Result<Self, StdTimestampError> {
-    pub fn from_now_with_u24_days() -> Result<Self, StdTimestampError> {
+        Self::now_generic(LengthOfDaySegment::Long24Bits)
-        Self::from_now_generic(LengthOfDaySegment::Long24Bits)
     }
 
-    /// Create a provider from a [`DateTime<Utc>`] struct.
+    /// Create a provider from a [`chrono::DateTime<chrono::Utc>`] struct.
     ///
     /// ## Errors
     ///
-    /// This function will return [TimestampError::DateBeforeCcsdsEpoch] or
+    /// This function will return [CdsError::DateBeforeCcsdsEpoch] if the time is before the CCSDS
-    /// [TimestampError::Cds] if the time is before the CCSDS epoch (1958-01-01T00:00:00+00:00)
+    /// epoch (1958-01-01T00:00:00+00:00) or the CCSDS days value exceeds the allowed bit width
-    /// or the CCSDS days value exceeds the allowed bit width (24 bits).
+    /// (24 bits).
     #[cfg(feature = "chrono")]
-    pub fn from_dt_with_u24_days(
+    pub fn from_dt_with_u24_days(dt: &chrono::DateTime<chrono::Utc>) -> Result<Self, CdsError> {
-        dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
         Self::from_dt_generic(dt, LengthOfDaySegment::Long24Bits)
     }
 
@@ -835,13 +857,13 @@ impl CdsTime<DaysLen24Bits> {
     ///
     /// ## Errors
     ///
-    /// This function will return [TimestampError::DateBeforeCcsdsEpoch] or
+    /// This function will return [CdsError::DateBeforeCcsdsEpoch] if the time is before the CCSDS
-    /// [TimestampError::Cds] if the time is before the CCSDS epoch (1958-01-01T00:00:00+00:00)
+    /// epoch (1958-01-01T00:00:00+00:00) or the CCSDS days value exceeds the allowed bit width
-    /// or the CCSDS days value exceeds the allowed bit width (24 bits).
+    /// (24 bits).
-    pub fn from_unix_stamp_with_u24_days(
+    pub fn from_unix_time_with_u24_day(
         unix_stamp: &UnixTime,
         submillis_prec: SubmillisPrecision,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         Self::from_unix_generic(unix_stamp, LengthOfDaySegment::Long24Bits, submillis_prec)
     }
 
@@ -849,7 +871,7 @@ impl CdsTime<DaysLen24Bits> {
     #[cfg(feature = "chrono")]
     pub fn from_dt_with_u24_days_us_precision(
         dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         Self::from_dt_generic_us_prec(dt, LengthOfDaySegment::Long24Bits)
     }
 
@@ -857,22 +879,20 @@ impl CdsTime<DaysLen24Bits> {
     #[cfg(feature = "chrono")]
     pub fn from_dt_with_u24_days_ps_precision(
         dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         Self::from_dt_generic_ps_prec(dt, LengthOfDaySegment::Long24Bits)
     }
 
-    /// Like [Self::from_now_with_u24_days] but with microsecond sub-millisecond precision.
+    /// Like [Self::now_with_u24_days] but with microsecond sub-millisecond precision.
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    pub fn now_with_u24_days_us_precision() -> Result<Self, StdTimestampError> {
-    pub fn from_now_with_u24_days_us_precision() -> Result<Self, StdTimestampError> {
+        Self::now_generic_with_us_prec(LengthOfDaySegment::Long24Bits)
-        Self::from_now_generic_us_prec(LengthOfDaySegment::Long24Bits)
     }
 
-    /// Like [Self::from_now_with_u24_days] but with picoseconds sub-millisecond precision.
+    /// Like [Self::now_with_u24_days] but with picoseconds sub-millisecond precision.
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    pub fn now_with_u24_days_ps_precision() -> Result<Self, StdTimestampError> {
-    pub fn from_now_with_u24_days_ps_precision() -> Result<Self, StdTimestampError> {
+        Self::now_generic_with_us_prec(LengthOfDaySegment::Long24Bits)
-        Self::from_now_generic_us_prec(LengthOfDaySegment::Long24Bits)
     }
 
     pub fn from_bytes_with_u24_days(buf: &[u8]) -> Result<Self, TimestampError> {
@@ -909,36 +929,33 @@ impl CdsTime<DaysLen16Bits> {
         Self::generic_new(LengthOfDaySegment::Short16Bits, ccsds_days, ms_of_day).unwrap()
     }
 
-    /// Create a provider from a [`DateTime<Utc>`] struct.
+    /// Create a provider from a [`chrono::DateTime<Utc>`] struct.
     ///
-    /// This function will return a [TimestampError::DateBeforeCcsdsEpoch] or a
+    /// This function will return a [CdsError::DateBeforeCcsdsEpoch] if the time is before the
-    /// [TimestampError::Cds] if the time is before the CCSDS epoch (01-01-1958 00:00:00) or
+    /// CCSDS epoch (01-01-1958 00:00:00) or the CCSDS days value exceeds the allowed bit width
-    /// the CCSDS days value exceeds the allowed bit width (16 bits).
+    /// (16 bits).
     #[cfg(feature = "chrono")]
-    pub fn from_dt_with_u16_days(
+    pub fn from_dt_with_u16_days(dt: &chrono::DateTime<chrono::Utc>) -> Result<Self, CdsError> {
-        dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
         Self::from_dt_generic(dt, LengthOfDaySegment::Short16Bits)
     }
 
     /// Generate a time stamp from the current time using the system clock.
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    pub fn now_with_u16_days() -> Result<Self, StdTimestampError> {
-    pub fn from_now_with_u16_days() -> Result<Self, StdTimestampError> {
+        Self::now_generic(LengthOfDaySegment::Short16Bits)
-        Self::from_now_generic(LengthOfDaySegment::Short16Bits)
     }
 
     /// Create a provider from a generic UNIX timestamp (seconds since 1970-01-01T00:00:00+00:00).
     ///
     /// ## Errors
     ///
-    /// This function will return [TimestampError::DateBeforeCcsdsEpoch] or
+    /// This function will return [CdsError::DateBeforeCcsdsEpoch] if the time is before the CCSDS
-    /// [TimestampError::Cds] if the time is before the CCSDS epoch (1958-01-01T00:00:00+00:00)
+    /// epoch (1958-01-01T00:00:00+00:00) or the CCSDS days value exceeds the allowed bit width
-    /// or the CCSDS days value exceeds the allowed bit width (24 bits).
+    /// (24 bits).
-    pub fn from_unix_stamp_with_u16_days(
+    pub fn from_unix_time_with_u16_days(
         unix_stamp: &UnixTime,
         submillis_prec: SubmillisPrecision,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         Self::from_unix_generic(unix_stamp, LengthOfDaySegment::Short16Bits, submillis_prec)
     }
 
@@ -946,7 +963,7 @@ impl CdsTime<DaysLen16Bits> {
     #[cfg(feature = "chrono")]
     pub fn from_dt_with_u16_days_us_precision(
         dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         Self::from_dt_generic_us_prec(dt, LengthOfDaySegment::Short16Bits)
     }
 
@@ -954,20 +971,18 @@ impl CdsTime<DaysLen16Bits> {
     #[cfg(feature = "chrono")]
     pub fn from_dt_with_u16_days_ps_precision(
         dt: &chrono::DateTime<chrono::Utc>,
-    ) -> Result<Self, TimestampError> {
+    ) -> Result<Self, CdsError> {
         Self::from_dt_generic_ps_prec(dt, LengthOfDaySegment::Short16Bits)
     }
 
-    /// Like [Self::from_now_with_u16_days] but with microsecond sub-millisecond precision.
+    /// Like [Self::now_with_u16_days] but with microsecond sub-millisecond precision.
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    pub fn now_with_u16_days_us_precision() -> Result<Self, StdTimestampError> {
-    pub fn from_now_with_u16_days_us_precision() -> Result<Self, StdTimestampError> {
+        Self::now_generic_with_us_prec(LengthOfDaySegment::Short16Bits)
-        Self::from_now_generic_us_prec(LengthOfDaySegment::Short16Bits)
     }
 
-    /// Like [Self::from_now_with_u16_days] but with picosecond sub-millisecond precision.
+    /// Like [Self::now_with_u16_days] but with picosecond sub-millisecond precision.
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
     pub fn from_now_with_u16_days_ps_precision() -> Result<Self, StdTimestampError> {
         Self::from_now_generic_ps_prec(LengthOfDaySegment::Short16Bits)
     }
@@ -1168,7 +1183,7 @@ impl AddAssign<Duration> for CdsTime<DaysLen24Bits> {
 
 #[cfg(feature = "chrono")]
 impl TryFrom<chrono::DateTime<chrono::Utc>> for CdsTime<DaysLen16Bits> {
-    type Error = TimestampError;
+    type Error = CdsError;
 
     fn try_from(dt: chrono::DateTime<chrono::Utc>) -> Result<Self, Self::Error> {
         let conversion = ConversionFromChronoDatetime::new(&dt)?;
@@ -1178,8 +1193,7 @@ impl TryFrom<chrono::DateTime<chrono::Utc>> for CdsTime<DaysLen16Bits> {
 
 #[cfg(feature = "chrono")]
 impl TryFrom<chrono::DateTime<chrono::Utc>> for CdsTime<DaysLen24Bits> {
-    type Error = TimestampError;
+    type Error = CdsError;
-
     fn try_from(dt: chrono::DateTime<chrono::Utc>) -> Result<Self, Self::Error> {
         let conversion = ConversionFromChronoDatetime::new(&dt)?;
         Self::generic_from_conversion(LengthOfDaySegment::Long24Bits, conversion)
@@ -1201,16 +1215,16 @@ impl<ProvidesDaysLen: ProvidesDaysLength> CcsdsTimeProvider for CdsTime<Provides
 
     #[inline]
     fn unix_secs(&self) -> i64 {
-        self.unix_stamp.secs
+        self.unix_time.secs
     }
     #[inline]
     fn subsec_nanos(&self) -> u32 {
-        self.unix_stamp.subsec_nanos
+        self.unix_time.subsec_nanos
     }
 
     #[inline]
-    fn unix_stamp(&self) -> UnixTime {
+    fn unix_time(&self) -> UnixTime {
-        self.unix_stamp
+        self.unix_time
     }
 }
 
@@ -1357,7 +1371,7 @@ mod tests {
     #[test]
     fn test_time_stamp_zero_args() {
         let time_stamper = CdsTime::new_with_u16_days(0, 0);
-        let unix_stamp = time_stamper.unix_stamp();
+        let unix_stamp = time_stamper.unix_time();
         assert_eq!(
             unix_stamp.secs,
             (DAYS_CCSDS_TO_UNIX * SECONDS_PER_DAY as i32) as i64
@@ -1386,7 +1400,7 @@ mod tests {
     #[test]
     fn test_time_stamp_unix_epoch() {
         let time_stamper = CdsTime::new_with_u16_days((-DAYS_CCSDS_TO_UNIX) as u16, 0);
-        assert_eq!(time_stamper.unix_stamp().secs, 0);
+        assert_eq!(time_stamper.unix_time().secs, 0);
         assert_eq!(
             time_stamper.submillis_precision(),
             SubmillisPrecision::Absent
@@ -1463,7 +1477,7 @@ mod tests {
     fn test_write() {
         let mut buf = [0; 16];
         let time_stamper_0 = CdsTime::new_with_u16_days(0, 0);
-        let unix_stamp = time_stamper_0.unix_stamp();
+        let unix_stamp = time_stamper_0.unix_time();
         assert_eq!(
             unix_stamp.secs,
             (DAYS_CCSDS_TO_UNIX * SECONDS_PER_DAY as i32).into()
@@ -1609,14 +1623,14 @@ mod tests {
 
     #[test]
     fn test_time_now() {
-        let timestamp_now = CdsTime::from_now_with_u16_days().unwrap();
+        let timestamp_now = CdsTime::now_with_u16_days().unwrap();
         let compare_stamp = chrono::Utc::now();
         generic_now_test(timestamp_now, compare_stamp);
     }
 
     #[test]
     fn test_time_now_us_prec() {
-        let timestamp_now = CdsTime::from_now_with_u16_days_us_precision().unwrap();
+        let timestamp_now = CdsTime::now_with_u16_days_us_precision().unwrap();
         let compare_stamp = chrono::Utc::now();
         generic_now_test(timestamp_now, compare_stamp);
     }
@@ -1637,7 +1651,7 @@ mod tests {
 
     #[test]
     fn test_time_now_ps_prec_u24_days() {
-        let timestamp_now = CdsTime::from_now_with_u24_days_ps_precision().unwrap();
+        let timestamp_now = CdsTime::now_with_u24_days_ps_precision().unwrap();
         let compare_stamp = chrono::Utc::now();
         generic_now_test(timestamp_now, compare_stamp);
     }
@@ -1922,7 +1936,7 @@ mod tests {
     fn test_creation_from_unix_stamp_0_u16_days() {
         let unix_secs = 0;
         let subsec_millis = 0;
-        let time_provider = CdsTime::from_unix_stamp_with_u16_days(
+        let time_provider = CdsTime::from_unix_time_with_u16_days(
             &UnixTime::new(unix_secs, subsec_millis),
             SubmillisPrecision::Absent,
         )
@@ -1934,7 +1948,7 @@ mod tests {
     fn test_creation_from_unix_stamp_0_u24_days() {
         let unix_secs = 0;
         let subsec_millis = 0;
-        let time_provider = CdsTime::from_unix_stamp_with_u24_days(
+        let time_provider = CdsTime::from_unix_time_with_u24_day(
             &UnixTime::new(unix_secs, subsec_millis),
             SubmillisPrecision::Absent,
         )
@@ -1951,11 +1965,9 @@ mod tests {
             .unwrap()
             .and_local_timezone(chrono::Utc)
             .unwrap();
-        let time_provider = CdsTime::from_unix_stamp_with_u16_days(
+        let time_provider =
-            &datetime_utc.into(),
+            CdsTime::from_unix_time_with_u16_days(&datetime_utc.into(), SubmillisPrecision::Absent)
-            SubmillisPrecision::Absent,
+                .expect("creating provider from unix stamp failed");
-        )
-        .expect("creating provider from unix stamp failed");
         // https://www.timeanddate.com/date/durationresult.html?d1=01&m1=01&y1=1958&d2=14&m2=01&y2=2023
         // Leap years need to be accounted for as well.
         assert_eq!(time_provider.ccsds_days, 23754);
@@ -1971,7 +1983,7 @@ mod tests {
     fn test_creation_0_ccsds_days() {
         let unix_secs = DAYS_CCSDS_TO_UNIX as i64 * SECONDS_PER_DAY as i64;
         let subsec_millis = 0;
-        let time_provider = CdsTime::from_unix_stamp_with_u16_days(
+        let time_provider = CdsTime::from_unix_time_with_u16_days(
             &UnixTime::new(unix_secs, subsec_millis),
             SubmillisPrecision::Absent,
         )
@@ -1983,7 +1995,7 @@ mod tests {
     fn test_invalid_creation_from_unix_stamp_days_too_large() {
         let invalid_unix_secs: i64 = (u16::MAX as i64 + 1) * SECONDS_PER_DAY as i64;
         let subsec_millis = 0;
-        match CdsTime::from_unix_stamp_with_u16_days(
+        match CdsTime::from_unix_time_with_u16_days(
             &UnixTime::new(invalid_unix_secs, subsec_millis),
             SubmillisPrecision::Absent,
         ) {
@@ -1991,12 +2003,12 @@ mod tests {
                 panic!("creation should not succeed")
             }
             Err(e) => {
-                if let TimestampError::Cds(CdsError::InvalidCcsdsDays(days)) = e {
+                if let CdsError::InvalidCcsdsDays(days) = e {
                     assert_eq!(
                         days,
                         unix_to_ccsds_days(invalid_unix_secs / SECONDS_PER_DAY as i64)
                     );
-                    assert_eq!(e.to_string(), "cds error: invalid ccsds days 69919");
+                    assert_eq!(e.to_string(), "invalid ccsds days 69919");
                 } else {
                     panic!("unexpected error {}", e)
                 }
@@ -2010,7 +2022,7 @@ mod tests {
         // precisely 31-12-1957 23:59:55
         let unix_secs = DAYS_CCSDS_TO_UNIX * SECONDS_PER_DAY as i32 - 5;
         let subsec_millis = 0;
-        match CdsTime::from_unix_stamp_with_u16_days(
+        match CdsTime::from_unix_time_with_u16_days(
             &UnixTime::new(unix_secs as i64, subsec_millis),
             SubmillisPrecision::Absent,
         ) {
@@ -2018,8 +2030,8 @@ mod tests {
                 panic!("creation should not succeed")
             }
             Err(e) => {
-                if let TimestampError::DateBeforeCcsdsEpoch(dt) = e {
+                if let CdsError::DateBeforeCcsdsEpoch(DateBeforeCcsdsEpochError(unix_dt)) = e {
-                    let dt = dt.chrono_date_time();
+                    let dt = unix_dt.chrono_date_time();
                     if let chrono::LocalResult::Single(dt) = dt {
                         assert_eq!(dt.year(), 1957);
                         assert_eq!(dt.month(), 12);
@@ -2249,7 +2261,9 @@ mod tests {
             .unwrap();
         let time_provider = CdsTime::from_dt_with_u24_days(&datetime_utc);
         assert!(time_provider.is_err());
-        if let TimestampError::DateBeforeCcsdsEpoch(dt) = time_provider.unwrap_err() {
+        if let CdsError::DateBeforeCcsdsEpoch(DateBeforeCcsdsEpochError(dt)) =
+            time_provider.unwrap_err()
+        {
             assert_eq!(dt, datetime_utc.into());
         }
     }
@@ -2295,7 +2309,7 @@ mod tests {
     fn test_update_from_now() {
         let mut stamp = CdsTime::new_with_u16_days(0, 0);
         let _ = stamp.update_from_now();
-        let dt = stamp.unix_stamp().chrono_date_time().unwrap();
+        let dt = stamp.unix_time().chrono_date_time().unwrap();
         assert!(dt.year() > 2020);
     }
 
@@ -2308,7 +2322,7 @@ mod tests {
     #[test]
     #[cfg(feature = "serde")]
     fn test_serialization() {
-        let stamp_now = CdsTime::from_now_with_u16_days().expect("Error retrieving time");
+        let stamp_now = CdsTime::now_with_u16_days().expect("Error retrieving time");
         let val = to_allocvec(&stamp_now).expect("Serializing timestamp failed");
         assert!(val.len() > 0);
         let stamp_deser: CdsTime = from_bytes(&val).expect("Stamp deserialization failed");

src/time/mod.rs

@@ -1,7 +1,7 @@
 //! CCSDS Time Code Formats according to [CCSDS 301.0-B-4](https://public.ccsds.org/Pubs/301x0b4e1.pdf)
 use crate::ByteConversionError;
 #[cfg(feature = "chrono")]
-use chrono::{DateTime, LocalResult, TimeZone, Utc};
+use chrono::{TimeZone, Utc};
 use core::cmp::Ordering;
 use core::fmt::{Display, Formatter};
 use core::ops::{Add, AddAssign, Sub};
@@ -33,6 +33,7 @@ pub const NANOS_PER_SECOND: u32 = 1_000_000_000;
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum CcsdsTimeCode {
     CucCcsdsEpoch = 0b001,
     CucAgencyEpoch = 0b010,
@@ -65,13 +66,27 @@ pub fn ccsds_time_code_from_p_field(pfield: u8) -> Result<CcsdsTimeCode, u8> {
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+pub struct DateBeforeCcsdsEpochError(UnixTime);
+
+impl Display for DateBeforeCcsdsEpochError {
+    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: CcsdsTimeCode, found: u8 },
     ByteConversion(ByteConversionError),
     Cds(cds::CdsError),
     Cuc(cuc::CucError),
-    DateBeforeCcsdsEpoch(UnixTime),
     CustomEpochNotSupported,
 }
 
@@ -93,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")
             }
@@ -114,6 +126,7 @@ impl Error for TimestampError {
         }
     }
 }
+
 impl From<cds::CdsError> for TimestampError {
     fn from(e: cds::CdsError) -> Self {
         TimestampError::Cds(e)
@@ -127,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;
@@ -135,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),
@@ -143,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)
@@ -155,6 +166,7 @@ pub fn seconds_since_epoch() -> f64 {
 ///
 ///  - CCSDS epoch: 1958-01-01T00:00:00+00:00
 ///  - UNIX Epoch: 1970-01-01T00:00:00+00:00
+#[inline]
 pub const fn unix_to_ccsds_days(unix_days: i64) -> i64 {
     unix_days - DAYS_CCSDS_TO_UNIX as i64
 }
@@ -163,22 +175,24 @@ pub const fn unix_to_ccsds_days(unix_days: i64) -> i64 {
 ///
 ///  - CCSDS epoch: 1958-01-01T00:00:00+00:00
 ///  - UNIX Epoch: 1970-01-01T00:00:00+00:00
+#[inline]
 pub const fn ccsds_to_unix_days(ccsds_days: i64) -> i64 {
     ccsds_days + DAYS_CCSDS_TO_UNIX as i64
 }
 
 /// Similar to [unix_to_ccsds_days] but converts the epoch instead, which is the number of elpased
 /// seconds since the CCSDS and UNIX epoch times.
+#[inline]
 pub const fn unix_epoch_to_ccsds_epoch(unix_epoch: i64) -> i64 {
     unix_epoch - (DAYS_CCSDS_TO_UNIX as i64 * SECONDS_PER_DAY as i64)
 }
 
+#[inline]
 pub const fn ccsds_epoch_to_unix_epoch(ccsds_epoch: i64) -> i64 {
     ccsds_epoch + (DAYS_CCSDS_TO_UNIX as i64 * SECONDS_PER_DAY as 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())
 }
@@ -199,7 +213,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)?;
@@ -233,18 +246,16 @@ pub trait CcsdsTimeProvider {
         (self.subsec_nanos() / 1_000_000) as u16
     }
 
-    fn unix_stamp(&self) -> UnixTime {
+    fn unix_time(&self) -> UnixTime {
         UnixTime::new(self.unix_secs(), self.subsec_nanos())
     }
 
     #[cfg(feature = "chrono")]
-    #[cfg_attr(doc_cfg, doc(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")]
-    #[cfg_attr(doc_cfg, doc(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()))
@@ -258,6 +269,7 @@ pub trait CcsdsTimeProvider {
 /// similarly to other common time formats and libraries.
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub struct UnixTime {
     secs: i64,
     subsec_nanos: u32,
@@ -301,7 +313,7 @@ impl UnixTime {
     }
 
     /// This function will panic if the subsecond value is larger than the fraction of a second.
-    /// Use [new_checked] if you want to handle this case without a panic.
+    /// 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");
@@ -313,7 +325,7 @@ impl UnixTime {
     }
 
     /// This function will panic if the subsecond value is larger than the fraction of a second.
-    /// Use [new_subsecond_millis_checked] if you want to handle this case without a panic.
+    /// 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");
@@ -341,8 +353,7 @@ impl UnixTime {
     }
 
     #[cfg(feature = "std")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
+    pub fn now() -> Result<Self, SystemTimeError> {
-    pub fn from_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()))
@@ -353,43 +364,49 @@ impl UnixTime {
         self.secs as f64 + (self.subsec_nanos as f64 / 1_000_000_000.0)
     }
 
-    pub fn secs(&self) -> i64 {
+    pub fn as_secs(&self) -> i64 {
         self.secs
     }
 
     #[cfg(feature = "chrono")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "chrono")))]
+    pub fn chrono_date_time(&self) -> chrono::LocalResult<chrono::DateTime<chrono::Utc>> {
-    pub fn chrono_date_time(&self) -> LocalResult<DateTime<Utc>> {
         Utc.timestamp_opt(self.secs, self.subsec_nanos)
     }
 
     #[cfg(feature = "timelib")]
-    #[cfg_attr(doc_cfg, doc(cfg(feature = "timelib")))]
     pub fn timelib_date_time(&self) -> Result<time::OffsetDateTime, time::error::ComponentRange> {
-        Ok(time::OffsetDateTime::from_unix_timestamp(self.secs())?
+        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 diff_in_millis(&self, other: &UnixTime) -> i64 {
+    pub fn diff_in_millis(&self, other: &UnixTime) -> Option<i64> {
-        let seconds_difference = self.secs - other.secs;
+        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_nanos = self.subsec_nanos as i64 - other.subsec_nanos as i64;
 
         // Combine the differences
-        milliseconds_difference + (subsecond_difference_nanos / 1_000_000)
+        Some(milliseconds_difference + (subsecond_difference_nanos / 1_000_000))
     }
 }
 
-impl From<DateTime<Utc>> for UnixTime {
+#[cfg(feature = "chrono")]
-    fn from(value: DateTime<Utc>) -> Self {
+impl From<chrono::DateTime<chrono::Utc>> for UnixTime {
+    fn from(value: chrono::DateTime<chrono::Utc>) -> Self {
         Self::new(value.timestamp(), value.timestamp_subsec_nanos())
     }
 }
 
+#[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))
@@ -437,11 +454,11 @@ pub struct StampDiff {
 }
 
 impl Sub for UnixTime {
-    type Output = StampDiff;
+    type Output = Option<StampDiff>;
 
     fn sub(self, rhs: Self) -> Self::Output {
-        let difference = self.diff_in_millis(&rhs);
+        let difference = self.diff_in_millis(&rhs)?;
-        if difference < 0 {
+        Some(if difference < 0 {
             StampDiff {
                 positive_duration: false,
                 duration_absolute: Duration::from_millis(-difference as u64),
@@ -451,7 +468,7 @@ impl Sub for UnixTime {
                 positive_duration: true,
                 duration_absolute: Duration::from_millis(difference as u64),
             }
-        }
+        })
     }
 }
 
@@ -640,7 +657,7 @@ mod tests {
     fn test_addition() {
         let mut stamp0 = UnixTime::new_only_secs(1);
         stamp0 += Duration::from_secs(5);
-        assert_eq!(stamp0.secs(), 6);
+        assert_eq!(stamp0.as_secs(), 6);
         assert_eq!(stamp0.subsec_millis(), 0);
         let stamp1 = stamp0 + Duration::from_millis(500);
         assert_eq!(stamp1.secs, 6);
@@ -669,7 +686,7 @@ mod tests {
 
     #[test]
     fn test_from_now() {
-        let stamp_now = UnixTime::from_now().unwrap();
+        let stamp_now = UnixTime::now().unwrap();
         let dt_now = stamp_now.chrono_date_time().unwrap();
         assert!(dt_now.year() >= 2020);
     }
@@ -680,7 +697,7 @@ mod tests {
         let StampDiff {
             positive_duration,
             duration_absolute,
-        } = stamp_later - UnixTime::new(1, 0);
+        } = (stamp_later - UnixTime::new(1, 0)).expect("stamp diff error");
         assert!(positive_duration);
         assert_eq!(duration_absolute, Duration::from_secs(1));
     }
@@ -692,7 +709,7 @@ mod tests {
         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));
     }
@@ -704,7 +721,7 @@ mod tests {
         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));
     }
@@ -739,4 +756,13 @@ mod tests {
         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

@@ -15,10 +15,12 @@ pub trait ToBeBytes {
 impl ToBeBytes for () {
     type ByteArray = [u8; 0];
 
+    #[inline]
     fn written_len(&self) -> usize {
         0
     }
 
+    #[inline]
     fn to_be_bytes(&self) -> Self::ByteArray {
         []
     }
@@ -27,9 +29,12 @@ impl ToBeBytes for () {
 impl ToBeBytes for u8 {
     type ByteArray = [u8; 1];
 
+    #[inline]
     fn written_len(&self) -> usize {
         1
     }
+
+    #[inline]
     fn to_be_bytes(&self) -> Self::ByteArray {
         u8::to_be_bytes(*self)
     }
@@ -38,9 +43,12 @@ impl ToBeBytes for u8 {
 impl ToBeBytes for u16 {
     type ByteArray = [u8; 2];
 
+    #[inline]
     fn written_len(&self) -> usize {
         2
     }
+
+    #[inline]
     fn to_be_bytes(&self) -> Self::ByteArray {
         u16::to_be_bytes(*self)
     }
@@ -49,9 +57,12 @@ impl ToBeBytes for u16 {
 impl ToBeBytes for u32 {
     type ByteArray = [u8; 4];
 
+    #[inline]
     fn written_len(&self) -> usize {
         4
     }
+
+    #[inline]
     fn to_be_bytes(&self) -> Self::ByteArray {
         u32::to_be_bytes(*self)
     }
@@ -60,9 +71,12 @@ impl ToBeBytes for u32 {
 impl ToBeBytes for u64 {
     type ByteArray = [u8; 8];
 
+    #[inline]
     fn written_len(&self) -> usize {
         8
     }
+
+    #[inline]
     fn to_be_bytes(&self) -> Self::ByteArray {
         u64::to_be_bytes(*self)
     }
@@ -77,7 +91,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();
@@ -105,6 +118,7 @@ pub enum UnsignedByteFieldError {
 }
 
 impl From<ByteConversionError> for UnsignedByteFieldError {
+    #[inline]
     fn from(value: ByteConversionError) -> Self {
         Self::ByteConversionError(value)
     }
@@ -132,20 +146,24 @@ 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,
 }
 
 impl UnsignedByteField {
+    #[inline]
     pub const fn new(width: usize, value: u64) -> Self {
         Self { width, value }
     }
 
+    #[inline]
     pub const fn value_const(&self) -> u64 {
         self.value
     }
 
+    #[inline]
     pub fn new_from_be_bytes(width: usize, buf: &[u8]) -> Result<Self, UnsignedByteFieldError> {
         if width > buf.len() {
             return Err(ByteConversionError::FromSliceTooSmall {
@@ -178,10 +196,12 @@ impl UnsignedByteField {
 }
 
 impl UnsignedEnum for UnsignedByteField {
+    #[inline]
     fn size(&self) -> usize {
         self.width
     }
 
+    #[inline]
     fn value(&self) -> u64 {
         self.value_const()
     }
@@ -221,6 +241,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,
 }
@@ -236,6 +257,7 @@ impl<TYPE: Copy + Into<u64>> GenericUnsignedByteField<TYPE> {
 }
 
 impl<TYPE: Copy + ToBeBytes + Into<u64>> UnsignedEnum for GenericUnsignedByteField<TYPE> {
+    #[inline]
     fn size(&self) -> usize {
         self.value.written_len()
     }
@@ -251,6 +273,7 @@ impl<TYPE: Copy + ToBeBytes + Into<u64>> UnsignedEnum for GenericUnsignedByteFie
         Ok(self.value.written_len())
     }
 
+    #[inline]
     fn value(&self) -> u64 {
         self.value_typed().into()
     }
@@ -276,6 +299,7 @@ impl From<UnsignedByteFieldU8> for UnsignedByteField {
 impl TryFrom<UnsignedByteField> for UnsignedByteFieldU8 {
     type Error = UnsignedByteFieldError;
 
+    #[inline]
     fn try_from(value: UnsignedByteField) -> Result<Self, Self::Error> {
         if value.width != 1 {
             return Err(UnsignedByteFieldError::InvalidWidth {
@@ -288,6 +312,7 @@ impl TryFrom<UnsignedByteField> for UnsignedByteFieldU8 {
 }
 
 impl From<UnsignedByteFieldU16> for UnsignedByteField {
+    #[inline]
     fn from(value: UnsignedByteFieldU16) -> Self {
         Self::new(2, value.value as u64)
     }
@@ -296,6 +321,7 @@ impl From<UnsignedByteFieldU16> for UnsignedByteField {
 impl TryFrom<UnsignedByteField> for UnsignedByteFieldU16 {
     type Error = UnsignedByteFieldError;
 
+    #[inline]
     fn try_from(value: UnsignedByteField) -> Result<Self, Self::Error> {
         if value.width != 2 {
             return Err(UnsignedByteFieldError::InvalidWidth {
@@ -308,6 +334,7 @@ impl TryFrom<UnsignedByteField> for UnsignedByteFieldU16 {
 }
 
 impl From<UnsignedByteFieldU32> for UnsignedByteField {
+    #[inline]
     fn from(value: UnsignedByteFieldU32) -> Self {
         Self::new(4, value.value as u64)
     }
@@ -316,6 +343,7 @@ impl From<UnsignedByteFieldU32> for UnsignedByteField {
 impl TryFrom<UnsignedByteField> for UnsignedByteFieldU32 {
     type Error = UnsignedByteFieldError;
 
+    #[inline]
     fn try_from(value: UnsignedByteField) -> Result<Self, Self::Error> {
         if value.width != 4 {
             return Err(UnsignedByteFieldError::InvalidWidth {
@@ -328,6 +356,7 @@ impl TryFrom<UnsignedByteField> for UnsignedByteFieldU32 {
 }
 
 impl From<UnsignedByteFieldU64> for UnsignedByteField {
+    #[inline]
     fn from(value: UnsignedByteFieldU64) -> Self {
         Self::new(8, value.value)
     }
@@ -336,6 +365,7 @@ impl From<UnsignedByteFieldU64> for UnsignedByteField {
 impl TryFrom<UnsignedByteField> for UnsignedByteFieldU64 {
     type Error = UnsignedByteFieldError;
 
+    #[inline]
     fn try_from(value: UnsignedByteField) -> Result<Self, Self::Error> {
         if value.width != 8 {
             return Err(UnsignedByteFieldError::InvalidWidth {