bump version

- Add source_data getter for PusTm
- Add std time info updater for CDS short time stamp provider

.github/workflows/ci.yml

@@ -0,0 +1,83 @@
+on: [push]
+
+name: ci
+
+jobs:
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --release
+
+  cross-check:
+    name: Check Cross
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - armv7-unknown-linux-gnueabihf
+          - thumbv7em-none-eabihf
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: ${{ matrix.target }}
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: check
+          args: --release --target=${{ matrix.target }} --no-default-features
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - run: rustup component add rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - run: rustup component add clippy
+      - uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
+
+  ci:
+      if: ${{ success() }}
+      # all new jobs must be added to this list
+      needs: [check, fmt, clippy]
+      runs-on: ubuntu-latest
+      steps:
+        - name: CI succeeded
+          run: exit 0

CHANGELOG.md

@@ -6,9 +6,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [unreleased]
+# [unreleased]
 
-## [0.1.0]
+# [v0.2.0] 13.09.2022
 
-Initial version with CCSDS Space Packet Primary Header
+## Added
-implementation and basic PUS TC and TM implementations
+
+- Basic support for ECSS enumeration types for u8, u16, u32 and u64
+
+## Changed
+
+- Better names for generic error enumerations: `PacketError` renamed to `ByteConversionError`
+- CCSDS module: `ssc` abbreviations fully replaced by better name `seq_count`
+- Time module: `CcsdsTimeProvider::date_time` now has `Option<DateTime<Utc>>` as
+  a returnvalue instead of `DateTime<Utc>`
+- `PusTc` and `PusTm`: `new_from_raw_slice` renamed to simpler `from_bytes`
+
+# [v0.1.0] 16.08.2022
+
+Initial release with CCSDS Space Packet Primary Header implementation and basic PUS TC and TM
+implementations.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spacepackets"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
 description = "Generic implementations for various CCSDS and ECSS packet standards"
@@ -12,18 +12,27 @@ categories = ["aerospace", "aerospace::space-protocols", "no-std", "hardware-sup
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-num = "0.4"
-serde = { version = "1.0.142", features = ["derive"] }
 zerocopy = "0.6.1"
 crc = "3.0.0"
 delegate = "0.7.0"
-chrono = "0.4.20"
+
+[dependencies.serde]
+version = "1.0.142"
+default-features = false
+features = ["derive"]
+
+[dependencies.chrono]
+version = "0.4.20"
+default-features = false
+
+[dependencies.num-traits]
+version = "0.2"
+default-features = false
 
 [dev-dependencies.postcard]
-version = "0.7.3"
+version = "1.0.1"
-features = ["use-std"]
 
 [features]
-default = ["alloc"]
+default = ["std"]
-std = ["postcard/use-std"]
+std = ["chrono/std", "chrono/clock", "alloc"]
-alloc = ["serde/alloc"]
+alloc = ["postcard/alloc"]

README.md

@@ -1,3 +1,7 @@
+[![Crates.io](https://img.shields.io/crates/v/spacepackets)](https://crates.io/crates/spacepackets)
+[![docs.rs](https://img.shields.io/docsrs/spacepackets)](https://docs.rs/spacepackets)
+[![ci](https://github.com/us-irs/spacepackets-rs/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/us-irs/spacepackets-rs/actions/workflows/ci.yml)
+
 ECSS and CCSDS Spacepackets
 ======
 
@@ -11,13 +15,26 @@ Currently, this includes the following components:
   [CCSDS Blue Book 133.0-B-2](https://public.ccsds.org/Pubs/133x0b2e1.pdf)
 - PUS Telecommand and PUS Telemetry implementation according to the
   [ECSS-E-ST-70-41C standard](https://ecss.nl/standard/ecss-e-st-70-41c-space-engineering-telemetry-and-telecommand-packet-utilization-15-april-2016/).
-- CDS Short Time Code implementations according to
+- CDS Short Time Code implementation according to
   [CCSDS CCSDS 301.0-B-4](https://public.ccsds.org/Pubs/301x0b4e1.pdf)
+ 
+# Features
 
-This package is suitable for `no_std` environments.
+`spacepackets` supports various runtime environments and is also suitable for `no_std` environments.
 
-It features optional support for the [`alloc`](https://doc.rust-lang.org/alloc/) crate
+It offers support for [`serde`](https://serde.rs/). The Space Packet, PUS TM and TC
-and also offers support for [`serde`](https://serde.rs/). The Space Paccket, PUS TM and TC implementations
+implementations derive the `serde` `Serialize` and `Deserialize` trait. This allows serializing and
-derive the `serde` `Serialize` and `Deserialize` trait. 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.
+ - [`alloc`](https://doc.rust-lang.org/alloc/): Enables features which operate on containers
+   like [`alloc::vec::Vec`](https://doc.rust-lang.org/beta/alloc/vec/struct.Vec.html).
+   Enabled by the `std` feature.
+
+# Examples
+
+You can check the [documentation](https://docs.rs/spacepackets) of individual modules for various
+usage examples.

automation/Dockerfile

@@ -7,4 +7,9 @@ RUN apt-get --yes upgrade
 # tzdata is a dependency, won't install otherwise
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN rustup component add rustfmt clippy
+# set CROSS_CONTAINER_IN_CONTAINER to inform `cross` that it is executed from within a container
+ENV CROSS_CONTAINER_IN_CONTAINER=true
+
+# TODO: installing cross is problematic, permission issues
+RUN rustup target add thumbv7em-none-eabihf armv7-unknown-linux-gnueabihf && \
+    rustup component add rustfmt clippy

automation/Jenkinsfile

@@ -1,39 +1,42 @@
 pipeline {
-    agent any
+
+    agent {
+        dockerfile {
+            dir 'automation'
+            reuseNode true
+        }
+    }
 
     stages {
         stage('Clippy') {
-            agent {
-                dockerfile {
-                    dir 'automation'
-                    reuseNode true
-                }
-            }
             steps {
                 sh 'cargo clippy'
             }
         }
         stage('Rustfmt') {
-            agent {
-                dockerfile {
-                    dir 'automation'
-                    reuseNode true
-                }
-            }
             steps {
                 sh 'cargo fmt'
             }
         }
-        stage('Check') {
+        stage('Test') {
-            agent {
+            steps {
-                dockerfile {
+                sh 'cargo test'
-                    dir 'automation'
-                    reuseNode true
-                }
             }
+        }
+        stage('Check') {
             steps {
                 sh 'cargo check'
             }
         }
+        stage('Check Cross Embedded Bare Metal') {
+            steps {
+                sh 'cargo check --target thumbv7em-none-eabihf --no-default-features'
+            }
+        }
+        stage('Check Cross Embedded Linux') {
+            steps {
+                sh 'cargo check --target armv7-unknown-linux-gnueabihf'
+            }
+        }
     }
 }

src/ecss.rs

@@ -1,6 +1,6 @@
 //! 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/)
-use crate::{CcsdsPacket, PacketError};
+use crate::{ByteConversionError, CcsdsPacket, SizeMissmatch};
 use core::mem::size_of;
 use crc::{Crc, CRC_16_IBM_3740};
 use serde::{Deserialize, Serialize};
@@ -12,7 +12,7 @@ pub const CRC_CCITT_FALSE: Crc<u16> = Crc::<u16>::new(&CRC_16_IBM_3740);
 pub const CCSDS_HEADER_LEN: usize = size_of::<crate::zc::SpHeader>();
 
 /// All PUS versions. Only PUS C is supported by this library.
-#[derive(PartialEq, Copy, Clone, Serialize, Deserialize, Debug)]
+#[derive(PartialEq, Eq, Copy, Clone, Serialize, Deserialize, Debug)]
 pub enum PusVersion {
     EsaPus = 0,
     PusA = 1,
@@ -33,7 +33,23 @@ impl TryFrom<u8> for PusVersion {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum PacketTypeCodes {
+    Boolean = 1,
+    Enumerated = 2,
+    UnsignedInt = 3,
+    SignedInt = 4,
+    Real = 5,
+    BitString = 6,
+    OctetString = 7,
+    CharString = 8,
+    AbsoluteTime = 9,
+    RelativeTime = 10,
+    Deduced = 11,
+    Packet = 12,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum PusError {
     VersionNotSupported(PusVersion),
     IncorrectCrc(u16),
@@ -41,7 +57,13 @@ pub enum PusError {
     NoRawData,
     /// CRC16 needs to be calculated first
     CrcCalculationMissing,
-    PacketError(PacketError),
+    ByteConversionError(ByteConversionError),
+}
+
+impl From<ByteConversionError> for PusError {
+    fn from(e: ByteConversionError) -> Self {
+        PusError::ByteConversionError(e)
+    }
 }
 
 pub trait PusPacket: CcsdsPacket {
@@ -135,3 +157,165 @@ macro_rules! sp_header_impls {
 
 pub(crate) use ccsds_impl;
 pub(crate) use sp_header_impls;
+
+/// Generic trait for ECSS enumeration which consist of a PFC field denoting their length
+/// and an unsigned value. The trait makes no assumptions about the actual type of the unsigned
+/// value and only requires implementors to implement a function which writes the enumeration into
+/// a raw byte format.
+pub trait EcssEnumeration {
+    /// Packet Format Code, which denotes the number of bits of the enumeration
+    fn pfc(&self) -> u8;
+    fn byte_width(&self) -> usize {
+        (self.pfc() / 8) as usize
+    }
+    fn write_to_bytes(&self, buf: &mut [u8]) -> Result<(), ByteConversionError>;
+}
+
+trait ToBeBytes {
+    type ByteArray: AsRef<[u8]>;
+    fn to_be_bytes(&self) -> Self::ByteArray;
+}
+
+impl ToBeBytes for u8 {
+    type ByteArray = [u8; 1];
+
+    fn to_be_bytes(&self) -> Self::ByteArray {
+        u8::to_be_bytes(*self)
+    }
+}
+
+impl ToBeBytes for u16 {
+    type ByteArray = [u8; 2];
+
+    fn to_be_bytes(&self) -> Self::ByteArray {
+        u16::to_be_bytes(*self)
+    }
+}
+
+impl ToBeBytes for u32 {
+    type ByteArray = [u8; 4];
+
+    fn to_be_bytes(&self) -> Self::ByteArray {
+        u32::to_be_bytes(*self)
+    }
+}
+
+impl ToBeBytes for u64 {
+    type ByteArray = [u8; 8];
+
+    fn to_be_bytes(&self) -> Self::ByteArray {
+        u64::to_be_bytes(*self)
+    }
+}
+
+pub struct GenericEcssEnumWrapper<TYPE> {
+    val: TYPE,
+}
+
+impl<TYPE> GenericEcssEnumWrapper<TYPE> {
+    pub const fn ptc() -> PacketTypeCodes {
+        PacketTypeCodes::Enumerated
+    }
+
+    pub fn new(val: TYPE) -> Self {
+        Self { val }
+    }
+}
+
+impl<TYPE: ToBeBytes> EcssEnumeration for GenericEcssEnumWrapper<TYPE> {
+    fn pfc(&self) -> u8 {
+        size_of::<TYPE>() as u8 * 8_u8
+    }
+
+    fn write_to_bytes(&self, buf: &mut [u8]) -> Result<(), ByteConversionError> {
+        if buf.len() < self.byte_width() as usize {
+            return Err(ByteConversionError::ToSliceTooSmall(SizeMissmatch {
+                found: buf.len(),
+                expected: self.byte_width() as usize,
+            }));
+        }
+        buf[0..self.byte_width() as usize].copy_from_slice(self.val.to_be_bytes().as_ref());
+        Ok(())
+    }
+}
+
+pub type EcssEnumU8 = GenericEcssEnumWrapper<u8>;
+pub type EcssEnumU16 = GenericEcssEnumWrapper<u16>;
+pub type EcssEnumU32 = GenericEcssEnumWrapper<u32>;
+pub type EcssEnumU64 = GenericEcssEnumWrapper<u64>;
+
+#[cfg(test)]
+mod tests {
+    use crate::ecss::{EcssEnumU16, EcssEnumU32, EcssEnumU8, EcssEnumeration};
+    use crate::ByteConversionError;
+
+    #[test]
+    fn test_enum_u8() {
+        let mut buf = [0, 0, 0];
+        let my_enum = EcssEnumU8::new(1);
+        my_enum
+            .write_to_bytes(&mut buf[1..2])
+            .expect("To byte conversion of u8 failed");
+        assert_eq!(buf[1], 1);
+    }
+
+    #[test]
+    fn test_enum_u16() {
+        let mut buf = [0, 0, 0];
+        let my_enum = EcssEnumU16::new(0x1f2f);
+        my_enum
+            .write_to_bytes(&mut buf[1..3])
+            .expect("To byte conversion of u8 failed");
+        assert_eq!(buf[1], 0x1f);
+        assert_eq!(buf[2], 0x2f);
+    }
+
+    #[test]
+    fn test_slice_u16_too_small() {
+        let mut buf = [0];
+        let my_enum = EcssEnumU16::new(0x1f2f);
+        let res = my_enum.write_to_bytes(&mut buf[0..1]);
+        assert!(res.is_err());
+        let error = res.unwrap_err();
+        match error {
+            ByteConversionError::ToSliceTooSmall(missmatch) => {
+                assert_eq!(missmatch.expected, 2);
+                assert_eq!(missmatch.found, 1);
+            }
+            _ => {
+                panic!("Unexpected error {:?}", error);
+            }
+        }
+    }
+
+    #[test]
+    fn test_enum_u32() {
+        let mut buf = [0, 0, 0, 0, 0];
+        let my_enum = EcssEnumU32::new(0x1f2f3f4f);
+        my_enum
+            .write_to_bytes(&mut buf[1..5])
+            .expect("To byte conversion of u8 failed");
+        assert_eq!(buf[1], 0x1f);
+        assert_eq!(buf[2], 0x2f);
+        assert_eq!(buf[3], 0x3f);
+        assert_eq!(buf[4], 0x4f);
+    }
+
+    #[test]
+    fn test_slice_u32_too_small() {
+        let mut buf = [0, 0, 0, 0, 0];
+        let my_enum = EcssEnumU32::new(0x1f2f3f4f);
+        let res = my_enum.write_to_bytes(&mut buf[0..3]);
+        assert!(res.is_err());
+        let error = res.unwrap_err();
+        match error {
+            ByteConversionError::ToSliceTooSmall(missmatch) => {
+                assert_eq!(missmatch.expected, 4);
+                assert_eq!(missmatch.found, 3);
+            }
+            _ => {
+                panic!("Unexpected error {:?}", error);
+            }
+        }
+    }
+}

src/lib.rs

@@ -5,18 +5,36 @@
 //! ECSS (European Cooperation for Space Standardization) packet standards.
 //! Currently, this includes the following components:
 //!
-//! - [Space Packet][crate::SpHeader] implementation according to
+//!  - Space Packet implementation according to
-//!   [CCSDS Blue Book 133.0-B-2](https://public.ccsds.org/Pubs/133x0b2e1.pdf)
+//!    [CCSDS Blue Book 133.0-B-2](https://public.ccsds.org/Pubs/133x0b2e1.pdf)
-//! - [PUS Telecommand][crate::tc] and [PUS Telemetry][crate::tm] implementation according to the
+//!  - PUS Telecommand and PUS Telemetry implementation according to the
-//!   [ECSS-E-ST-70-41C standard](https://ecss.nl/standard/ecss-e-st-70-41c-space-engineering-telemetry-and-telecommand-packet-utilization-15-april-2016/).
+//!    [ECSS-E-ST-70-41C standard](https://ecss.nl/standard/ecss-e-st-70-41c-space-engineering-telemetry-and-telecommand-packet-utilization-15-april-2016/).
+//!  - CDS Short Time Code implementation according to
+//!    [CCSDS CCSDS 301.0-B-4](https://public.ccsds.org/Pubs/301x0b4e1.pdf)
 //!
-//! # Module
+//! ## Features
+//!
+//! `spacepackets` supports various runtime environments and is also suitable for `no_std` environments.
+//!
+//! It also offers support for [`serde`](https://serde.rs/). The Space Packet, PUS TM and TC
+//! implementations derive the `serde` `Serialize` and `Deserialize` trait. 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.
+//!  - [`alloc`](https://doc.rust-lang.org/alloc/): Enables features which operate on containers
+//!     like [`alloc::vec::Vec`](https://doc.rust-lang.org/beta/alloc/vec/struct.Vec.html).
+//!     Enabled by the `std` feature.
+//!
+//! ## Module
 //!
 //! This module contains helpers and data structures to generate Space Packets according to the
 //! [CCSDS 133.0-B-2](https://public.ccsds.org/Pubs/133x0b2e1.pdf). This includes the
 //! [SpHeader] class to generate the Space Packet Header component common to all space packets
 //!
-//! # Example
+//! ## Example
 //!
 //! ```rust
 //! use spacepackets::SpHeader;
@@ -24,13 +42,14 @@
 //! println!("{:?}", sp_header);
 //! ```
 #![no_std]
+#[cfg(feature = "alloc")]
 extern crate alloc;
-
+#[cfg(any(feature = "std", test))]
-#[cfg(feature = "std")]
 extern crate std;
 
 use crate::ecss::CCSDS_HEADER_LEN;
 use delegate::delegate;
+
 use serde::{Deserialize, Serialize};
 
 pub mod ecss;
@@ -38,23 +57,26 @@ pub mod tc;
 pub mod time;
 pub mod tm;
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+pub const MAX_APID: u16 = 2u16.pow(11) - 1;
+pub const MAX_SEQ_COUNT: u16 = 2u16.pow(14) - 1;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct SizeMissmatch {
     pub found: usize,
     pub expected: usize,
 }
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum PacketError {
+pub enum ByteConversionError {
     /// The passed slice is too small. Returns the found and expected minimum size
-    ToBytesSliceTooSmall(SizeMissmatch),
+    ToSliceTooSmall(SizeMissmatch),
     /// The provider buffer it soo small. Returns the found and expected minimum size
-    FromBytesSliceTooSmall(SizeMissmatch),
+    FromSliceTooSmall(SizeMissmatch),
     /// The [zerocopy] library failed to write to bytes
-    ToBytesZeroCopyError,
+    ZeroCopyToError,
-    FromBytesZeroCopyError,
+    ZeroCopyFromError,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Copy, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub enum PacketType {
     Tm = 0,
     Tc = 1,
@@ -76,7 +98,7 @@ pub fn packet_type_in_raw_packet_id(packet_id: u16) -> PacketType {
     PacketType::try_from((packet_id >> 12) as u8 & 0b1).unwrap()
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Copy, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub enum SequenceFlags {
     ContinuationSegment = 0b00,
     FirstSegment = 0b01,
@@ -100,7 +122,7 @@ impl TryFrom<u8> for SequenceFlags {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Copy, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub struct PacketId {
     pub ptype: PacketType,
     pub sec_header_flag: bool,
@@ -121,7 +143,7 @@ impl PacketId {
     /// not be set and false will be returned. The maximum allowed value for the 11-bit field is
     /// 2047
     pub fn set_apid(&mut self, apid: u16) -> bool {
-        if apid > num::pow(2, 11) - 1 {
+        if apid > MAX_APID {
             return false;
         }
         self.apid = apid;
@@ -147,19 +169,20 @@ impl From<u16> for PacketId {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Copy, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub struct PacketSequenceCtrl {
     pub seq_flags: SequenceFlags,
     seq_count: u16,
 }
 
 impl PacketSequenceCtrl {
-    pub fn new(seq_flags: SequenceFlags, ssc: u16) -> Option<PacketSequenceCtrl> {
+    /// Returns [None] if the passed sequence count exceeds [MAX_SEQ_COUNT]
+    pub fn new(seq_flags: SequenceFlags, seq_count: u16) -> Option<PacketSequenceCtrl> {
         let mut psc = PacketSequenceCtrl {
             seq_flags,
             seq_count: 0,
         };
-        psc.set_seq_count(ssc).then(|| psc)
+        psc.set_seq_count(seq_count).then(|| psc)
     }
     pub fn raw(&self) -> u16 {
         ((self.seq_flags as u16) << 14) | self.seq_count
@@ -168,14 +191,14 @@ impl PacketSequenceCtrl {
     /// 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
     pub fn set_seq_count(&mut self, ssc: u16) -> bool {
-        if ssc > num::pow(2, 14) - 1 {
+        if ssc > MAX_SEQ_COUNT {
             return false;
         }
         self.seq_count = ssc;
         true
     }
 
-    pub fn ssc(&self) -> u16 {
+    pub fn seq_count(&self) -> u16 {
         self.seq_count
     }
 }
@@ -293,13 +316,14 @@ pub trait CcsdsPrimaryHeader {
 ///    13 bits of the first two bytes of the raw header
 /// * `psc` - Packet Sequence Control, occupies the third and fourth byte of the raw header
 /// * `data_len` - Data length field occupies the fifth and the sixth byte of the raw header
-#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Copy, Clone)]
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub struct SpHeader {
     pub version: u8,
     pub packet_id: PacketId,
     pub psc: PacketSequenceCtrl,
     pub data_len: u16,
 }
+
 impl Default for SpHeader {
     fn default() -> Self {
         SpHeader {
@@ -318,29 +342,36 @@ impl Default for SpHeader {
     }
 }
 impl SpHeader {
+    /// 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
+    /// exceed [MAX_APID] or [MAX_SEQ_COUNT] respectively.
     pub fn new(
         ptype: PacketType,
         sec_header: bool,
         apid: u16,
-        ssc: u16,
+        seq_count: u16,
         data_len: u16,
     ) -> Option<Self> {
-        if ssc > num::pow(2, 14) - 1 || apid > num::pow(2, 11) - 1 {
+        if seq_count > MAX_SEQ_COUNT || apid > MAX_APID {
             return None;
         }
         let mut header = SpHeader::default();
         header.packet_id.sec_header_flag = sec_header;
         header.packet_id.apid = apid;
         header.packet_id.ptype = ptype;
-        header.psc.seq_count = ssc;
+        header.psc.seq_count = seq_count;
         header.data_len = data_len;
         Some(header)
     }
 
+    /// Helper function for telemetry space packet headers. The packet type  field will be
+    /// set accordingly.
     pub fn tm(apid: u16, seq_count: u16, data_len: u16) -> Option<Self> {
         Self::new(PacketType::Tm, false, apid, seq_count, data_len)
     }
 
+    /// Helper function for telecommand space packet headers. The packet type  field will be
+    /// set accordingly.
     pub fn tc(apid: u16, seq_count: u16, data_len: u16) -> Option<Self> {
         Self::new(PacketType::Tc, false, apid, seq_count, data_len)
     }
@@ -370,15 +401,15 @@ impl SpHeader {
         self.packet_id.ptype = packet_type;
     }
 
-    pub fn from_raw_slice(buf: &[u8]) -> Result<Self, PacketError> {
+    pub fn from_raw_slice(buf: &[u8]) -> Result<Self, ByteConversionError> {
         if buf.len() < CCSDS_HEADER_LEN + 1 {
-            return Err(PacketError::FromBytesSliceTooSmall(SizeMissmatch {
+            return Err(ByteConversionError::FromSliceTooSmall(SizeMissmatch {
                 found: buf.len(),
                 expected: CCSDS_HEADER_LEN + 1,
             }));
         }
         let zc_header = zc::SpHeader::from_bytes(&buf[0..CCSDS_HEADER_LEN])
-            .ok_or(PacketError::FromBytesZeroCopyError)?;
+            .ok_or(ByteConversionError::ZeroCopyFromError)?;
         Ok(Self::from(zc_header))
     }
 }
@@ -510,13 +541,21 @@ pub mod zc {
 
 #[cfg(test)]
 mod tests {
+    #[cfg(feature = "std")]
+    use crate::CcsdsPrimaryHeader;
     use crate::SpHeader;
     use crate::{
-        packet_type_in_raw_packet_id, zc, CcsdsPacket, CcsdsPrimaryHeader, PacketId,
+        packet_type_in_raw_packet_id, zc, CcsdsPacket, PacketId, PacketSequenceCtrl, PacketType,
-        PacketSequenceCtrl, PacketType, SequenceFlags,
+        SequenceFlags,
     };
     use alloc::vec;
-    use postcard::{from_bytes, to_stdvec};
+    #[cfg(not(feature = "std"))]
+    use num::pow;
+    #[cfg(feature = "std")]
+    use num_traits::pow;
+    use postcard::from_bytes;
+    #[cfg(feature = "alloc")]
+    use postcard::to_allocvec;
 
     #[test]
     fn test_seq_flag_helpers() {
@@ -589,7 +628,7 @@ mod tests {
         let psc_from_raw = PacketSequenceCtrl::from(psc.raw());
         assert_eq!(psc_from_raw, psc);
         // Fails because SSC is limited to 14 bits
-        assert!(!psc.set_seq_count(num::pow(2, 15)));
+        assert!(!psc.set_seq_count(2u16.pow(15)));
         assert_eq!(psc.raw(), 77);
 
         let psc_invalid = PacketSequenceCtrl::new(SequenceFlags::FirstSegment, 0xFFFF);
@@ -599,6 +638,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "std")]
     fn test_serde_sph() {
         let sp_header = SpHeader::tc(0x42, 12, 0).expect("Error creating SP header");
         assert_eq!(sp_header.ccsds_version(), 0b000);
@@ -609,7 +649,7 @@ mod tests {
         assert_eq!(sp_header.apid(), 0x42);
         assert_eq!(sp_header.sequence_flags(), SequenceFlags::Unsegmented);
         assert_eq!(sp_header.data_len(), 0);
-        let output = to_stdvec(&sp_header).unwrap();
+        let output = to_allocvec(&sp_header).unwrap();
         let sp_header: SpHeader = from_bytes(&output).unwrap();
         assert_eq!(sp_header.version, 0b000);
         assert!(!sp_header.packet_id.sec_header_flag);
@@ -674,8 +714,7 @@ mod tests {
     fn test_zc_sph() {
         use zerocopy::AsBytes;
 
-        let sp_header =
+        let sp_header = SpHeader::tc(0x7FF, pow(2, 14) - 1, 0).expect("Error creating SP header");
-            SpHeader::tc(0x7FF, num::pow(2, 14) - 1, 0).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);

src/tc.rs

@@ -20,13 +20,13 @@
 //! // Serialize TC into a raw buffer
 //! let mut test_buf: [u8; 32] = [0; 32];
 //! let size = pus_tc
-//!     .write_to(test_buf.as_mut_slice())
+//!     .write_to_bytes(test_buf.as_mut_slice())
 //!     .expect("Error writing TC to buffer");
 //! assert_eq!(size, 13);
 //! println!("{:?}", &test_buf[0..size]);
 //!
 //! // Deserialize from the raw byte representation
-//! let pus_tc_deserialized = PusTc::new_from_raw_slice(&test_buf).expect("Deserialization failed");
+//! let pus_tc_deserialized = PusTc::from_bytes(&test_buf).expect("Deserialization failed");
 //! assert_eq!(pus_tc.service(), 17);
 //! assert_eq!(pus_tc.subservice(), 1);
 //! assert_eq!(pus_tc.apid(), 0x02);
@@ -36,7 +36,9 @@ use crate::ecss::{
     verify_crc16_from_raw, CrcType, PusError, PusPacket, PusVersion, CRC_CCITT_FALSE,
 };
 use crate::SpHeader;
-use crate::{CcsdsPacket, PacketError, PacketType, SequenceFlags, SizeMissmatch, CCSDS_HEADER_LEN};
+use crate::{
+    ByteConversionError, CcsdsPacket, PacketType, SequenceFlags, SizeMissmatch, CCSDS_HEADER_LEN,
+};
 use core::mem::size_of;
 use delegate::delegate;
 use serde::{Deserialize, Serialize};
@@ -124,7 +126,7 @@ pub mod zc {
     }
 
     impl PusTcSecondaryHeader {
-        pub fn to_bytes(&self, slice: &mut [u8]) -> Option<()> {
+        pub fn write_to_bytes(&self, slice: &mut [u8]) -> Option<()> {
             self.write_to(slice)
         }
 
@@ -134,7 +136,7 @@ pub mod zc {
     }
 }
 
-#[derive(PartialEq, Copy, Clone, Serialize, Deserialize, Debug)]
+#[derive(PartialEq, Eq, Copy, Clone, Serialize, Deserialize, Debug)]
 pub struct PusTcSecondaryHeader {
     pub service: u8,
     pub subservice: u8,
@@ -209,7 +211,7 @@ impl PusTcSecondaryHeader {
 /// [postcard](https://docs.rs/postcard/latest/postcard/).
 ///
 /// There is no spare bytes support yet.
-#[derive(PartialEq, Copy, Clone, Serialize, Deserialize, Debug)]
+#[derive(PartialEq, Eq, Copy, Clone, Serialize, Deserialize, Debug)]
 pub struct PusTc<'slice> {
     sp_header: SpHeader,
     pub sec_header: PusTcSecondaryHeader,
@@ -328,28 +330,27 @@ impl<'slice> PusTc<'slice> {
     }
 
     /// Write the raw PUS byte representation to a provided buffer.
-    pub fn write_to(&self, slice: &mut [u8]) -> Result<usize, PusError> {
+    pub fn write_to_bytes(&self, slice: &mut [u8]) -> Result<usize, PusError> {
         let mut curr_idx = 0;
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
         let tc_header_len = size_of::<zc::PusTcSecondaryHeader>();
         let total_size = self.len_packed();
         if total_size > slice.len() {
-            return Err(PusError::PacketError(PacketError::ToBytesSliceTooSmall(
+            return Err(ByteConversionError::ToSliceTooSmall(SizeMissmatch {
-                SizeMissmatch {
+                found: slice.len(),
-                    found: slice.len(),
+                expected: total_size,
-                    expected: total_size,
+            })
-                },
+            .into());
-            )));
         }
         sph_zc
             .to_bytes(&mut slice[curr_idx..curr_idx + CCSDS_HEADER_LEN])
-            .ok_or(PusError::PacketError(PacketError::ToBytesZeroCopyError))?;
+            .ok_or(ByteConversionError::ZeroCopyToError)?;
 
         curr_idx += CCSDS_HEADER_LEN;
         let sec_header = zc::PusTcSecondaryHeader::try_from(self.sec_header).unwrap();
         sec_header
-            .to_bytes(&mut slice[curr_idx..curr_idx + tc_header_len])
+            .write_to_bytes(&mut slice[curr_idx..curr_idx + tc_header_len])
-            .ok_or(PusError::PacketError(PacketError::ToBytesZeroCopyError))?;
+            .ok_or(ByteConversionError::ZeroCopyToError)?;
 
         curr_idx += tc_header_len;
         if let Some(app_data) = self.app_data {
@@ -400,7 +401,7 @@ impl<'slice> PusTc<'slice> {
 
     /// 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
-    pub fn new_from_raw_slice(slice: &'slice [u8]) -> Result<(Self, usize), PusError> {
+    pub fn from_bytes(slice: &'slice [u8]) -> Result<(Self, usize), PusError> {
         let raw_data_len = slice.len();
         if raw_data_len < PUS_TC_MIN_LEN_WITHOUT_APP_DATA {
             return Err(PusError::RawDataTooShort(raw_data_len));
@@ -408,16 +409,16 @@ impl<'slice> PusTc<'slice> {
         let mut current_idx = 0;
         let sph =
             crate::zc::SpHeader::from_bytes(&slice[current_idx..current_idx + CCSDS_HEADER_LEN])
-                .ok_or(PusError::PacketError(PacketError::FromBytesZeroCopyError))?;
+                .ok_or(ByteConversionError::ZeroCopyFromError)?;
         current_idx += CCSDS_HEADER_LEN;
         let total_len = sph.total_len();
         if raw_data_len < total_len || total_len < PUS_TC_MIN_LEN_WITHOUT_APP_DATA {
             return Err(PusError::RawDataTooShort(raw_data_len));
         }
-        let sec_header = crate::tc::zc::PusTcSecondaryHeader::from_bytes(
+        let sec_header = zc::PusTcSecondaryHeader::from_bytes(
             &slice[current_idx..current_idx + PUC_TC_SECONDARY_HEADER_LEN],
         )
-        .ok_or(PusError::PacketError(PacketError::FromBytesZeroCopyError))?;
+        .ok_or(ByteConversionError::ZeroCopyFromError)?;
         current_idx += PUC_TC_SECONDARY_HEADER_LEN;
         let raw_data = &slice[0..total_len];
         let pus_tc = PusTc {
@@ -431,6 +432,10 @@ impl<'slice> PusTc<'slice> {
         verify_crc16_from_raw(raw_data, pus_tc.crc16.expect("CRC16 invalid"))?;
         Ok((pus_tc, total_len))
     }
+
+    pub fn raw(&self) -> Option<&'slice [u8]> {
+        self.raw_data
+    }
 }
 
 //noinspection RsTraitImplementation
@@ -472,8 +477,8 @@ mod tests {
     use crate::ecss::{PusError, PusPacket};
     use crate::tc::ACK_ALL;
     use crate::tc::{PusTc, PusTcSecondaryHeader, PusTcSecondaryHeaderT};
+    use crate::{ByteConversionError, SpHeader};
     use crate::{CcsdsPacket, SequenceFlags};
-    use crate::{PacketError, SpHeader};
     use alloc::vec::Vec;
 
     fn base_ping_tc_full_ctor() -> PusTc<'static> {
@@ -504,7 +509,7 @@ mod tests {
         let pus_tc = base_ping_tc_simple_ctor();
         let mut test_buf: [u8; 32] = [0; 32];
         let size = pus_tc
-            .write_to(test_buf.as_mut_slice())
+            .write_to_bytes(test_buf.as_mut_slice())
             .expect("Error writing TC to buffer");
         assert_eq!(size, 13);
     }
@@ -514,11 +519,11 @@ mod tests {
         let pus_tc = base_ping_tc_simple_ctor();
         let mut test_buf: [u8; 32] = [0; 32];
         let size = pus_tc
-            .write_to(test_buf.as_mut_slice())
+            .write_to_bytes(test_buf.as_mut_slice())
             .expect("Error writing TC to buffer");
         assert_eq!(size, 13);
-        let (tc_from_raw, size) = PusTc::new_from_raw_slice(&test_buf)
+        let (tc_from_raw, size) =
-            .expect("Creating PUS TC struct from raw buffer failed");
+            PusTc::from_bytes(&test_buf).expect("Creating PUS TC struct from raw buffer failed");
         assert_eq!(size, 13);
         verify_test_tc(&tc_from_raw, false, 13);
         assert!(tc_from_raw.user_data().is_none());
@@ -540,11 +545,11 @@ mod tests {
         let pus_tc = base_ping_tc_simple_ctor_with_app_data(&[1, 2, 3]);
         let mut test_buf: [u8; 32] = [0; 32];
         let size = pus_tc
-            .write_to(test_buf.as_mut_slice())
+            .write_to_bytes(test_buf.as_mut_slice())
             .expect("Error writing TC to buffer");
         assert_eq!(size, 16);
-        let (tc_from_raw, size) = PusTc::new_from_raw_slice(&test_buf)
+        let (tc_from_raw, size) =
-            .expect("Creating PUS TC struct from raw buffer failed");
+            PusTc::from_bytes(&test_buf).expect("Creating PUS TC struct from raw buffer failed");
         assert_eq!(size, 16);
         verify_test_tc(&tc_from_raw, true, 16);
         let user_data = tc_from_raw.user_data().unwrap();
@@ -571,10 +576,10 @@ mod tests {
         let pus_tc = base_ping_tc_simple_ctor();
         let mut test_buf: [u8; 32] = [0; 32];
         pus_tc
-            .write_to(test_buf.as_mut_slice())
+            .write_to_bytes(test_buf.as_mut_slice())
             .expect("Error writing TC to buffer");
         test_buf[12] = 0;
-        let res = PusTc::new_from_raw_slice(&test_buf);
+        let res = PusTc::from_bytes(&test_buf);
         assert!(res.is_err());
         let err = res.unwrap_err();
         assert!(matches!(err, PusError::IncorrectCrc { .. }));
@@ -587,7 +592,7 @@ mod tests {
         let mut test_buf: [u8; 32] = [0; 32];
         pus_tc.calc_own_crc16();
         pus_tc
-            .write_to(test_buf.as_mut_slice())
+            .write_to_bytes(test_buf.as_mut_slice())
             .expect("Error writing TC to buffer");
         verify_test_tc_raw(&test_buf);
         verify_crc_no_app_data(&test_buf);
@@ -598,7 +603,7 @@ mod tests {
         let mut pus_tc = base_ping_tc_simple_ctor();
         pus_tc.calc_crc_on_serialization = false;
         let mut test_buf: [u8; 32] = [0; 32];
-        let res = pus_tc.write_to(test_buf.as_mut_slice());
+        let res = pus_tc.write_to_bytes(test_buf.as_mut_slice());
         assert!(res.is_err());
         let err = res.unwrap_err();
         assert!(matches!(err, PusError::CrcCalculationMissing { .. }));
@@ -622,12 +627,12 @@ mod tests {
     fn test_write_buf_too_msall() {
         let pus_tc = base_ping_tc_simple_ctor();
         let mut test_buf = [0; 12];
-        let res = pus_tc.write_to(test_buf.as_mut_slice());
+        let res = pus_tc.write_to_bytes(test_buf.as_mut_slice());
         assert!(res.is_err());
         let err = res.unwrap_err();
         match err {
-            PusError::PacketError(err) => match err {
+            PusError::ByteConversionError(err) => match err {
-                PacketError::ToBytesSliceTooSmall(missmatch) => {
+                ByteConversionError::ToSliceTooSmall(missmatch) => {
                     assert_eq!(missmatch.expected, pus_tc.len_packed());
                     assert_eq!(missmatch.found, 12);
                 }
@@ -643,7 +648,7 @@ mod tests {
         verify_test_tc(&pus_tc, true, 16);
         let mut test_buf: [u8; 32] = [0; 32];
         let size = pus_tc
-            .write_to(test_buf.as_mut_slice())
+            .write_to_bytes(test_buf.as_mut_slice())
             .expect("Error writing TC to buffer");
         assert_eq!(test_buf[11], 1);
         assert_eq!(test_buf[12], 2);
@@ -667,7 +672,7 @@ mod tests {
         assert_eq!(pus_tc.sequence_flags(), SequenceFlags::Unsegmented);
         pus_tc.calc_own_crc16();
         pus_tc
-            .write_to(test_buf.as_mut_slice())
+            .write_to_bytes(test_buf.as_mut_slice())
             .expect("Error writing TC to buffer");
         assert_eq!(test_buf[0], 0x1f);
         assert_eq!(test_buf[1], 0xff);

src/time.rs

@@ -1,7 +1,11 @@
 //! CCSDS Time Code Formats according to [CCSDS 301.0-B-4](https://public.ccsds.org/Pubs/301x0b4e1.pdf)
-use crate::{PacketError, SizeMissmatch};
+use crate::{ByteConversionError, SizeMissmatch};
 use chrono::{DateTime, TimeZone, Utc};
 
+#[allow(unused_imports)]
+#[cfg(not(feature = "std"))]
+use num_traits::float::FloatCore;
+
 use crate::time::CcsdsTimeCodes::Cds;
 #[cfg(feature = "std")]
 use std::time::{SystemTime, SystemTimeError};
@@ -10,7 +14,7 @@ pub const CDS_SHORT_LEN: usize = 7;
 pub const DAYS_CCSDS_TO_UNIX: i32 = -4383;
 pub const SECONDS_PER_DAY: u32 = 86400;
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum CcsdsTimeCodes {
     None = 0,
     CucCcsdsEpoch = 0b001,
@@ -34,12 +38,12 @@ impl TryFrom<u8> for CcsdsTimeCodes {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum TimestampError {
     /// Contains tuple where first value is the expected time code and the second
     /// value is the found raw value
     InvalidTimeCode(CcsdsTimeCodes, u8),
-    OtherPacketError(PacketError),
+    OtherPacketError(ByteConversionError),
 }
 
 #[cfg(feature = "std")]
@@ -67,7 +71,7 @@ pub const fn ccsds_to_unix_days(ccsds_days: i32) -> i32 {
 }
 
 pub trait TimeWriter {
-    fn write_to_bytes(&self, bytes: &mut [u8]) -> Result<(), PacketError>;
+    fn write_to_bytes(&self, bytes: &mut [u8]) -> Result<(), TimestampError>;
 }
 
 pub trait TimeReader {
@@ -87,10 +91,25 @@ pub trait CcsdsTimeProvider {
     fn p_field(&self) -> (usize, [u8; 2]);
     fn ccdsd_time_code(&self) -> CcsdsTimeCodes;
     fn unix_seconds(&self) -> i64;
-    fn date_time(&self) -> DateTime<Utc>;
+    fn date_time(&self) -> Option<DateTime<Utc>>;
 }
 
-#[derive(Debug, Copy, Clone)]
+/// This object is the abstraction for the CCSDS Day Segmented Time Code (CDS).
+///
+/// It has the capability to generate and read timestamps as specified in the CCSDS 301.0-B-4
+/// section 3.3
+///
+/// # Example
+///
+/// ```
+/// use spacepackets::time::{CdsShortTimeProvider, TimeWriter};
+/// use spacepackets::time::CcsdsTimeCodes::Cds;
+/// let timestamp_now = CdsShortTimeProvider::from_now().unwrap();
+/// let mut raw_stamp = [0; 7];
+/// timestamp_now.write_to_bytes(&mut raw_stamp).unwrap();
+/// assert_eq!((raw_stamp[0] >> 4) & 0b111, Cds as u8);
+/// ```
+#[derive(Debug, Copy, Clone, Default)]
 pub struct CdsShortTimeProvider {
     pfield: u8,
     ccsds_days: u16,
@@ -102,7 +121,7 @@ pub struct CdsShortTimeProvider {
 impl CdsShortTimeProvider {
     pub fn new(ccsds_days: u16, ms_of_day: u32) -> Self {
         let provider = Self {
-            pfield: (CcsdsTimeCodes::Cds as u8) << 4,
+            pfield: (Cds as u8) << 4,
             ccsds_days,
             ms_of_day,
             unix_seconds: 0,
@@ -121,14 +140,25 @@ impl CdsShortTimeProvider {
         let unix_days_seconds = epoch - secs_of_day;
         let ms_of_day = secs_of_day * 1000 + now.subsec_millis() as u64;
         let provider = Self {
-            pfield: (CcsdsTimeCodes::Cds as u8) << 4,
+            pfield: (Cds as u8) << 4,
             ccsds_days: unix_to_ccsds_days((unix_days_seconds / SECONDS_PER_DAY as u64) as i32)
                 as u16,
             ms_of_day: ms_of_day as u32,
             unix_seconds: 0,
             date_time: None,
         };
-        Ok(provider.setup(unix_days_seconds as i64, ms_of_day.into()))
+        Ok(provider.setup(unix_days_seconds as i64, ms_of_day))
+    }
+
+    #[cfg(feature = "std")]
+    pub fn update_from_now(&mut self) -> Result<(), SystemTimeError> {
+        let now = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)?;
+        let epoch = now.as_secs();
+        let secs_of_day = epoch % SECONDS_PER_DAY as u64;
+        let unix_days_seconds = epoch - secs_of_day;
+        let ms_of_day = secs_of_day * 1000 + now.subsec_millis() as u64;
+        self.setup(unix_days_seconds as i64, ms_of_day);
+        Ok(())
     }
 
     fn setup(mut self, unix_days_seconds: i64, ms_of_day: u64) -> Self {
@@ -177,25 +207,27 @@ impl CcsdsTimeProvider for CdsShortTimeProvider {
     }
 
     fn ccdsd_time_code(&self) -> CcsdsTimeCodes {
-        CcsdsTimeCodes::Cds
+        Cds
     }
 
     fn unix_seconds(&self) -> i64 {
         self.unix_seconds
     }
 
-    fn date_time(&self) -> DateTime<Utc> {
+    fn date_time(&self) -> Option<DateTime<Utc>> {
-        self.date_time.expect("Invalid date time")
+        self.date_time
     }
 }
 
 impl TimeWriter for CdsShortTimeProvider {
-    fn write_to_bytes(&self, buf: &mut [u8]) -> Result<(), PacketError> {
+    fn write_to_bytes(&self, buf: &mut [u8]) -> Result<(), TimestampError> {
         if buf.len() < self.len_as_bytes() {
-            return Err(PacketError::ToBytesSliceTooSmall(SizeMissmatch {
+            return Err(TimestampError::OtherPacketError(
-                expected: self.len_as_bytes(),
+                ByteConversionError::ToSliceTooSmall(SizeMissmatch {
-                found: buf.len(),
+                    expected: self.len_as_bytes(),
-            }));
+                    found: buf.len(),
+                }),
+            ));
         }
         buf[0] = self.pfield;
         buf[1..3].copy_from_slice(self.ccsds_days.to_be_bytes().as_slice());
@@ -208,7 +240,7 @@ impl TimeReader for CdsShortTimeProvider {
     fn from_bytes(buf: &[u8]) -> Result<Self, TimestampError> {
         if buf.len() < CDS_SHORT_LEN {
             return Err(TimestampError::OtherPacketError(
-                PacketError::FromBytesSliceTooSmall(SizeMissmatch {
+                ByteConversionError::FromSliceTooSmall(SizeMissmatch {
                     expected: CDS_SHORT_LEN,
                     found: buf.len(),
                 }),
@@ -218,19 +250,9 @@ impl TimeReader for CdsShortTimeProvider {
         match CcsdsTimeCodes::try_from(pfield >> 4 & 0b111) {
             Ok(cds_type) => match cds_type {
                 Cds => (),
-                _ => {
+                _ => return Err(TimestampError::InvalidTimeCode(Cds, cds_type as u8)),
-                    return Err(TimestampError::InvalidTimeCode(
-                        CcsdsTimeCodes::Cds,
-                        cds_type as u8,
-                    ))
-                }
             },
-            _ => {
+            _ => return Err(TimestampError::InvalidTimeCode(Cds, pfield >> 4 & 0b111)),
-                return Err(TimestampError::InvalidTimeCode(
-                    CcsdsTimeCodes::Cds,
-                    pfield >> 4 & 0b111,
-                ))
-            }
         };
         let ccsds_days: u16 = u16::from_be_bytes(buf[1..3].try_into().unwrap());
         let ms_of_day: u32 = u32::from_be_bytes(buf[3..7].try_into().unwrap());
@@ -242,7 +264,7 @@ impl TimeReader for CdsShortTimeProvider {
 mod tests {
     use super::*;
     use crate::time::TimestampError::{InvalidTimeCode, OtherPacketError};
-    use crate::PacketError::{FromBytesSliceTooSmall, ToBytesSliceTooSmall};
+    use crate::ByteConversionError::{FromSliceTooSmall, ToSliceTooSmall};
     use alloc::format;
     use chrono::{Datelike, Timelike};
 
@@ -266,12 +288,9 @@ mod tests {
             time_stamper.unix_seconds(),
             (DAYS_CCSDS_TO_UNIX * SECONDS_PER_DAY as i32) as i64
         );
-        assert_eq!(time_stamper.ccdsd_time_code(), CcsdsTimeCodes::Cds);
+        assert_eq!(time_stamper.ccdsd_time_code(), Cds);
-        assert_eq!(
+        assert_eq!(time_stamper.p_field(), (1, [(Cds as u8) << 4, 0]));
-            time_stamper.p_field(),
+        let date_time = time_stamper.date_time().unwrap();
-            (1, [(CcsdsTimeCodes::Cds as u8) << 4, 0])
-        );
-        let date_time = time_stamper.date_time();
         assert_eq!(date_time.year(), 1958);
         assert_eq!(date_time.month(), 1);
         assert_eq!(date_time.day(), 1);
@@ -284,7 +303,7 @@ mod tests {
     fn test_time_stamp_unix_epoch() {
         let time_stamper = CdsShortTimeProvider::new((-DAYS_CCSDS_TO_UNIX) as u16, 0);
         assert_eq!(time_stamper.unix_seconds(), 0);
-        let date_time = time_stamper.date_time();
+        let date_time = time_stamper.date_time().unwrap();
         assert_eq!(date_time.year(), 1970);
         assert_eq!(date_time.month(), 1);
         assert_eq!(date_time.day(), 1);
@@ -330,7 +349,7 @@ mod tests {
             let res = time_stamper.write_to_bytes(&mut buf[0..i]);
             assert!(res.is_err());
             match res.unwrap_err() {
-                ToBytesSliceTooSmall(missmatch) => {
+                OtherPacketError(ToSliceTooSmall(missmatch)) => {
                     assert_eq!(missmatch.found, i);
                     assert_eq!(missmatch.expected, 7);
                 }
@@ -353,7 +372,7 @@ mod tests {
                     panic!("Unexpected error");
                 }
                 OtherPacketError(e) => match e {
-                    FromBytesSliceTooSmall(missmatch) => {
+                    FromSliceTooSmall(missmatch) => {
                         assert_eq!(missmatch.found, i);
                         assert_eq!(missmatch.expected, 7);
                     }
@@ -375,7 +394,7 @@ mod tests {
         let err = res.unwrap_err();
         match err {
             InvalidTimeCode(code, raw) => {
-                assert_eq!(code, CcsdsTimeCodes::Cds);
+                assert_eq!(code, Cds);
                 assert_eq!(raw, 0);
             }
             OtherPacketError(_) => {}
@@ -408,7 +427,7 @@ mod tests {
     fn test_time_now() {
         let timestamp_now = CdsShortTimeProvider::from_now().unwrap();
         let compare_stamp = Utc::now();
-        let dt = timestamp_now.date_time();
+        let dt = timestamp_now.date_time().unwrap();
         if compare_stamp.year() > dt.year() {
             assert_eq!(compare_stamp.year() - dt.year(), 1);
         } else {

src/tm.rs

@@ -5,7 +5,8 @@ use crate::ecss::{
     verify_crc16_from_raw, CrcType, PusError, PusPacket, PusVersion, CRC_CCITT_FALSE,
 };
 use crate::{
-    CcsdsPacket, PacketError, PacketType, SequenceFlags, SizeMissmatch, SpHeader, CCSDS_HEADER_LEN,
+    ByteConversionError, CcsdsPacket, PacketType, SequenceFlags, SizeMissmatch, SpHeader,
+    CCSDS_HEADER_LEN,
 };
 use core::mem::size_of;
 use serde::{Deserialize, Serialize};
@@ -66,7 +67,7 @@ pub mod zc {
     }
 
     impl PusTmSecHeaderWithoutTimestamp {
-        pub fn to_bytes(&self, slice: &mut [u8]) -> Option<()> {
+        pub fn write_to_bytes(&self, slice: &mut [u8]) -> Option<()> {
             self.write_to(slice)
         }
 
@@ -103,7 +104,7 @@ pub mod zc {
     }
 }
 
-#[derive(PartialEq, Serialize, Deserialize, Copy, Clone, Debug)]
+#[derive(PartialEq, Eq, Serialize, Deserialize, Copy, Clone, Debug)]
 pub struct PusTmSecondaryHeader<'slice> {
     pus_version: PusVersion,
     pub sc_time_ref_status: u8,
@@ -197,7 +198,7 @@ impl<'slice> TryFrom<zc::PusTmSecHeader<'slice>> for PusTmSecondaryHeader<'slice
 /// [postcard](https://docs.rs/postcard/latest/postcard/).
 ///
 /// There is no spare bytes support yet.
-#[derive(PartialEq, Serialize, Deserialize, Debug, Copy, Clone)]
+#[derive(PartialEq, Eq, Serialize, Deserialize, Debug, Copy, Clone)]
 pub struct PusTm<'slice> {
     pub sp_header: SpHeader,
     pub sec_header: PusTmSecondaryHeader<'slice>,
@@ -258,6 +259,10 @@ impl<'slice> PusTm<'slice> {
         self.sec_header.time_stamp
     }
 
+    pub fn source_data(&self) -> Option<&'slice [u8]> {
+        self.source_data
+    }
+
     pub fn set_dest_id(&mut self, dest_id: u16) {
         self.sec_header.dest_id = dest_id;
     }
@@ -304,28 +309,27 @@ impl<'slice> PusTm<'slice> {
     }
 
     /// Write the raw PUS byte representation to a provided buffer.
-    pub fn write_to(&self, slice: &mut [u8]) -> Result<usize, PusError> {
+    pub fn write_to_bytes(&self, slice: &mut [u8]) -> Result<usize, PusError> {
         let mut curr_idx = 0;
         let sph_zc = crate::zc::SpHeader::from(self.sp_header);
         let total_size = self.len_packed();
         if total_size > slice.len() {
-            return Err(PusError::PacketError(PacketError::ToBytesSliceTooSmall(
+            return Err(ByteConversionError::ToSliceTooSmall(SizeMissmatch {
-                SizeMissmatch {
+                found: slice.len(),
-                    found: slice.len(),
+                expected: total_size,
-                    expected: total_size,
+            })
-                },
+            .into());
-            )));
         }
         sph_zc
             .to_bytes(&mut slice[curr_idx..curr_idx + CCSDS_HEADER_LEN])
-            .ok_or(PusError::PacketError(PacketError::ToBytesZeroCopyError))?;
+            .ok_or(ByteConversionError::ZeroCopyToError)?;
 
         curr_idx += CCSDS_HEADER_LEN;
         let sec_header_len = size_of::<zc::PusTmSecHeaderWithoutTimestamp>();
         let sec_header = zc::PusTmSecHeaderWithoutTimestamp::try_from(self.sec_header).unwrap();
         sec_header
-            .to_bytes(&mut slice[curr_idx..curr_idx + sec_header_len])
+            .write_to_bytes(&mut slice[curr_idx..curr_idx + sec_header_len])
-            .ok_or(PusError::PacketError(PacketError::ToBytesZeroCopyError))?;
+            .ok_or(ByteConversionError::ZeroCopyToError)?;
         curr_idx += sec_header_len;
         let timestamp_len = self.sec_header.time_stamp.len();
         slice[curr_idx..curr_idx + timestamp_len].copy_from_slice(self.sec_header.time_stamp);
@@ -383,7 +387,7 @@ impl<'slice> PusTm<'slice> {
     /// Create a [PusTm] instance from a raw slice. On success, it returns a tuple containing
     /// the instance and the found byte length of the packet. The timestamp length needs to be
     /// known beforehand.
-    pub fn new_from_raw_slice(
+    pub fn from_bytes(
         slice: &'slice [u8],
         timestamp_len: usize,
     ) -> Result<(Self, usize), PusError> {
@@ -394,7 +398,7 @@ impl<'slice> PusTm<'slice> {
         let mut current_idx = 0;
         let sph =
             crate::zc::SpHeader::from_bytes(&slice[current_idx..current_idx + CCSDS_HEADER_LEN])
-                .ok_or(PusError::PacketError(PacketError::FromBytesZeroCopyError))?;
+                .ok_or(ByteConversionError::ZeroCopyFromError)?;
         current_idx += 6;
         let total_len = sph.total_len();
         if raw_data_len < total_len || total_len < PUS_TM_MIN_LEN_WITHOUT_SOURCE_DATA {
@@ -403,7 +407,7 @@ impl<'slice> PusTm<'slice> {
         let sec_header_zc = zc::PusTmSecHeaderWithoutTimestamp::from_bytes(
             &slice[current_idx..current_idx + PUC_TM_MIN_SEC_HEADER_LEN],
         )
-        .ok_or(PusError::PacketError(PacketError::FromBytesZeroCopyError))?;
+        .ok_or(ByteConversionError::ZeroCopyFromError)?;
         current_idx += PUC_TM_MIN_SEC_HEADER_LEN;
         let zc_sec_header_wrapper = zc::PusTmSecHeader {
             zc_header: sec_header_zc,
@@ -492,7 +496,9 @@ mod tests {
         let time_stamp = dummy_time_stamp();
         let pus_tm = base_ping_reply_full_ctor(&time_stamp);
         let mut buf: [u8; 32] = [0; 32];
-        let ser_len = pus_tm.write_to(&mut buf).expect("Serialization failed");
+        let ser_len = pus_tm
+            .write_to_bytes(&mut buf)
+            .expect("Serialization failed");
         assert_eq!(ser_len, 22);
         verify_raw_ping_reply(&buf);
     }
@@ -502,7 +508,9 @@ mod tests {
         let src_data = [1, 2, 3];
         let hk_reply = base_hk_reply(dummy_time_stamp(), &src_data);
         let mut buf: [u8; 32] = [0; 32];
-        let ser_len = hk_reply.write_to(&mut buf).expect("Serialization failed");
+        let ser_len = hk_reply
+            .write_to_bytes(&mut buf)
+            .expect("Serialization failed");
         assert_eq!(ser_len, 25);
         assert_eq!(buf[20], 1);
         assert_eq!(buf[21], 2);
@@ -528,10 +536,11 @@ mod tests {
         let time_stamp = dummy_time_stamp();
         let pus_tm = base_ping_reply_full_ctor(&time_stamp);
         let mut buf: [u8; 32] = [0; 32];
-        let ser_len = pus_tm.write_to(&mut buf).expect("Serialization failed");
+        let ser_len = pus_tm
+            .write_to_bytes(&mut buf)
+            .expect("Serialization failed");
         assert_eq!(ser_len, 22);
-        let (tm_deserialized, size) =
+        let (tm_deserialized, size) = PusTm::from_bytes(&buf, 7).expect("Deserialization failed");
-            PusTm::new_from_raw_slice(&buf, 7).expect("Deserialization failed");
         assert_eq!(ser_len, size);
         verify_ping_reply(&tm_deserialized, false, 22, dummy_time_stamp());
     }
@@ -544,13 +553,13 @@ mod tests {
         tm.calc_crc_on_serialization = false;
         assert_eq!(tm.data_len(), 0x00);
         let mut buf: [u8; 32] = [0; 32];
-        let res = tm.write_to(&mut buf);
+        let res = tm.write_to_bytes(&mut buf);
         assert!(res.is_err());
         assert!(matches!(res.unwrap_err(), PusError::CrcCalculationMissing));
         tm.update_ccsds_data_len();
         assert_eq!(tm.data_len(), 15);
         tm.calc_own_crc16();
-        let res = tm.write_to(&mut buf);
+        let res = tm.write_to_bytes(&mut buf);
         assert!(res.is_ok());
         tm.sp_header.data_len = 0;
         tm.update_packet_fields();
@@ -562,13 +571,13 @@ mod tests {
         let time_stamp = dummy_time_stamp();
         let pus_tm = base_ping_reply_full_ctor(&time_stamp);
         let mut buf: [u8; 16] = [0; 16];
-        let res = pus_tm.write_to(&mut buf);
+        let res = pus_tm.write_to_bytes(&mut buf);
         assert!(res.is_err());
         let error = res.unwrap_err();
-        assert!(matches!(error, PusError::PacketError { .. }));
+        assert!(matches!(error, PusError::ByteConversionError { .. }));
         match error {
-            PusError::PacketError(err) => match err {
+            PusError::ByteConversionError(err) => match err {
-                PacketError::ToBytesSliceTooSmall(size_missmatch) => {
+                ByteConversionError::ToSliceTooSmall(size_missmatch) => {
                     assert_eq!(size_missmatch.expected, 22);
                     assert_eq!(size_missmatch.found, 16);
                 }