switching to new docker image

wrong path
missing COPY in Dockerfile
2023-10-25 12:16:32 +02:00 · 2023-10-25 12:01:40 +02:00 · 2023-10-25 11:51:57 +02:00 · 2023-10-25 11:40:56 +02:00 · 2023-10-25 11:30:19 +02:00 · 2023-10-25 11:12:28 +02:00
258 changed files with 2811 additions and 3030 deletions
@@ -8,15 +8,164 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

 # [unreleased]

-# [v6.0.0]
+## Fixes
+
+- The `PusTmCreator` API only accepted 255 bytes of source data. It can now accept source
+  data with a size limited only by the size of `size_t`.
+- Important bugfix in CFDP PDU header format: The entity length field and the transaction sequence
+  number fields stored the actual length of the field instead of the length minus 1 like specified
+  in the CFDP standard.
+- PUS Health Service: Size check for set health command.
+  Perform operation completion for announce health command.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/746
+- Linux OSAL `getUptime` fix: Check validity of `/proc/uptime` file before reading uptime.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/745
+- Small tweak for version getter
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/744
+- Important bugfix for `LocalPool::delete` function, where an overflow could possibly lead to UB.

 ## Added

+- add CFDP subsystem ID
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/742
+- New object ID for persistent TM store PUS 15
+- `EventManager`: Add function to print all listeners.
+
+## Changed
+
+- Bump ETL version to 20.35.14
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/748
+- Renamed `PCDU_2` subsystem ID to `POWER_SWITCH_IF`.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/743
+- Add new `PowerSwitchIF::SWITCH_UNKNOWN` returnvalue.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/743
+- Assert that `FixedArrayList` is larger than 0 at compile time.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/740
+- `EventManager`: Queue depth is configurable now
+- `ActionHelper`: Allow execution of actions without additional data
+
+# [v6.0.0] 2023-02-10
+
+## Fixes
+
+- Mode Service: Add allowed subservice
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/739
+- `CService200ModeManagement`: Various bugfixes which lead to now execution complete being generated
+  on mode announcements, duplicate mode reply generated on announce commands, and the mode read
+  subservice not working properly.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/736
+- Memory leak fixes for the TCP/IP TMTC bridge.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/737
+- `Service9TimeManagement`: Fix the time dump at the `SET_TIME` subservice: Include clock timeval
+  seconds instead of uptime.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/726
+- HAL MGM3100 Handler: Use axis specific gain/scaling factors. Previously,
+  only the X scaling factor was used.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/724
+- HAL MGM3100 Handler: Z value was previously calculated with bytes of the X value.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/733
+- DHB `setNormalDatapoolEntriesInvalid`: The default implementation did not set the validity
+  to false correctly because the `read` and `write` calls were missing.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/728
+- PUS TMTC creator module: Sequence flags were set to continuation segment (0b00) instead
+  of the correct unsegmented flags (0b11) as specified in the standard.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/727
+- TC Scheduler Service 11: Add size and CRC check for contained TC.
+  Bug: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/issues/719
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/720
+- Only delete health table entry in `HealthHelper` destructor if
+  health table was set.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/710
+- I2C Bugfixes: Do not keep iterator as member and fix some incorrect handling with the iterator.
+  Also properly reset the reply size for successfull transfers and erroneous transfers.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/700
+- Bugfix for Serial Buffer Stream: Setting `doActive` to false now
+  actually fully disables printing.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/680
+- `TcpTmTcServer.cpp`: The server was actually not able to handle
+  CCSDS packets which were clumped together. This has been fixed now.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/673
+- `CServiceHealthCommanding`: Add announce all health info implementation
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/725
+- various fixes related to linux Unittests and memory leaks
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/715
+- small fix to allow teardown handling
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/713
+- fix compiler warning for fixed array list copy ctor
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/704
+- missing include
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/703
+- defaultconfig did not build anymore
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/702
+- hotfix
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/699
+- small fix for helper
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/698
+- missing retval conv
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/697
+- DHB Countdown Bug
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/693
+- doc corrections
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/687
+- better error printout
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/686
+- include correction
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/683
+- better warning for missing include paths
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/676
+- Service 11 regression
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/670
+
+## Added
+
+- Empty constructor for `CdsShortTimeStamper` which does not do an object manager registration.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/730
+- `Service9TimeManagement`: Add `DUMP_TIME` (129) subservice.
+- `TcpTmTcServer`: Allow setting the `SO_REUSEADDR` and `SO_REUSEPORT`
+  option on the TCP server. CTOR prototype has changed and expects an explicit
+  TCP configuration struct to be passed.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/722
+- `DleParser` helper class to parse DLE encoded packets from a byte stream.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/711
+- `UioMapper` is able to resolve symlinks now.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/709
 - Add new `UnsignedByteField` class
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/660
+- publish documentation for development and master branch
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/681
+- Add Linux HAL options
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/663
+- Expand SerializeIF
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/656
+- PUS Service 11: Additional Safety Check
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/666
+- improvements for auto-formatter script
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/665
+- provide a weak print char impl
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/674
+
+## Removed
+
+- now that doc server is up, remove markdown files
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/688
+- remove bsp specific code
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/679

 ## Changes

+- `CService201HealthCommanding` renamed to `CServiceHealthCommanding`,
+  service ID customizable now. `CServiceHealthCommanding` expects configuration struct
+  `HealthServiceCfg` now
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/725
+- `AcceptsTelemetryIF`: `getReportReceptionQueue` is const now
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/712
+- Moved some container returnvalues to dedicated header and namespace
+  so they can be used without template specification.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/707
+- Remove default secondary header argument for
+  `uint16_t getTcSpacePacketIdFromApid(uint16_t apid, bool secondaryHeaderFlag)` and
+  `uint16_t getTmSpacePacketIdFromApid(uint16_t apid, bool secondaryHeaderFlag)`
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/689
 - Removed `HasReturnvaluesIF` class in favor of `returnvalue` namespace with `OK` and `FAILED`
  constants.
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/659
@@ -24,8 +173,78 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  for other modules
  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/655
  which also includes a migration guide
+- Bump Catch2 dependency to regular version `v3.1.0`
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/678
+- `SerialBufferAdapter`: Rename `setBuffer` to `setConstBuffer` and update
+  API to expect `const uint8_t*` accordingly.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/677
+- Remove the following user includes from `fsfw/events/Event.h` and
+  `fsfw/returnvalues/returnvalue.h`:
+  - `#include "events/subsystemIdRanges.h"`
+  - `#include "returnvalues/classIds.h"`
+  The user has to include those themselves now
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/675
+- `DeviceHandlerBase`: Set command sender before calling `buildCommandFromCommand`.
+  This allows finishing action commands immediately inside the function.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/672
+- `DeviceHandlerBase`: New signature of `handleDeviceTm` which expects
+  a `const SerializeIF&` and additional helper variant which expects `const uint8_t*`
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/671
+- Improvements for `AcceptsTelemetryIF` and `AcceptsTelecommandsIF`:
+  - Make functions `const` where it makes sense
+  - Add `const char* getName const` abstract function
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/684
+- Generic TMTC Bridge Update
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/734
+- comment tweak to event parser can read everything
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/732
+- CMakeLists file updates
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/731
+- improve srv20 error messages
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/723
+- I2C Linux: remove duplicate printout
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/718
+- printout handling improvements
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/717
+- vec getter, reset for content
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/716
+- updates for source sequence counter
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/714
+- SP reader getPacketData is const now
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/708
+- refactoring of serial drivers for linux
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/705
+- Local Pool Update Remove Add Data Ignore Fault Argument
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/701
+- Switch to new documentation server
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/694
+- Windows Tweaks
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/691
+- Refactor Local Pool API
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/667
+- group MGM data in local pool vectors
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/664

-# [v5.0.0] 25.07.2022
+
+## CFDP
+
+- Refactoring of CFDP stack which was done during implementation of the CFDP source and destination
+  handlers.
+   - New filesystem module, changes for filesystem abstraction `HasFileSystemIF` to better
+     fit requirements of CFDP
+   - New `HostFilesystem` implementation of the `HasFileSystemIF`
+   - New `cfdp::UserBase` class which is the abstraction for the CFDP user in an OBSW context.
+   - mib module for the CFDP stack
+   - PDU classes renamed from `...Serializer`/`...Deserializer` to `...Creator`/`...Reader`
+     respetively
+   - Renamed `TcDistributor` to `TcDistributorBase` to prevent confusion
+   - Refactored `TcDisitributorBase` to be more flexible and usable for CFDP distribution
+   - Renamed `CCSDSDistributor` to `CcsdsDistributor` and add feature which allows it
+     to remove the CCSDS header when routing a packet. This allows CCSDS agnostic receiver
+     implementation without an extra component
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/682
+
+# [v5.0.0] 2022-07-25

 ## Changes

@@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH
 # Version file handling  #
 # ##############################################################################

-set(FSFW_VERSION_IF_GIT_FAILS 5)
+set(FSFW_VERSION_IF_GIT_FAILS 6)
 set(FSFW_SUBVERSION_IF_GIT_FAILS 0)
 set(FSFW_REVISION_IF_GIT_FAILS 0)

@@ -72,7 +72,7 @@ set(FSFW_ETL_LIB_MAJOR_VERSION
    20
    CACHE STRING "ETL library major version requirement")
 set(FSFW_ETL_LIB_VERSION
-    ${FSFW_ETL_LIB_MAJOR_VERSION}.28.0
+    ${FSFW_ETL_LIB_MAJOR_VERSION}.36.0
    CACHE STRING "ETL library exact version requirement")
 set(FSFW_ETL_LINK_TARGET etl::etl)

@@ -80,7 +80,7 @@ set(FSFW_CATCH2_LIB_MAJOR_VERSION
    3
    CACHE STRING "Catch2 library major version requirement")
 set(FSFW_CATCH2_LIB_VERSION
-    v${FSFW_CATCH2_LIB_MAJOR_VERSION}.0.0-preview5
+    v${FSFW_CATCH2_LIB_MAJOR_VERSION}.3.2
    CACHE STRING "Catch2 library exact version requirement")

 # Keep this off by default for now. See PR:
@@ -122,6 +122,7 @@ if(UNIX)
  option(FSFW_HAL_LINUX_ADD_PERIPHERAL_DRIVERS "Add Linux peripheral drivers"
         OFF)
  option(FSFW_HAL_LINUX_ADD_LIBGPIOD "Attempt to add Linux GPIOD drivers" OFF)
+  option(FSFW_HAL_LINUX_ADD_SERIAL_DRIVERS "Add serial drivers" ON)
 endif()

 # Optional sources
@@ -152,12 +153,12 @@ if(FSFW_BUILD_TESTS)
      "${MSG_PREFIX} Building the FSFW unittests in addition to the static library"
  )
  # Check whether the user has already installed Catch2 first
-  find_package(Catch2 ${FSFW_CATCH2_LIB_MAJOR_VERSION})
+  find_package(Catch2 ${FSFW_CATCH2_LIB_MAJOR_VERSION} QUIET)
  # Not installed, so use FetchContent to download and provide Catch2
  if(NOT Catch2_FOUND)
    message(
      STATUS
-        "${MSG_PREFIX} Catch2 installation not found. Downloading Catch2 library with FetchContent"
+        "${MSG_PREFIX} Catch2 installation not found. Downloading Catch2 library with FetchContent."
    )
    include(FetchContent)

@@ -200,8 +201,8 @@ find_package(${FSFW_ETL_LIB_NAME} ${FSFW_ETL_LIB_MAJOR_VERSION} QUIET)
 if(NOT ${FSFW_ETL_LIB_NAME}_FOUND)
  message(
    STATUS
-      "${MSG_PREFIX} No ETL installation was found with find_package. Installing and providing "
-      "etl with FindPackage")
+      "${MSG_PREFIX} ETL installation not found. Downloading ETL with FetchContent."
+  )
  include(FetchContent)

  FetchContent_Declare(
@@ -326,7 +327,8 @@ if(FSFW_BUILD_TESTS)
            "/usr/local/include/*"
            "*/fsfw_tests/*"
            "*/catch2-src/*"
-            "*/fsfw_hal/*")
+            "*/fsfw_hal/*"
+            "unittests/*")
      endif()

      target_link_options(${FSFW_TEST_TGT} PRIVATE -fprofile-arcs
@@ -344,8 +346,15 @@ if(FSFW_BUILD_TESTS)
          DEPENDENCIES ${FSFW_TEST_TGT})
      else()
        setup_target_for_coverage_lcov(
-          NAME ${FSFW_TEST_TGT}_coverage EXECUTABLE ${FSFW_TEST_TGT}
-          DEPENDENCIES ${FSFW_TEST_TGT})
+          NAME
+          ${FSFW_TEST_TGT}_coverage
+          EXECUTABLE
+          ${FSFW_TEST_TGT}
+          DEPENDENCIES
+          ${FSFW_TEST_TGT}
+          GENHTML_ARGS
+          --html-epilog
+          ${CMAKE_SOURCE_DIR}/unittests/lcov_epilog.html)
      endif()
    endif()
  endif()
@@ -175,7 +175,7 @@ cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..
 Then you can generate the documentation using

 ```sh
-cmake --build . -j
+cmake --build . -- Sphinx -j
 ```

 You can find the generated documentation inside the `docs/sphinx` folder inside the build
@@ -5,16 +5,28 @@ RUN apt-get --yes upgrade

 #tzdata is a dependency, won't install otherwise
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping
+RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping python3 pip doxygen graphviz rsync
+
+# This should also install Sphinx
+COPY docs/requirements.txt .
+RUN python3 -m pip install -r requirements.txt
+RUN python3 -m pip install breathe

 RUN git clone https://github.com/catchorg/Catch2.git && \
-	cd Catch2 && \
-	git checkout v3.0.0-preview5 && \
-	cmake -Bbuild -H. -DBUILD_TESTING=OFF && \
-	cmake --build build/ --target install
+        cd Catch2 && \
+        git checkout v3.1.0 && \
+        cmake -Bbuild -H. -DBUILD_TESTING=OFF && \
+        cmake --build build/ --target install

 RUN git clone https://github.com/ETLCPP/etl.git && \
-	cd etl && \
-	git checkout 20.28.0 && \
-	cmake -B build . && \
-	cmake --install build/
+        cd etl && \
+        git checkout 20.28.0 && \
+        cmake -B build . && \
+        cmake --install build/
+
+#ssh needs a valid user to work
+RUN adduser --uid 114 jenkins
+
+#add documentation server to known hosts
+RUN echo "|1|/LzCV4BuTmTb2wKnD146l9fTKgQ=|NJJtVjvWbtRt8OYqFgcYRnMQyVw= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts
+RUN echo "|1|CcBvBc3EG03G+XM5rqRHs6gK/Gg=|oGeJQ+1I8NGI2THIkJsW92DpTzs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNL8ssTonYtgiR/6RRlSIK9WU1ywOcJmxFTLcEblAwH7oifZzmYq3XRfwXrgfMpylEfMFYfCU8JRqtmi19xc21A=" >> /etc/ssh/ssh_known_hosts
@@ -1,41 +1,131 @@
 pipeline {
    environment {
-        BUILDDIR = 'cmake-build-tests'
+        BUILDDIR_HOST = 'cmake-build-tests-host'
+        BUILDDIR_LINUX = 'cmake-build-tests-linux'
+        DOCDDIR = 'cmake-build-documentation'
    }
    agent {
-        docker { image 'fsfw-ci:d3'}
+        docker { 
+            image 'fsfw-ci:d11'
+            args '--network host --sysctl fs.mqueue.msg_max=100'
+        }
    }
    stages {
-        stage('Clean') {
-            steps {
-                sh 'rm -rf $BUILDDIR'
-            }
-        }
-        stage('Configure') {
-            steps {
-                dir(BUILDDIR) {
-                    sh 'cmake -DFSFW_OSAL=host -DFSFW_BUILD_TESTS=ON -DFSFW_CICD_BUILD=ON ..'
+        stage('Host') {
+            stages{
+                stage('Clean') {
+                    steps {
+                        sh 'rm -rf $BUILDDIR_HOST'
+                    }
+                }
+                stage('Configure') {
+                    steps {
+                        dir(BUILDDIR_HOST) {
+                            sh 'cmake -DFSFW_OSAL=host -DFSFW_BUILD_TESTS=ON -DFSFW_CICD_BUILD=ON ..'
+                        }
+                    }
+                }
+                stage('Build') {
+                    steps {
+                        dir(BUILDDIR_HOST) {
+                            sh 'cmake --build . -j4'
+                        }
+                    }
+                }
+                stage('Unittests') {
+                    steps {
+                        dir(BUILDDIR_HOST) {
+                            sh 'cmake --build . -- fsfw-tests_coverage -j4'
+                        }
+                    }
+                }
+                stage('Valgrind') {
+                    steps {
+                        dir(BUILDDIR_HOST) {
+                            sh 'valgrind --leak-check=full --error-exitcode=1 ./fsfw-tests'
+                        }
+                    }
                }
            }
        }
-        stage('Build') {
-            steps {
-                dir(BUILDDIR) {
-                    sh 'cmake --build . -j4'
+        stage('Linux') {
+            stages{
+                stage('Clean') {
+                    steps {
+                        sh 'rm -rf $BUILDDIR_LINUX'
+                    }
+                }
+                stage('Configure') {
+                    steps {
+                        dir(BUILDDIR_LINUX) {
+                            sh 'cmake -DFSFW_OSAL=linux -DFSFW_BUILD_TESTS=ON -DFSFW_CICD_BUILD=ON ..'
+                        }
+                    }
+                }
+                stage('Build') {
+                    steps {
+                        dir(BUILDDIR_LINUX) {
+                            sh 'cmake --build . -j4'
+                        }
+                    }
+                }
+                stage('Unittests') {
+                    steps {
+                        dir(BUILDDIR_LINUX) {
+                            sh 'cmake --build . -- fsfw-tests_coverage -j4'
+                        }
+                    }
+                }
+                stage('Valgrind') {
+                    steps {
+                        dir(BUILDDIR_LINUX) {
+                            sh 'valgrind --leak-check=full --error-exitcode=1 ./fsfw-tests'
+                        }
+                    }
                }
            }
        }
-        stage('Unittests') {
+        stage('Documentation') {
+            when {
+              anyOf {
+                branch 'development';
+                branch pattern: 'development-doc-deployment*'
+              }
+            }
            steps {
-                dir(BUILDDIR) {
-                    sh 'cmake --build . -- fsfw-tests_coverage -j4'
+                dir(DOCDDIR) {
+                    sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
+                    sh 'make Sphinx'
+                    sshagent(credentials: ['documentation-buildfix']) {
+                        sh 'rsync -r --delete docs/sphinx/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/development'
+                    }
+                }
+                dir(BUILDDIR_LINUX) {
+                    sshagent(credentials: ['documentation-buildfix']) {
+                        sh 'rsync -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/coverage/development'
+                    }
                }
            }
        }
-        stage('Valgrind') {
+        stage('Master Documentation') {
+            when {
+              anyOf {
+                branch 'master';
+                branch pattern: 'master-doc-deployment*'
+              }
+            }
            steps {
-                dir(BUILDDIR) {
-                    sh 'valgrind --leak-check=full --error-exitcode=1 ./fsfw-tests'
+                dir(DOCDDIR) {
+                    sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
+                    sh 'make Sphinx'
+                    sshagent(credentials: ['documentation-buildfix']) {
+                        sh 'rsync -r --delete docs/sphinx/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/master'
+                    }
+                }
+                dir(BUILDDIR_LINUX) {
+                    sshagent(credentials: ['documentation-buildfix']) {
+                        sh 'rsync -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/coverage/master'
+                    }
                }
            }
        }
@@ -140,7 +140,7 @@ find_program( GCOV_PATH gcov )
 find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
 find_program( FASTCOV_PATH NAMES fastcov fastcov.py )
 find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
-find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
+find_program( GCOVR_PATH gcovr )
 find_program( CPPFILT_PATH NAMES c++filt )

 if(NOT GCOV_PATH)
@@ -1,40 +0,0 @@
-Configuring the FSFW
-======
-
-The FSFW can be configured via the `fsfwconfig` folder. A template folder has
-been provided to have a starting point for this. The folder should be added
-to the include path. The primary configuration file is the `FSFWConfig.h` folder. Some
-of the available options will be explained in more detail here.
-
-# Auto-Translation of Events
-
-The FSFW allows the automatic translation of events, which allows developers to track triggered
-events directly via console output. Using this feature requires:
-
-1. `FSFW_OBJ_EVENT_TRANSLATION` set to 1 in the configuration file.
-2. Special auto-generated translation files which translate event IDs and object IDs into
-   human readable strings. These files can be generated using the 
-   [modgen Python scripts](https://git.ksat-stuttgart.de/source/modgen.git).
-3. The generated translation files for the object IDs should be named `translatesObjects.cpp`
-   and `translateObjects.h` and should be copied to the `fsfwconfig/objects` folder
-4. The generated translation files for the event IDs should be named `translateEvents.cpp` and
-   `translateEvents.h` and should be copied to the `fsfwconfig/events` folder
-   
-An example implementations of these translation file generators can be found as part
-of the [SOURCE project here](https://git.ksat-stuttgart.de/source/sourceobsw/-/tree/development/generators)
-or the [FSFW example](https://egit.irs.uni-stuttgart.de/fsfw/fsfw_example_public/src/branch/master/generators)
-
-## Configuring the Event Manager
-
-The number of allowed subscriptions can be modified with the following
-parameters:
-
-``` c++
-namespace fsfwconfig {
-//! Configure the allocated pool sizes for the event manager.
-static constexpr size_t FSFW_EVENTMGMR_MATCHTREE_NODES = 240;
-static constexpr size_t FSFW_EVENTMGMT_EVENTIDMATCHERS = 120;
-static constexpr size_t FSFW_EVENTMGMR_RANGEMATCHERS   = 120;
-}
-```
-
@@ -1 +0,0 @@
-## Controllers
@@ -1,55 +0,0 @@
-## FSFW Core Modules
-
-These core modules provide the most important functionalities of the 
-Flight Software Framework
-
-### Clock
-
- * This is a class of static functions that can be used at anytime
- * Leap Seconds must be set if any time conversions from UTC to other times is used
-
-### ObjectManager
-
-* Must be created during program startup
-* The component which handles all references. All SystemObjects register at this component. 
-* Any SystemObject needs to have a unique ObjectId. Those can be managed like objects::framework_objects.
-* A reference to an object can be get by calling the following function. T must be the specific Interface you want to call.
-A nullptr check of the returning Pointer must be done. This function is based on Run-time type information. 
-
-```cpp
-template <typename T> T* ObjectManagerIF::get( object_id_t id )
-```
-* A typical way to create all objects on startup is a handing a static produce function to the
-  ObjectManager on creation. By calling objectManager->initialize() the produce function will be
-  called and all SystemObjects will be initialized afterwards.
-
-### Event Manager
-
-* Component which allows routing of events
-* Other objects can subscribe to specific events, ranges of events or all events of an object.
-* Subscriptions can be done during runtime but should be done during initialization
-* Amounts of allowed subscriptions can be configured in `FSFWConfig.h`
-
-### Health Table
-
-* A component which holds every health state 
-* Provides a thread safe way to access all health states without the need of message exchanges
-
-### Stores
-
-* The message based communication can only exchange a few bytes of information inside the message
-  itself. Therefore, additional information can  be exchanged with Stores. With this, only the
-  store address must be exchanged in the message.
-* Internally, the FSFW uses an IPC Store to exchange data between processes. For incoming TCs a TC
-  Store is used. For outgoing TM a TM store is used.
-* All of them should use the Thread Safe Class storagemanager/PoolManager
-
-### Tasks
-
-There are two different types of tasks:
- * The PeriodicTask just executes objects that are of type ExecutableObjectIF in the order of the
-   insertion to the Tasks.
- * FixedTimeslotTask executes a list of calls in the order of the given list. This is intended for
-   DeviceHandlers, where polling should be in a defined order. An example can be found in 
-   `defaultcfg/fsfwconfig/pollingSequence` folder
-
@@ -1 +0,0 @@
-## Device Handlers
@@ -1,135 +0,0 @@
-High-level overview
-======
-
-# Structure
-
-The general structure is driven by the usage of interfaces provided by objects. 
-The FSFW uses C++11 as baseline. The intention behind this is that this C++ Standard should be
-widely available, even with older compilers.
-The FSFW uses dynamic allocation during the initialization but provides static containers during runtime. 
-This simplifies the instantiation of objects and allows the usage of some standard containers. 
-Dynamic Allocation after initialization is discouraged and different solutions are provided in the
-FSFW to achieve that. The fsfw uses run-time type information but exceptions are not allowed.
-
-# Failure Handling
-
-Functions should return a defined `ReturnValue_t` to signal to the caller that something has
-gone wrong. Returnvalues must be unique. For this the function `returnvalue::makeCode`
-or the macro `MAKE_RETURN` can be used. The `CLASS_ID` is a unique id for that type of object.
-See `returnvalues/FwClassIds` folder. The user can add custom `CLASS_ID`s via the
-`fsfwconfig` folder.
-
-# OSAL
-
-The FSFW provides operation system abstraction layers for Linux, FreeRTOS and RTEMS. 
-The OSAL provides periodic tasks, message queues, clocks and semaphores as well as mutexes.
-The [OSAL README](doc/README-osal.md#top) provides more detailed information on provided components
-and how to use them.
-
-# Core Components 
-
-The FSFW has following core components. More detailed informations can be found in the
-[core component section](doc/README-core.md#top):
-
-1. Tasks: Abstraction for different (periodic) task types like periodic tasks or tasks 
-   with fixed timeslots
-2. ObjectManager: This module stores all `SystemObjects` by mapping a provided unique object ID
-   to the object handles.
-3. Static Stores: Different stores are provided to store data of variable size (like telecommands 
-   or small telemetry) in a pool structure without using dynamic memory allocation.
-   These pools are allocated up front.
-3. Clock: This module provided common time related functions
-4. EventManager: This module allows routing of events generated by `SystemObjects`
-5. HealthTable: A component which stores the health states of objects
-
-# Static IDs in the framework
-
-Some parts of the framework use a static routing address for communication. 
-An example setup of ids can be found in the example config in `defaultcft/fsfwconfig/objects`
- inside the function `Factory::setStaticFrameworkObjectIds()`.
-
-# Events
-
-Events are tied to objects. EventIds can be generated by calling the Macro MAKE_EVENT. 
-This works analog to the returnvalues. Every object that needs own EventIds has to get a
-unique SUBSYSTEM_ID. Every SystemObject can call triggerEvent from the parent class.
-Therefore, event messages contain the specific EventId and the objectId of the object that
-has triggered.
-
-# Internal Communication
-
-Components communicate mostly via Messages through Queues. 
-Those queues are created by calling the singleton `QueueFactory::instance()->create()` which
-will create `MessageQueue` instances for the used OSAL.
-
-# External Communication
-
-The external communication with the mission control system is mostly up to the user implementation.
-The FSFW provides PUS Services which can be used to but don't need to be used. 
-The services can be seen as a conversion from a TC to a message based communication and back.
-
-## TMTC Communication
-
-The FSFW provides some components to facilitate TMTC handling via the PUS commands.
-For example, a UDP or TCP PUS server socket can be opened on a specific port using the
-files located in `osal/common`. The FSFW example uses this functionality to allow sending telecommands
-and receiving telemetry using the [TMTC commander application](https://github.com/spacefisch/tmtccmd).
-Simple commands like the PUS Service 17 ping service can be tested by simply running the
-`tmtc_client_cli.py` or `tmtc_client_gui.py` utility in 
-the [example tmtc folder](https://egit.irs.uni-stuttgart.de/fsfw/fsfw_example_public/src/branch/master/tmtc)
-while the `fsfw_example` application is running.
-
-More generally, any class responsible for handling incoming telecommands and sending telemetry
-can implement the generic `TmTcBridge` class located in `tmtcservices`. Many applications
-also use a dedicated polling task for reading telecommands which passes telecommands
-to the `TmTcBridge` implementation.
-
-## CCSDS Frames, CCSDS Space Packets and PUS
-
-If the communication is based on CCSDS Frames and Space Packets, several classes can be used to
-distributed the packets to the corresponding services. Those can be found in `tcdistribution`. 
-If Space Packets are used, a timestamper has to be provided by the user. 
-An example can be found in the `timemanager` folder, which uses `CCSDSTime::CDS_short`.
-
-# Device Handlers
-
-DeviceHandlers are another important component of the FSFW. 
-The idea is, to have a software counterpart of every physical device to provide a simple mode,
-health and commanding interface. By separating the underlying Communication Interface with 
-`DeviceCommunicationIF`, a device handler (DH) can be tested on different hardware.
-The DH has mechanisms to monitor the communication with the physical device which allow
-for FDIR reaction.  Device Handlers can be created by implementing `DeviceHandlerBase`. 
-A standard FDIR component for the DH will be created automatically but can
-be overwritten by the user. More information on DeviceHandlers can be found in the
-related [documentation section](doc/README-devicehandlers.md#top).
-
-# Modes and Health
-
-The two interfaces `HasModesIF` and `HasHealthIF` provide access for commanding and monitoring
-of components. On-board Mode Management is implement in hierarchy system. 
-DeviceHandlers and Controllers are the lowest part of the hierarchy. 
-The next layer are Assemblies. Those assemblies act as a component which handle
-redundancies of handlers. Assemblies share a common core with the next level which
-are the Subsystems. 
-
-Those Assemblies are intended to act as auto-generated components from a database which describes
-the subsystem modes. The definitions contain transition and target tables which contain the DH,
-Assembly and Controller Modes to be commanded.
-Transition tables contain as many steps as needed to reach the mode from any other mode, e.g. a
-switch into any higher AOCS mode might first turn on the sensors, than the actuators and the
-controller as last component. 
-The target table is used to describe the state that is checked continuously by the subsystem. 
-All of this allows System Modes to be generated as Subsystem object as well from the same database. 
-This System contains list of subsystem modes in the transition and target tables. 
-Therefore, it allows a modular system to create system modes and easy commanding of those, because
-only the highest components must be commanded.
-
-The health state represents if the component is able to perform its tasks. 
-This can be used to signal the system to avoid using this component instead of a redundant one.
-The on-board FDIR uses the health state for isolation and recovery. 
-
-# Unit Tests
-
-Unit Tests are provided in the unittest folder. Those use the catch2 framework but do not include
-catch2 itself. More information on how to run these tests can be found in the separate
-[`fsfw_tests` reposoitory](https://egit.irs.uni-stuttgart.de/fsfw/fsfw_tests)
@@ -1,174 +0,0 @@
-## Local Data Pools Developer Information
-
-The following text is targeted towards mission software developers which would like
-to use the local data pools provided by the FSFW to store data like sensor values so they can be 
-used by other software objects like controllers as well. If a custom class should have a local 
-pool which  can be used by other software objects as well, following steps have to be performed:
-
-1. Create a `LocalDataPoolManager` member object in the custom class
-2. Implement the `HasLocalDataPoolIF` with specifies the interface between the local pool manager
-and the class owning the local pool.
-
-The local data pool manager is also able to process housekeeping service requests in form
-of messages, generate periodic housekeeping packet, generate notification and snapshots of changed
-variables and datasets and process notifications and snapshots coming from other objects.
-The two former tasks are related to the external interface using telemetry and telecommands (TMTC)
-while the later two are related to data consumers like controllers only acting on data change 
-detected by the data creator instead of checking the data manually each cycle. Two important 
-framework classes `DeviceHandlerBase` and `ExtendedControllerBase` already perform the two steps 
-shown above so the steps required are altered slightly.
-
-### Storing and Accessing pool data 
-
-The pool manager is responsible for thread-safe access of the pool data, but the actual
-access to the pool data from the point of view of a mission software developer happens via proxy
-classes like pool variable classes. These classes store a copy
-of the pool variable with the matching datatype and copy the actual data from the local pool
-on a `read` call. Changed variables can then be written to the local pool with a `commit` call.
-The `read` and `commit` calls are thread-safe and can be called concurrently from data creators
-and data consumers. Generally, a user will create a dataset class which in turn groups all 
-cohesive pool variables. These sets simply iterator over the list of variables and call the 
-`read` and `commit` functions of each variable. The following diagram shows the
-high-level architecture of the local data pools.
-
-.. image:: ../misc/logo/FSFW_Logo_V3_bw.png
-   :alt: FSFW Logo
-
-
-An example is shown for using the local data pools with a Gyroscope.
-For example, the following code shows an implementation to access data from a Gyroscope taken
-from the SOURCE CubeSat project:
-
-```cpp
-class GyroPrimaryDataset: public StaticLocalDataSet<3 * sizeof(float)> {
-public:
-    /**
-     * Constructor for data users
-     * @param gyroId
-     */
-    GyroPrimaryDataset(object_id_t gyroId):
-            StaticLocalDataSet(sid_t(gyroId, gyrodefs::GYRO_DATA_SET_ID)) {
-        setAllVariablesReadOnly();
-    }
-
-    lp_var_t<float> angVelocityX = lp_var_t<float>(sid.objectId,
-            gyrodefs::ANGULAR_VELOCITY_X, this);
-    lp_var_t<float> angVelocityY = lp_var_t<float>(sid.objectId,
-            gyrodefs::ANGULAR_VELOCITY_Y, this);
-    lp_var_t<float> angVelocityZ = lp_var_t<float>(sid.objectId,
-            gyrodefs::ANGULAR_VELOCITY_Z, this);
-private:
-
-    friend class GyroHandler;
-    /**
-     * Constructor for data creator
-     * @param hkOwner
-     */
-    GyroPrimaryDataset(HasLocalDataPoolIF* hkOwner):
-            StaticLocalDataSet(hkOwner, gyrodefs::GYRO_DATA_SET_ID) {}
-};
-```
-
-There is a public constructor for users which sets all variables to read-only and there is a
-constructor for the GyroHandler data creator by marking it private and declaring the `GyroHandler`
-as a friend class. Both the atittude controller and the `GyroHandler` can now
-use the same class definition to access the pool variables with `read` and `commit` semantics
-in a thread-safe way. Generally, each class requiring access will have the set class as a member
-class. The data creator will also be generally a `DeviceHandlerBase` subclass and some additional
-steps are necessary to expose the set for housekeeping purposes.
-
-### Using the local data pools in a `DeviceHandlerBase` subclass
-
-It is very common to store data generated by devices like a sensor into a pool which can 
-then be used by other objects. Therefore, the `DeviceHandlerBase` already has a
-local pool. Using the aforementioned example, our `GyroHandler` will now have the set class
-as a member:
-
-```cpp
-class GyroHandler: ... {
-
-public:
-	...
-private:
-	...
-	GyroPrimaryDataset gyroData;
-	...
-};
-```
-
-The constructor used for the creators expects the owner class as a parameter, so we initialize
-the object in the `GyroHandler` constructor like this:
-
-```cpp
-GyroHandler::GyroHandler(object_id_t objectId, object_id_t comIF,
-        CookieIF *comCookie, uint8_t switchId):
-        DeviceHandlerBase(objectId, comIF, comCookie), switchId(switchId),
-		gyroData(this) {}
-```
-
-We need to assign the set to a reply ID used in the `DeviceHandlerBase`. 
-The combination of the `GyroHandler` object ID and the reply ID will be the 64-bit structure ID
-`sid_t` and is used to globally identify the set, for example when requesting housekeeping data or
-generating update messages. We need to assign our custom set class in some way so that the local 
-pool manager can access the custom data sets as well.
-By default, the `getDataSetHandle` will take care of this tasks. The default implementation for a
-`DeviceHandlerBase` subclass will use the internal command map to retrieve 
-a handle to a dataset from a given reply ID. Therefore,
-we assign the set in the `fillCommandAndReplyMap` function:
-
-```cpp
-void GyroHandler::fillCommandAndReplyMap() {
-	...
-	this->insertInCommandAndReplyMap(gyrodefs::GYRO_DATA, 3, &gyroData);
-	...
-}
-```
-
-Now, we need to create the actual pool entries as well, using the `initializeLocalDataPool` 
-function. Here, we also immediately subscribe for periodic housekeeping packets 
-with an interval of 4 seconds. They are still disabled in this example and can be enabled 
-with a housekeeping service command.
-
-```cpp
-ReturnValue_t GyroHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
-		LocalDataPoolManager &poolManager) {
-	localDataPoolMap.emplace(gyrodefs::ANGULAR_VELOCITY_X,
-			new PoolEntry<float>({0.0}));
-	localDataPoolMap.emplace(gyrodefs::ANGULAR_VELOCITY_Y,
-			new PoolEntry<float>({0.0}));
-	localDataPoolMap.emplace(gyrodefs::ANGULAR_VELOCITY_Z,
-			new PoolEntry<float>({0.0}));
-	localDataPoolMap.emplace(gyrodefs::GENERAL_CONFIG_REG42,
-			new PoolEntry<uint8_t>({0}));
-	localDataPoolMap.emplace(gyrodefs::RANGE_CONFIG_REG43,
-			new PoolEntry<uint8_t>({0}));
-
-	poolManager.subscribeForPeriodicPacket(gyroData.getSid(), false, 4.0, false);
-	return returnvalue::OK;
-}
-```
-
-Now, if we receive some sensor data and converted them into the right format, 
-we can write it into the pool like this, using a guard class to ensure the set is commited back 
-in any case:
-
-```cpp
-PoolReadGuard readHelper(&gyroData);
-if(readHelper.getReadResult() == returnvalue::OK) {
-	if(not gyroData.isValid()) {
-		gyroData.setValidity(true, true);
-	}
-
-	gyroData.angVelocityX = angularVelocityX;
-	gyroData.angVelocityY = angularVelocityY;
-	gyroData.angVelocityZ = angularVelocityZ;
-}
-```
-
-The guard class will commit the changed data on destruction automatically.
-
-### Using the local data pools in a `ExtendedControllerBase` subclass
-
-Coming soon
-
-
@@ -1,32 +0,0 @@
-# Operating System Abstraction Layer (OSAL)
-
-Some specific information on the provided OSALs are provided.
-
-## Linux OSAL
-
-This OSAL can be used to compile for Linux host systems like Ubuntu 20.04 or for 
-embedded Linux targets like the Raspberry Pi. This OSAL generally requires threading support
-and real-time functionalities. For most UNIX systems, this is done by adding `-lrt` and `-lpthread` to the linked libraries in the compilation process. The CMake build support provided will do this automatically for the `fsfw` target. It should be noted that most UNIX systems need to be configured specifically to allow the real-time functionalities required by the FSFW.
-
-More information on how to set up a Linux system accordingly can be found in the 
-[Linux README of the FSFW example application](https://egit.irs.uni-stuttgart.de/fsfw/fsfw_example/src/branch/master/doc/README-linux.md#top)
-
-## Hosted OSAL
-
-This is the newest OSAL. Support for Semaphores has not been implemented yet and will propably be implemented as soon as C++20 with Semaphore support has matured. This OSAL can be used to run the FSFW on any host system, but currently has only been tested on Windows 10 and Ubuntu 20.04. Unlike the other OSALs, it uses dynamic memory allocation (e.g. for the message queue implementation). Cross-platform serial port (USB) support might be added soon.
-
-## FreeRTOS OSAL
-
-FreeRTOS is not included and the developer needs to take care of compiling the FreeRTOS sources and adding the `FreeRTOSConfig.h` file location to the include path. This OSAL has only been tested extensively with the pre-emptive scheduler configuration so far but it should in principle also be possible to use a cooperative scheduler. It is recommended to use the `heap_4` allocation scheme. When using newlib (nano), it is also recommended to add `#define configUSE_NEWLIB_REENTRANT` to the FreeRTOS configuration file to ensure thread-safety.
-
-When using this OSAL, developers also need to provide an implementation for the `vRequestContextSwitchFromISR` function. This has been done because the call to request a context switch from an ISR is generally located in the `portmacro.h` header and is different depending on the target architecture or device.
-
-## RTEMS OSAL
-
-The RTEMS OSAL was the first implemented OSAL which is also used on the active satellite Flying Laptop.
-
-## TCP/IP socket abstraction
-
-The Linux and Host OSAL provide abstraction layers for the socket API. Currently, only UDP sockets have been imlemented. This is very useful to test TMTC handling either on the host computer directly (targeting localhost with a TMTC application) or on embedded Linux devices, sending TMTC packets via Ethernet.
-
-
@@ -1 +0,0 @@
-## PUS Services
@@ -21,8 +21,9 @@ project = "Flight Software Framework"
 copyright = "2021, Institute of Space Systems (IRS)"
 author = "Institute of Space Systems (IRS)"

+# TODO: Should try to read this from CMakeLists.txt automatically..
 # The full version, including alpha/beta/rc tags
-release = "2.0.1"
+release = "5.0.0"


 # -- General configuration ---------------------------------------------------
@@ -48,7 +49,12 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = "alabaster"
+html_theme = "sphinx_rtd_theme"
+
+html_theme_options = {
+    "extra_nav_links": {"Impressum" : "https://www.uni-stuttgart.de/impressum", "Datenschutz": "https://info.irs.uni-stuttgart.de/datenschutz/datenschutzWebmit.html"}
+}
+

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -6,15 +6,14 @@ High-level overview
 Structure
 ----------

-The general structure is driven by the usage of interfaces provided by objects.
-The FSFW uses C++17 as baseline.
-It also uses dynamic allocation during the initialization but provides
-static containers during runtime.
-This simplifies the instantiation of objects and allows the usage of some
-standard containers.
-Dynamic Allocation after initialization is discouraged and different solutions
-are provided in the FSFW to achieve that. The fsfw uses run-time type
-information but will not throw exceptions.
+The general structure is driven by the usage of interfaces provided by objects. 
+The FSFW uses C++17 as baseline. Most modern compilers like GCC should have support for this
+standard, even for micocontrollers.
+
+The FSFW might use dynamic allocation during program initialization but not during runtime.
+It offers pool objects, static containers and it also exposes the
+`Embedded Template Library <https://www.etlcpp.com/>`_ to allow writing code which does not perform
+allocation during runtime. The fsfw uses run-time type information but will not throw exceptions.

 Failure Handling
 -----------------
@@ -0,0 +1 @@
+sphinx-rtd-theme==1.3.0
@@ -4,6 +4,10 @@
 #include <cstddef>
 #include <cstdint>

+// It is assumed the user has a subsystem and class ID list in some user header files.
+// #include "events/subsystemIdRanges.h"
+// #include "returnvalues/classIds.h"
+
 //! Used to determine whether C++ ostreams are used which can increase
 //! the binary size significantly. If this is disabled,
 //! the C stdio functions can be used alternatively
@@ -4,7 +4,6 @@
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw/events/EventManager.h>
 #include <fsfw/health/HealthTable.h>
-#include <fsfw/tmtcpacket/pus/tm/TmPacketStored.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <fsfw/internalerror/InternalErrorReporter.h>
@@ -41,13 +40,9 @@ void Factory::setStaticFrameworkObjectIds() {
 	CommandingServiceBase::defaultPacketSource = objects::NO_OBJECT;
 	CommandingServiceBase::defaultPacketDestination = objects::NO_OBJECT;

-	VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
-
 	DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
 	DeviceHandlerBase::rawDataReceiverId = objects::PUS_SERVICE_2_DEVICE_ACCESS;

 	DeviceHandlerFailureIsolation::powerConfirmationId = objects::NO_OBJECT;
-
-	TmPacketBase::timeStamperId = objects::NO_OBJECT;
 }

@@ -0,0 +1,110 @@
+#! /bin/python
+
+
+import argparse
+import json
+import urllib.request
+import re
+from pathlib import Path
+
+def main() -> None:
+    parser = argparse.ArgumentParser(
+        description="List undocumented PRs"
+    )
+    parser.add_argument("-v", "--version", type=str, required=True)
+    args = parser.parse_args()
+    
+    match = re.search("([0-9]+\.[0-9]+\.[0-9]+)", args.version)
+    
+    if not match:
+        print("invalid version")
+        exit(1)
+    
+    version = "v" + match.group(1)
+    
+    print("looking for milestone for " + version + " ...")
+    
+    
+    with urllib.request.urlopen("https://egit.irs.uni-stuttgart.de/api/v1/repos/fsfw/fsfw/milestones?name=" + version) as milestone_json:
+        milestones = json.load(milestone_json)
+        if (len(milestones) == 0):
+            print("did not find any milestone")
+            exit(1)
+        if (len(milestones) > 1):
+            print("found multiple milestons")
+        milestone_title = milestones[0]['title']
+        milestone = str(milestones[0]['id'])
+        print("Using Milestone \""+ milestone_title + "\" with id " + milestone)
+    
+    milestone_prs = []
+    
+    page = 1
+    last_count = 1;
+    while last_count != 0:
+        with urllib.request.urlopen("https://egit.irs.uni-stuttgart.de/api/v1/repos/fsfw/fsfw/pulls?state=closed&milestone=" + str(milestone) + "&limit=100&page=" + str(page)) as pull_requests_json:
+            pull_requests = json.load(pull_requests_json)
+            for pr in pull_requests:
+                milestone_prs.append({'number': str(pr['number']), 'title' : pr['title']})
+            page += 1
+            last_count = len(pull_requests)
+    
+    print("Found " + str(len(milestone_prs)) + " closed PRs in Milestone")
+    
+    print("looking for CHANGELOG.md ...")
+    
+    path = Path(".")
+    
+    files = list(path.glob("CHANGELOG.md"))
+    
+    if (len(files) != 1):
+        files = list(path.glob("../CHANGELOG.md"))
+        
+    if (len(files) != 1):
+        print("did not find CHANGELOG.md. Run script in either root directory or scripts subfolder.")
+        exit(1)
+        
+    print("Scanning CHANGELOG.md ...")
+    
+    changelog_prs = []
+    
+    with open(files[0]) as changelog:
+        line = changelog.readline()
+        while (line):
+            #print("line: " + line)
+            match = re.search("\#.+(v[0-9]+\.[0-9]+\.[0-9]+)", line)
+            if (match):
+                if match.group(1) == version:
+                    #print("found version")
+                    line = changelog.readline()
+                    continue
+                else:
+                    #print("done with " + match.group(1))
+                    break
+            
+            match = re.search("PR: https://egit\.irs\.uni-stuttgart\.de/fsfw/fsfw/pulls/([0-9]+)", line)
+            if match:
+                changelog_prs.append(match.group(1))
+                
+            line = changelog.readline()
+    
+    print("Found " + str(len(changelog_prs)) + " PRs in CHANGELOG.md")
+    
+    print("")
+    
+    copy_array = changelog_prs.copy()
+    print("PRs in CHANGELOG.md that are not in Milestone:")
+    for pr in milestone_prs:
+        if pr['number'] in copy_array:
+            copy_array.remove(pr['number'])
+    for pr in copy_array:
+        print("https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/" + pr)
+
+    print("")
+
+    print("PRs in milestone that are not in CHANGELOG.md:")
+    
+    for pr in milestone_prs:
+        if pr['number'] not in changelog_prs:
+            print("- " + pr['title'] + "\n  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/" + pr['number'])
+
+main()
@@ -207,7 +207,7 @@ def check_for_cmake_build_dir(build_dir_list: list) -> list:
 def perform_lcov_operation(directory: str, chdir: bool):
    if chdir:
        os.chdir(directory)
-    cmd_runner("cmake --build . -- fsfw-tests_coverage -j")
+    cmd_runner("cmake --build . -j -- fsfw-tests_coverage")


 def determine_build_dir(build_dir_list: List[str]):
@@ -59,17 +59,24 @@ void ActionHelper::setQueueToUse(MessageQueueIF* queue) { queueToUse = queue; }

 void ActionHelper::prepareExecution(MessageQueueId_t commandedBy, ActionId_t actionId,
                                    store_address_t dataAddress) {
+  bool hasAdditionalData = false;
  const uint8_t* dataPtr = nullptr;
  size_t size = 0;
-  ReturnValue_t result = ipcStore->getData(dataAddress, &dataPtr, &size);
-  if (result != returnvalue::OK) {
-    CommandMessage reply;
-    ActionMessage::setStepReply(&reply, actionId, 0, result);
-    queueToUse->sendMessage(commandedBy, &reply);
-    return;
+  ReturnValue_t result;
+  if (dataAddress != store_address_t::invalid()) {
+    hasAdditionalData = true;
+    ReturnValue_t result = ipcStore->getData(dataAddress, &dataPtr, &size);
+    if (result != returnvalue::OK) {
+      CommandMessage reply;
+      ActionMessage::setStepReply(&reply, actionId, 0, result);
+      queueToUse->sendMessage(commandedBy, &reply);
+      return;
+    }
  }
  result = owner->executeAction(actionId, commandedBy, dataPtr, size);
-  ipcStore->deleteData(dataAddress);
+  if (hasAdditionalData) {
+    ipcStore->deleteData(dataAddress);
+  }
  if (result == HasActionsIF::EXECUTION_FINISHED) {
    CommandMessage reply;
    ActionMessage::setCompletionReply(&reply, actionId, true, result);
@@ -16,8 +16,8 @@ class CommandActionHelper {
 public:
  explicit CommandActionHelper(CommandsActionsIF* owner);
  virtual ~CommandActionHelper();
-  ReturnValue_t commandAction(object_id_t commandTo, ActionId_t actionId, const uint8_t* data,
-                              uint32_t size);
+  ReturnValue_t commandAction(object_id_t commandTo, ActionId_t actionId,
+                              const uint8_t* data = nullptr, uint32_t size = 0);
  ReturnValue_t commandAction(object_id_t commandTo, ActionId_t actionId, SerializeIF* data);
  ReturnValue_t initialize();
  ReturnValue_t handleReply(CommandMessage* reply);
@@ -2,7 +2,6 @@
 #define FSFW_CFDP_H

 #include "cfdp/definitions.h"
-#include "cfdp/handler/DestHandler.h"
 #include "cfdp/handler/FaultHandlerBase.h"
 #include "cfdp/tlv/Lv.h"
 #include "cfdp/tlv/StringLv.h"
@@ -1,5 +1,5 @@
 target_sources(${LIB_FSFW_NAME} PRIVATE CfdpMessage.cpp CfdpDistributor.cpp
-                                        VarLenFields.cpp)
+                                        VarLenFields.cpp helpers.cpp)

 add_subdirectory(pdu)
 add_subdirectory(tlv)
@@ -131,3 +131,7 @@ bool cfdp::VarLenField::operator<(const cfdp::VarLenField &other) const {
 bool cfdp::VarLenField::operator==(const cfdp::VarLenField &other) const {
  return getWidth() == other.getWidth() and getValue() == other.getValue();
 }
+
+bool cfdp::VarLenField::operator!=(const cfdp::VarLenField &other) const {
+  return not(*this == other);
+}
@@ -7,6 +7,7 @@

 #include "fsfw/cfdp/definitions.h"
 #include "fsfw/serialize/SerializeIF.h"
+#include "fsfw/serviceinterface.h"
 #include "fsfw/util/UnsignedByteField.h"

 namespace cfdp {
@@ -27,6 +28,7 @@ class VarLenField : public SerializeIF {
  VarLenField(cfdp::WidthInBytes width, size_t value);

  bool operator==(const VarLenField &other) const;
+  bool operator!=(const VarLenField &other) const;
  bool operator<(const VarLenField &other) const;

  ReturnValue_t setValue(cfdp::WidthInBytes, size_t value);
@@ -42,7 +44,16 @@ class VarLenField : public SerializeIF {
  [[nodiscard]] cfdp::WidthInBytes getWidth() const;
  [[nodiscard]] size_t getValue() const;

+#if FSFW_CPP_OSTREAM_ENABLED == 1
+  friend std::ostream &operator<<(std::ostream &os, const VarLenField &id) {
+    os << "dec: " << id.getValue() << ", hex: " << std::hex << std::setw(id.getWidth())
+       << std::setfill('0') << id.getValue() << std::dec << std::setfill('0');
+    return os;
+  }
+#endif
 private:
+  using SerializeIF::deSerialize;  // we overloaded above, so this is needed to uncofuse the
+                                   // compiler
  ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
                            Endianness streamEndianness) override;

@@ -82,6 +93,12 @@ struct TransactionId {
    return entityId == other.entityId and seqNum == other.seqNum;
  }

+#if FSFW_CPP_OSTREAM_ENABLED == 1
+  friend std::ostream &operator<<(std::ostream &os, const TransactionId &id) {
+    os << "Source ID { " << id.entityId << " }, Sequence Number " << id.seqNum.getValue();
+    return os;
+  }
+#endif
  EntityId entityId;
  TransactionSeqNum seqNum;
 };
@@ -20,7 +20,7 @@ static constexpr uint8_t VERSION_BITS = CFDP_VERSION_2 << 5;
 static constexpr uint8_t CFDP_CLASS_ID = CLASS_ID::CFDP;

 static constexpr ReturnValue_t INVALID_TLV_TYPE = returnvalue::makeCode(CFDP_CLASS_ID, 1);
-static constexpr ReturnValue_t INVALID_DIRECTIVE_FIELDS = returnvalue::makeCode(CFDP_CLASS_ID, 2);
+static constexpr ReturnValue_t INVALID_DIRECTIVE_FIELD = returnvalue::makeCode(CFDP_CLASS_ID, 2);
 static constexpr ReturnValue_t INVALID_PDU_DATAFIELD_LEN = returnvalue::makeCode(CFDP_CLASS_ID, 3);
 static constexpr ReturnValue_t INVALID_ACK_DIRECTIVE_FIELDS =
    returnvalue::makeCode(CFDP_CLASS_ID, 4);
@@ -30,17 +30,18 @@ static constexpr ReturnValue_t METADATA_CANT_PARSE_OPTIONS =
    returnvalue::makeCode(CFDP_CLASS_ID, 5);
 static constexpr ReturnValue_t NAK_CANT_PARSE_OPTIONS = returnvalue::makeCode(CFDP_CLASS_ID, 6);
 static constexpr ReturnValue_t FINISHED_CANT_PARSE_FS_RESPONSES =
-    returnvalue::makeCode(CFDP_CLASS_ID, 6);
+    returnvalue::makeCode(CFDP_CLASS_ID, 7);
 static constexpr ReturnValue_t FILESTORE_REQUIRES_SECOND_FILE =
    returnvalue::makeCode(CFDP_CLASS_ID, 8);
 //! Can not parse filestore response because user did not pass a valid instance
 //! or remaining size is invalid
 static constexpr ReturnValue_t FILESTORE_RESPONSE_CANT_PARSE_FS_MESSAGE =
    returnvalue::makeCode(CFDP_CLASS_ID, 9);
+static constexpr ReturnValue_t INVALID_PDU_FORMAT = returnvalue::makeCode(CFDP_CLASS_ID, 10);

 //! Checksum types according to the SANA Checksum Types registry
 //! https://sanaregistry.org/r/checksum_identifiers/
-enum ChecksumTypes {
+enum ChecksumType {
  // Modular legacy checksum
  MODULAR = 0,
  CRC_32_PROXIMITY_1 = 1,
@@ -49,9 +50,9 @@ enum ChecksumTypes {
  NULL_CHECKSUM = 15
 };

-enum PduTypes : uint8_t { FILE_DIRECTIVE = 0, FILE_DATA = 1 };
+enum PduType : uint8_t { FILE_DIRECTIVE = 0, FILE_DATA = 1 };

-enum TransmissionModes : uint8_t { ACKNOWLEDGED = 0, UNACKNOWLEDGED = 1 };
+enum TransmissionMode : uint8_t { ACKNOWLEDGED = 0, UNACKNOWLEDGED = 1 };

 enum SegmentMetadataFlag : bool { NOT_PRESENT = false, PRESENT = true };

@@ -69,8 +70,9 @@ enum WidthInBytes : uint8_t {
  FOUR_BYTES = 4,
 };

-enum FileDirectives : uint8_t {
+enum FileDirective : uint8_t {
  INVALID_DIRECTIVE = 0x0f,
+  // The _DIRECTIVE suffix is mandatory here because of some nameclash!
  EOF_DIRECTIVE = 0x04,
  FINISH = 0x05,
  ACK = 0x06,
@@ -97,7 +99,7 @@ enum ConditionCode : uint8_t {
  CANCEL_REQUEST_RECEIVED = 0b1111
 };

-enum FaultHandlerCodes {
+enum FaultHandlerCode {
  RESERVED = 0b0000,
  NOTICE_OF_CANCELLATION = 0b0001,
  NOTICE_OF_SUSPENSION = 0b0010,
@@ -123,7 +125,7 @@ enum FileDeliveryStatus {

 enum PromptResponseRequired : uint8_t { PROMPT_NAK = 0, PROMPT_KEEP_ALIVE = 1 };

-enum TlvTypes : uint8_t {
+enum TlvType : uint8_t {
  FILESTORE_REQUEST = 0x00,
  FILESTORE_RESPONSE = 0x01,
  MSG_TO_USER = 0x02,
@@ -1,2 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE SourceHandler.cpp DestHandler.cpp
-                                        FaultHandlerBase.cpp UserBase.cpp)
+target_sources(${LIB_FSFW_NAME} PRIVATE FaultHandlerBase.cpp UserBase.cpp)
@@ -1,468 +0,0 @@
-#include "DestHandler.h"
-
-#include <etl/crc32.h>
-
-#include <utility>
-
-#include "fsfw/FSFW.h"
-#include "fsfw/cfdp/pdu/EofPduReader.h"
-#include "fsfw/cfdp/pdu/FileDataReader.h"
-#include "fsfw/cfdp/pdu/FinishedPduCreator.h"
-#include "fsfw/cfdp/pdu/PduHeaderReader.h"
-#include "fsfw/objectmanager.h"
-#include "fsfw/tmtcservices/TmTcMessage.h"
-
-using namespace returnvalue;
-
-cfdp::DestHandler::DestHandler(DestHandlerParams params, FsfwParams fsfwParams)
-    : tlvVec(params.maxTlvsInOnePdu),
-      userTlvVec(params.maxTlvsInOnePdu),
-      dp(std::move(params)),
-      fp(fsfwParams),
-      tp(params.maxFilenameLen) {
-  tp.pduConf.direction = cfdp::Direction::TOWARDS_SENDER;
-}
-
-const cfdp::DestHandler::FsmResult& cfdp::DestHandler::performStateMachine() {
-  ReturnValue_t result;
-  uint8_t errorIdx = 0;
-  fsmRes.resetOfIteration();
-  if (fsmRes.step == TransactionStep::IDLE) {
-    for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
-      if (infoIter->pduType == PduTypes::FILE_DIRECTIVE and
-          infoIter->directiveType == FileDirectives::METADATA) {
-        result = handleMetadataPdu(*infoIter);
-        checkAndHandleError(result, errorIdx);
-        // Store data was deleted in PDU handler because a store guard is used
-        dp.packetListRef.erase(infoIter++);
-      } else {
-        infoIter++;
-      }
-    }
-    if (fsmRes.step == TransactionStep::IDLE) {
-      // To decrease the already high complexity of the software, all packets arriving before
-      // a metadata PDU are deleted.
-      for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
-        fp.tcStore->deleteData(infoIter->storeId);
-        infoIter++;
-      }
-      dp.packetListRef.clear();
-    }
-
-    if (fsmRes.step != TransactionStep::IDLE) {
-      fsmRes.callStatus = CallStatus::CALL_AGAIN;
-    }
-    return updateFsmRes(errorIdx);
-  }
-  if (fsmRes.state == CfdpStates::BUSY_CLASS_1_NACKED) {
-    if (fsmRes.step == TransactionStep::RECEIVING_FILE_DATA_PDUS) {
-      for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
-        if (infoIter->pduType == PduTypes::FILE_DATA) {
-          result = handleFileDataPdu(*infoIter);
-          checkAndHandleError(result, errorIdx);
-          // Store data was deleted in PDU handler because a store guard is used
-          dp.packetListRef.erase(infoIter++);
-        } else if (infoIter->pduType == PduTypes::FILE_DIRECTIVE and
-                   infoIter->directiveType == FileDirectives::EOF_DIRECTIVE) {
-          // TODO: Support for check timer missing
-          result = handleEofPdu(*infoIter);
-          checkAndHandleError(result, errorIdx);
-          // Store data was deleted in PDU handler because a store guard is used
-          dp.packetListRef.erase(infoIter++);
-        } else {
-          infoIter++;
-        }
-      }
-    }
-    if (fsmRes.step == TransactionStep::TRANSFER_COMPLETION) {
-      result = handleTransferCompletion();
-      checkAndHandleError(result, errorIdx);
-    }
-    if (fsmRes.step == TransactionStep::SENDING_FINISHED_PDU) {
-      result = sendFinishedPdu();
-      checkAndHandleError(result, errorIdx);
-      finish();
-    }
-    return updateFsmRes(errorIdx);
-  }
-  if (fsmRes.state == CfdpStates::BUSY_CLASS_2_ACKED) {
-    // TODO: Will be implemented at a later stage
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "CFDP state machine for acknowledged mode not implemented yet" << std::endl;
-#endif
-  }
-  return updateFsmRes(errorIdx);
-}
-
-ReturnValue_t cfdp::DestHandler::passPacket(PacketInfo packet) {
-  if (dp.packetListRef.full()) {
-    return FAILED;
-  }
-  dp.packetListRef.push_back(packet);
-  return OK;
-}
-
-ReturnValue_t cfdp::DestHandler::initialize() {
-  if (fp.tmStore == nullptr) {
-    fp.tmStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TM_STORE);
-    if (fp.tmStore == nullptr) {
-      return FAILED;
-    }
-  }
-
-  if (fp.tcStore == nullptr) {
-    fp.tcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
-    if (fp.tcStore == nullptr) {
-      return FAILED;
-    }
-  }
-
-  if (fp.msgQueue == nullptr) {
-    return FAILED;
-  }
-  return OK;
-}
-
-ReturnValue_t cfdp::DestHandler::handleMetadataPdu(const PacketInfo& info) {
-  // Process metadata PDU
-  auto constAccessorPair = fp.tcStore->getData(info.storeId);
-  if (constAccessorPair.first != OK) {
-    // TODO: This is not a CFDP error. Event and/or warning?
-    return constAccessorPair.first;
-  }
-  cfdp::StringLv sourceFileName;
-  cfdp::StringLv destFileName;
-  MetadataInfo metadataInfo(tp.fileSize, sourceFileName, destFileName);
-  cfdp::Tlv* tlvArrayAsPtr = tlvVec.data();
-  metadataInfo.setOptionsArray(&tlvArrayAsPtr, std::nullopt, tlvVec.size());
-  MetadataPduReader reader(constAccessorPair.second.data(), constAccessorPair.second.size(),
-                           metadataInfo);
-  ReturnValue_t result = reader.parseData();
-  // TODO: The standard does not really specify what happens if this kind of error happens
-  //       I think it might be a good idea to cache some sort of error code, which
-  //       is translated into a warning and/or event by an upper layer
-  if (result != OK) {
-    return handleMetadataParseError(result, constAccessorPair.second.data(),
-                                    constAccessorPair.second.size());
-  }
-  return startTransaction(reader, metadataInfo);
-}
-
-ReturnValue_t cfdp::DestHandler::handleFileDataPdu(const cfdp::PacketInfo& info) {
-  // Process file data PDU
-  auto constAccessorPair = fp.tcStore->getData(info.storeId);
-  if (constAccessorPair.first != OK) {
-    // TODO: This is not a CFDP error. Event and/or warning?
-    return constAccessorPair.first;
-  }
-  cfdp::FileSize offset;
-  FileDataInfo fdInfo(offset);
-  FileDataReader reader(constAccessorPair.second.data(), constAccessorPair.second.size(), fdInfo);
-  ReturnValue_t result = reader.parseData();
-  if (result != OK) {
-    return result;
-  }
-  size_t fileSegmentLen = 0;
-  const uint8_t* fileData = fdInfo.getFileData(&fileSegmentLen);
-  FileOpParams fileOpParams(tp.destName.data(), fileSegmentLen);
-  fileOpParams.offset = offset.value();
-  if (dp.cfg.indicCfg.fileSegmentRecvIndicRequired) {
-    FileSegmentRecvdParams segParams;
-    segParams.offset = offset.value();
-    segParams.id = tp.transactionId;
-    segParams.length = fileSegmentLen;
-    segParams.recContState = fdInfo.getRecordContinuationState();
-    size_t segmentMetadatLen = 0;
-    auto* segMetadata = fdInfo.getSegmentMetadata(&segmentMetadatLen);
-    segParams.segmentMetadata = {segMetadata, segmentMetadatLen};
-    dp.user.fileSegmentRecvdIndication(segParams);
-  }
-  result = dp.user.vfs.writeToFile(fileOpParams, fileData);
-  if (offset.value() + fileSegmentLen > tp.progress) {
-    tp.progress = offset.value() + fileSegmentLen;
-  }
-  if (result != returnvalue::OK) {
-    // TODO: Proper Error handling
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "File write error" << std::endl;
-#endif
-  } else {
-    tp.deliveryStatus = FileDeliveryStatus::RETAINED_IN_FILESTORE;
-  }
-  return result;
-}
-
-ReturnValue_t cfdp::DestHandler::handleEofPdu(const cfdp::PacketInfo& info) {
-  // Process EOF PDU
-  auto constAccessorPair = fp.tcStore->getData(info.storeId);
-  if (constAccessorPair.first != OK) {
-    // TODO: This is not a CFDP error. Event and/or warning?
-    return constAccessorPair.first;
-  }
-  EofInfo eofInfo(nullptr);
-  EofPduReader reader(constAccessorPair.second.data(), constAccessorPair.second.size(), eofInfo);
-  ReturnValue_t result = reader.parseData();
-  if (result != OK) {
-    return result;
-  }
-  // TODO: Error handling
-  if (eofInfo.getConditionCode() == ConditionCode::NO_ERROR) {
-    tp.crc = eofInfo.getChecksum();
-    uint64_t fileSizeFromEof = eofInfo.getFileSize().value();
-    // CFDP 4.6.1.2.9: Declare file size error if progress exceeds file size
-    if (fileSizeFromEof > tp.progress) {
-      // TODO: File size error
-    }
-    tp.fileSize.setFileSize(fileSizeFromEof, std::nullopt);
-  }
-  if (dp.cfg.indicCfg.eofRecvIndicRequired) {
-    dp.user.eofRecvIndication(getTransactionId());
-  }
-  if (fsmRes.step == TransactionStep::RECEIVING_FILE_DATA_PDUS) {
-    if (fsmRes.state == CfdpStates::BUSY_CLASS_1_NACKED) {
-      fsmRes.step = TransactionStep::TRANSFER_COMPLETION;
-    } else if (fsmRes.state == CfdpStates::BUSY_CLASS_2_ACKED) {
-      fsmRes.step = TransactionStep::SENDING_ACK_PDU;
-    }
-  }
-  return returnvalue::OK;
-}
-
-ReturnValue_t cfdp::DestHandler::handleMetadataParseError(ReturnValue_t result,
-                                                          const uint8_t* rawData, size_t maxSize) {
-  // TODO: try to extract destination ID for error
-  // TODO: Invalid metadata PDU.
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-  sif::warning << "Parsing Metadata PDU failed with code " << result << std::endl;
-#else
-#endif
-  PduHeaderReader headerReader(rawData, maxSize);
-  result = headerReader.parseData();
-  if (result != OK) {
-    // TODO: Now this really should not happen. Warning or error,
-    //       yield or cache appropriate returnvalue
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "Parsing Header failed" << std::endl;
-#else
-#endif
-    // TODO: Trigger appropriate event
-    return result;
-  }
-  cfdp::EntityId destId;
-  headerReader.getDestId(destId);
-  RemoteEntityCfg* remoteCfg;
-  if (not dp.remoteCfgTable.getRemoteCfg(destId, &remoteCfg)) {
-// TODO: No remote config for dest ID. I consider this a configuration error.
-//       Warning or error, yield or cache appropriate returnvalue
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "No remote config exists for destination ID" << std::endl;
-#else
-#endif
-    // TODO: Trigger appropriate event
-  }
-  // TODO: Appropriate returnvalue?
-  return returnvalue::FAILED;
-}
-
-ReturnValue_t cfdp::DestHandler::startTransaction(MetadataPduReader& reader, MetadataInfo& info) {
-  if (fsmRes.state != CfdpStates::IDLE) {
-    // According to standard, discard metadata PDU if we are busy
-    return returnvalue::OK;
-  }
-  fsmRes.step = TransactionStep::TRANSACTION_START;
-  if (reader.getTransmissionMode() == TransmissionModes::UNACKNOWLEDGED) {
-    fsmRes.state = CfdpStates::BUSY_CLASS_1_NACKED;
-  } else if (reader.getTransmissionMode() == TransmissionModes::ACKNOWLEDGED) {
-    fsmRes.state = CfdpStates::BUSY_CLASS_2_ACKED;
-  }
-  tp.checksumType = info.getChecksumType();
-  tp.closureRequested = info.isClosureRequested();
-  size_t sourceNameSize = 0;
-  const uint8_t* sourceNamePtr = info.getSourceFileName().getValue(&sourceNameSize);
-  if (sourceNameSize > tp.sourceName.size()) {
-    // TODO: Warning, event etc.
-    return FAILED;
-  }
-  std::memcpy(tp.sourceName.data(), sourceNamePtr, sourceNameSize);
-  tp.sourceName[sourceNameSize] = '\0';
-  size_t destNameSize = 0;
-  const uint8_t* destNamePtr = info.getDestFileName().getValue(&destNameSize);
-  if (destNameSize > tp.destName.size()) {
-    // TODO: Warning, event etc.
-    return FAILED;
-  }
-  std::memcpy(tp.destName.data(), destNamePtr, destNameSize);
-  tp.destName[destNameSize] = '\0';
-  reader.fillConfig(tp.pduConf);
-  tp.pduConf.direction = Direction::TOWARDS_SENDER;
-  tp.transactionId.entityId = tp.pduConf.sourceId;
-  tp.transactionId.seqNum = tp.pduConf.seqNum;
-  if (not dp.remoteCfgTable.getRemoteCfg(tp.pduConf.sourceId, &tp.remoteCfg)) {
-    // TODO: Warning, event etc.
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "cfdp::DestHandler" << __func__
-                 << ": No remote configuration found for destination ID "
-                 << tp.pduConf.destId.getValue() << std::endl;
-#endif
-    return FAILED;
-  }
-  fsmRes.step = TransactionStep::RECEIVING_FILE_DATA_PDUS;
-  MetadataRecvdParams params(tp.transactionId, tp.pduConf.sourceId);
-  params.fileSize = tp.fileSize.getSize();
-  params.destFileName = tp.destName.data();
-  params.sourceFileName = tp.sourceName.data();
-  params.msgsToUserArray = dynamic_cast<MessageToUserTlv*>(userTlvVec.data());
-  params.msgsToUserLen = info.getOptionsLen();
-  FilesystemParams fparams(tp.destName.data());
-  // TODO: Filesystem errors?
-  if (dp.user.vfs.fileExists(fparams)) {
-    dp.user.vfs.truncateFile(fparams);
-  } else {
-    dp.user.vfs.createFile(fparams);
-  }
-  dp.user.metadataRecvdIndication(params);
-  return OK;
-}
-
-cfdp::CfdpStates cfdp::DestHandler::getCfdpState() const { return fsmRes.state; }
-
-ReturnValue_t cfdp::DestHandler::handleTransferCompletion() {
-  ReturnValue_t result;
-  if (tp.checksumType != ChecksumTypes::NULL_CHECKSUM) {
-    result = checksumVerification();
-    if (result != OK) {
-      // TODO: Warning / error handling?
-    }
-  } else {
-    tp.conditionCode = ConditionCode::NO_ERROR;
-  }
-  result = noticeOfCompletion();
-  if (result != OK) {
-  }
-  if (fsmRes.state == CfdpStates::BUSY_CLASS_1_NACKED) {
-    if (tp.closureRequested) {
-      fsmRes.step = TransactionStep::SENDING_FINISHED_PDU;
-    } else {
-      finish();
-    }
-  } else if (fsmRes.state == CfdpStates::BUSY_CLASS_2_ACKED) {
-    fsmRes.step = TransactionStep::SENDING_FINISHED_PDU;
-  }
-  return OK;
-}
-
-void cfdp::DestHandler::finish() {
-  tp.reset();
-  dp.packetListRef.clear();
-  fsmRes.state = CfdpStates::IDLE;
-  fsmRes.step = TransactionStep::IDLE;
-}
-
-ReturnValue_t cfdp::DestHandler::checksumVerification() {
-  std::array<uint8_t, 1024> buf{};
-  // TODO: Checksum verification and notice of completion
-  etl::crc32 crcCalc;
-  uint64_t currentOffset = 0;
-  FileOpParams params(tp.destName.data(), tp.fileSize.value());
-  while (currentOffset < tp.fileSize.value()) {
-    uint64_t readLen;
-    if (currentOffset + buf.size() > tp.fileSize.value()) {
-      readLen = tp.fileSize.value() - currentOffset;
-    } else {
-      readLen = buf.size();
-    }
-    if (readLen > 0) {
-      params.offset = currentOffset;
-      params.size = readLen;
-      auto result = dp.user.vfs.readFromFile(params, buf.data(), buf.size());
-      if (result != OK) {
-        // TODO: Better error handling
-        return FAILED;
-      }
-      crcCalc.add(buf.begin(), buf.begin() + readLen);
-    }
-    currentOffset += readLen;
-  }
-
-  uint32_t value = crcCalc.value();
-  if (value == tp.crc) {
-    tp.conditionCode = ConditionCode::NO_ERROR;
-    tp.deliveryCode = FileDeliveryCode::DATA_COMPLETE;
-  } else {
-    // TODO: Proper error handling
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "CRC check for file " << tp.sourceName.data() << " failed" << std::endl;
-#endif
-    tp.conditionCode = ConditionCode::FILE_CHECKSUM_FAILURE;
-  }
-  return OK;
-}
-
-ReturnValue_t cfdp::DestHandler::noticeOfCompletion() {
-  if (dp.cfg.indicCfg.transactionFinishedIndicRequired) {
-    TransactionFinishedParams params(tp.transactionId, tp.conditionCode, tp.deliveryCode,
-                                     tp.deliveryStatus);
-    dp.user.transactionFinishedIndication(params);
-  }
-  return OK;
-}
-
-ReturnValue_t cfdp::DestHandler::sendFinishedPdu() {
-  FinishedInfo info(tp.conditionCode, tp.deliveryCode, tp.deliveryStatus);
-  FinishPduCreator finishedPdu(tp.pduConf, info);
-  store_address_t storeId;
-  uint8_t* dataPtr = nullptr;
-  ReturnValue_t result =
-      fp.tcStore->getFreeElement(&storeId, finishedPdu.getSerializedSize(), &dataPtr);
-  if (result != OK) {
-    // TODO: Error handling and event, this is a non CFDP specific error (most likely store is full)
-    return result;
-  }
-  size_t serLen = 0;
-  result = finishedPdu.serialize(dataPtr, serLen, finishedPdu.getSerializedSize());
-  if (result != OK) {
-    // TODO: Error printout, this really should not happen
-    return result;
-  }
-  TmTcMessage msg(storeId);
-  result = fp.msgQueue->sendMessage(fp.packetDest.getReportReceptionQueue(), &msg);
-  if (result != OK) {
-    // TODO: Error handling and event, this is a non CFDP specific error (most likely store is full)
-    return result;
-  }
-  fsmRes.packetsSent++;
-  return OK;
-}
-
-cfdp::DestHandler::TransactionStep cfdp::DestHandler::getTransactionStep() const {
-  return fsmRes.step;
-}
-
-const cfdp::DestHandler::FsmResult& cfdp::DestHandler::updateFsmRes(uint8_t errors) {
-  fsmRes.errors = errors;
-  fsmRes.result = OK;
-  if (fsmRes.errors > 0) {
-    fsmRes.result = FAILED;
-  }
-  return fsmRes;
-}
-
-const cfdp::TransactionId& cfdp::DestHandler::getTransactionId() const { return tp.transactionId; }
-
-void cfdp::DestHandler::checkAndHandleError(ReturnValue_t result, uint8_t& errorIdx) {
-  if (result != OK and errorIdx < 3) {
-    fsmRes.errorCodes[errorIdx] = result;
-    errorIdx++;
-  }
-}
-
-void cfdp::DestHandler::setMsgQueue(MessageQueueIF& queue) { fp.msgQueue = &queue; }
-
-void cfdp::DestHandler::setEventReporter(EventReportingProxyIF& reporter) {
-  fp.eventReporter = &reporter;
-}
-
-const cfdp::DestHandlerParams& cfdp::DestHandler::getDestHandlerParams() const { return dp; }
-
-StorageManagerIF* cfdp::DestHandler::getTmStore() const { return fp.tcStore; }
-StorageManagerIF* cfdp::DestHandler::getTcStore() const { return fp.tmStore; }
@@ -1,202 +0,0 @@
-#ifndef FSFW_CFDP_CFDPDESTHANDLER_H
-#define FSFW_CFDP_CFDPDESTHANDLER_H
-
-#include <etl/list.h>
-#include <etl/set.h>
-
-#include <optional>
-#include <utility>
-
-#include "RemoteConfigTableIF.h"
-#include "UserBase.h"
-#include "defs.h"
-#include "fsfw/cfdp/handler/mib.h"
-#include "fsfw/cfdp/pdu/MetadataPduReader.h"
-#include "fsfw/cfdp/pdu/PduConfig.h"
-#include "fsfw/container/DynamicFIFO.h"
-#include "fsfw/storagemanager/StorageManagerIF.h"
-#include "fsfw/storagemanager/storeAddress.h"
-#include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
-
-namespace cfdp {
-
-struct PacketInfo {
-  PacketInfo(PduTypes type, store_address_t storeId,
-             std::optional<FileDirectives> directive = std::nullopt)
-      : pduType(type), directiveType(directive), storeId(storeId) {}
-
-  PduTypes pduType = PduTypes::FILE_DATA;
-  std::optional<FileDirectives> directiveType = FileDirectives::INVALID_DIRECTIVE;
-  store_address_t storeId = store_address_t::invalid();
-  PacketInfo() = default;
-};
-
-template <size_t SIZE>
-using LostSegmentsList = etl::set<etl::pair<uint64_t, uint64_t>, SIZE>;
-template <size_t SIZE>
-using PacketInfoList = etl::list<PacketInfo, SIZE>;
-using LostSegmentsListBase = etl::iset<etl::pair<uint64_t, uint64_t>>;
-using PacketInfoListBase = etl::ilist<PacketInfo>;
-
-struct DestHandlerParams {
-  DestHandlerParams(LocalEntityCfg cfg, UserBase& user, RemoteConfigTableIF& remoteCfgTable,
-                    PacketInfoListBase& packetList,
-                    // TODO: This container can potentially take tons of space. For a better
-                    //       memory efficient implementation, an additional abstraction could be
-                    //       be used so users can use uint32_t as the pair type
-                    LostSegmentsListBase& lostSegmentsContainer)
-      : cfg(std::move(cfg)),
-        user(user),
-        remoteCfgTable(remoteCfgTable),
-        packetListRef(packetList),
-        lostSegmentsContainer(lostSegmentsContainer) {}
-
-  LocalEntityCfg cfg;
-  UserBase& user;
-  RemoteConfigTableIF& remoteCfgTable;
-
-  PacketInfoListBase& packetListRef;
-  LostSegmentsListBase& lostSegmentsContainer;
-  uint8_t maxTlvsInOnePdu = 10;
-  size_t maxFilenameLen = 255;
-};
-
-struct FsfwParams {
-
-  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-             EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore, StorageManagerIF& tmStore)
-      : FsfwParams(packetDest, msgQueue, eventReporter) {
-    this->tcStore = &tcStore;
-    this->tmStore = &tmStore;
-  }
-
-  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-             EventReportingProxyIF* eventReporter)
-      : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
-  AcceptsTelemetryIF& packetDest;
-  MessageQueueIF* msgQueue;
-  EventReportingProxyIF* eventReporter = nullptr;
-  StorageManagerIF* tcStore = nullptr;
-  StorageManagerIF* tmStore = nullptr;
-};
-
-enum class CallStatus { DONE, CALL_AFTER_DELAY, CALL_AGAIN };
-
-class DestHandler {
- public:
-  enum class TransactionStep {
-    IDLE = 0,
-    TRANSACTION_START = 1,
-    RECEIVING_FILE_DATA_PDUS = 2,
-    SENDING_ACK_PDU = 3,
-    TRANSFER_COMPLETION = 4,
-    SENDING_FINISHED_PDU = 5
-  };
-
-  struct FsmResult {
-   public:
-    ReturnValue_t result = returnvalue::OK;
-    CallStatus callStatus = CallStatus::CALL_AFTER_DELAY;
-    TransactionStep step = TransactionStep::IDLE;
-    CfdpStates state = CfdpStates::IDLE;
-    uint32_t packetsSent = 0;
-    uint8_t errors = 0;
-    std::array<ReturnValue_t, 3> errorCodes = {};
-    void resetOfIteration() {
-      result = returnvalue::OK;
-      callStatus = CallStatus::CALL_AFTER_DELAY;
-      packetsSent = 0;
-      errors = 0;
-      errorCodes.fill(returnvalue::OK);
-    }
-  };
-  /**
-   * Will be returned if it is advisable to call the state machine operation call again
-   */
-  ReturnValue_t PARTIAL_SUCCESS = returnvalue::makeCode(0, 2);
-  ReturnValue_t FAILURE = returnvalue::makeCode(0, 3);
-  explicit DestHandler(DestHandlerParams handlerParams, FsfwParams fsfwParams);
-
-  /**
-   *
-   * @return
-   *  - @c returnvalue::OK  State machine OK for this execution cycle
-   *  - @c CALL_FSM_AGAIN   State machine should be called again.
-   */
-  const FsmResult& performStateMachine();
-  void setMsgQueue(MessageQueueIF& queue);
-  void setEventReporter(EventReportingProxyIF& reporter);
-
-  ReturnValue_t passPacket(PacketInfo packet);
-
-  ReturnValue_t initialize();
-
-  [[nodiscard]] CfdpStates getCfdpState() const;
-  [[nodiscard]] TransactionStep getTransactionStep() const;
-  [[nodiscard]] const TransactionId& getTransactionId() const;
-  [[nodiscard]] const DestHandlerParams& getDestHandlerParams() const;
-  [[nodiscard]] StorageManagerIF* getTcStore() const;
-  [[nodiscard]] StorageManagerIF* getTmStore() const;
-
- private:
-  struct TransactionParams {
-    // Initialize char vectors with length + 1 for 0 termination
-    explicit TransactionParams(size_t maxFileNameLen)
-        : sourceName(maxFileNameLen + 1), destName(maxFileNameLen + 1) {}
-
-    void reset() {
-      pduConf = PduConfig();
-      transactionId = TransactionId();
-      std::fill(sourceName.begin(), sourceName.end(), '\0');
-      std::fill(destName.begin(), destName.end(), '\0');
-      fileSize.setFileSize(0, false);
-      conditionCode = ConditionCode::NO_ERROR;
-      deliveryCode = FileDeliveryCode::DATA_INCOMPLETE;
-      deliveryStatus = FileDeliveryStatus::DISCARDED_DELIBERATELY;
-      crc = 0;
-      progress = 0;
-      remoteCfg = nullptr;
-      closureRequested = false;
-      checksumType = ChecksumTypes::NULL_CHECKSUM;
-    }
-
-    ChecksumTypes checksumType = ChecksumTypes::NULL_CHECKSUM;
-    bool closureRequested = false;
-    std::vector<char> sourceName;
-    std::vector<char> destName;
-    cfdp::FileSize fileSize;
-    TransactionId transactionId;
-    PduConfig pduConf;
-    ConditionCode conditionCode = ConditionCode::NO_ERROR;
-    FileDeliveryCode deliveryCode = FileDeliveryCode::DATA_INCOMPLETE;
-    FileDeliveryStatus deliveryStatus = FileDeliveryStatus::DISCARDED_DELIBERATELY;
-    uint32_t crc = 0;
-    uint64_t progress = 0;
-    RemoteEntityCfg* remoteCfg = nullptr;
-  };
-
-  std::vector<cfdp::Tlv> tlvVec;
-  std::vector<cfdp::Tlv> userTlvVec;
-  DestHandlerParams dp;
-  FsfwParams fp;
-  TransactionParams tp;
-  FsmResult fsmRes;
-
-  ReturnValue_t startTransaction(MetadataPduReader& reader, MetadataInfo& info);
-  ReturnValue_t handleMetadataPdu(const PacketInfo& info);
-  ReturnValue_t handleFileDataPdu(const PacketInfo& info);
-  ReturnValue_t handleEofPdu(const PacketInfo& info);
-  ReturnValue_t handleMetadataParseError(ReturnValue_t result, const uint8_t* rawData,
-                                         size_t maxSize);
-  ReturnValue_t handleTransferCompletion();
-  ReturnValue_t sendFinishedPdu();
-  ReturnValue_t noticeOfCompletion();
-  ReturnValue_t checksumVerification();
-  const FsmResult& updateFsmRes(uint8_t errors);
-  void checkAndHandleError(ReturnValue_t result, uint8_t& errorIdx);
-  void finish();
-};
-
-}  // namespace cfdp
-
-#endif  // FSFW_CFDP_CFDPDESTHANDLER_H
@@ -6,7 +6,7 @@ FaultHandlerBase::FaultHandlerBase() = default;
 FaultHandlerBase::~FaultHandlerBase() = default;

 bool FaultHandlerBase::getFaultHandler(cfdp::ConditionCode code,
-                                       cfdp::FaultHandlerCodes& handler) const {
+                                       cfdp::FaultHandlerCode& handler) const {
  auto iter = faultHandlerMap.find(code);
  if (iter == faultHandlerMap.end()) {
    return false;
@@ -15,33 +15,33 @@ bool FaultHandlerBase::getFaultHandler(cfdp::ConditionCode code,
  return true;
 }

-bool FaultHandlerBase::setFaultHandler(cfdp::ConditionCode code, cfdp::FaultHandlerCodes handler) {
+bool FaultHandlerBase::setFaultHandler(cfdp::ConditionCode code, cfdp::FaultHandlerCode handler) {
  if (not faultHandlerMap.contains(code)) {
    return false;
  }
-  if (handler != FaultHandlerCodes::NOTICE_OF_SUSPENSION and
-      handler != FaultHandlerCodes::ABANDON_TRANSACTION and
-      handler != FaultHandlerCodes::NOTICE_OF_CANCELLATION and
-      handler != FaultHandlerCodes::IGNORE_ERROR) {
+  if (handler != FaultHandlerCode::NOTICE_OF_SUSPENSION and
+      handler != FaultHandlerCode::ABANDON_TRANSACTION and
+      handler != FaultHandlerCode::NOTICE_OF_CANCELLATION and
+      handler != FaultHandlerCode::IGNORE_ERROR) {
    return false;
  }
  faultHandlerMap[code] = handler;
  return true;
 }

-bool FaultHandlerBase::reportFault(cfdp::ConditionCode code) {
+bool FaultHandlerBase::reportFault(cfdp::TransactionId& id, cfdp::ConditionCode code) {
  if (not faultHandlerMap.contains(code)) {
    return false;
  }
-  cfdp::FaultHandlerCodes fh = faultHandlerMap[code];
-  if (fh == cfdp::FaultHandlerCodes::IGNORE_ERROR) {
-    ignoreCb(code);
-  } else if (fh == cfdp::FaultHandlerCodes::ABANDON_TRANSACTION) {
-    abandonCb(code);
-  } else if (fh == cfdp::FaultHandlerCodes::NOTICE_OF_CANCELLATION) {
-    noticeOfCancellationCb(code);
-  } else if (fh == cfdp::FaultHandlerCodes::NOTICE_OF_SUSPENSION) {
-    noticeOfSuspensionCb(code);
+  cfdp::FaultHandlerCode fh = faultHandlerMap[code];
+  if (fh == cfdp::FaultHandlerCode::IGNORE_ERROR) {
+    ignoreCb(id, code);
+  } else if (fh == cfdp::FaultHandlerCode::ABANDON_TRANSACTION) {
+    abandonCb(id, code);
+  } else if (fh == cfdp::FaultHandlerCode::NOTICE_OF_CANCELLATION) {
+    noticeOfCancellationCb(id, code);
+  } else if (fh == cfdp::FaultHandlerCode::NOTICE_OF_SUSPENSION) {
+    noticeOfSuspensionCb(id, code);
  } else {
    // Should never happen, but use defensive programming
    return false;
@@ -3,6 +3,7 @@

 #include <etl/flat_map.h>

+#include "fsfw/cfdp/VarLenFields.h"
 #include "fsfw/cfdp/definitions.h"

 namespace cfdp {
@@ -42,33 +43,33 @@ class FaultHandlerBase {
   *  - true if the condition code is valid
   *  - false otherwise
   */
-  bool getFaultHandler(cfdp::ConditionCode code, cfdp::FaultHandlerCodes& handler) const;
+  bool getFaultHandler(cfdp::ConditionCode code, cfdp::FaultHandlerCode& handler) const;

-  bool setFaultHandler(cfdp::ConditionCode code, cfdp::FaultHandlerCodes handler);
+  bool setFaultHandler(cfdp::ConditionCode code, cfdp::FaultHandlerCode handler);

-  bool reportFault(cfdp::ConditionCode code);
+  bool reportFault(cfdp::TransactionId& id, cfdp::ConditionCode code);

-  virtual void noticeOfSuspensionCb(cfdp::ConditionCode code) = 0;
-  virtual void noticeOfCancellationCb(cfdp::ConditionCode code) = 0;
-  virtual void abandonCb(cfdp::ConditionCode code) = 0;
-  virtual void ignoreCb(cfdp::ConditionCode code) = 0;
+  virtual void noticeOfSuspensionCb(cfdp::TransactionId& id, cfdp::ConditionCode code) = 0;
+  virtual void noticeOfCancellationCb(cfdp::TransactionId& id, cfdp::ConditionCode code) = 0;
+  virtual void abandonCb(cfdp::TransactionId& id, cfdp::ConditionCode code) = 0;
+  virtual void ignoreCb(cfdp::TransactionId& id, cfdp::ConditionCode code) = 0;

 private:
-  etl::flat_map<cfdp::ConditionCode, cfdp::FaultHandlerCodes, 10> faultHandlerMap = {
+  etl::flat_map<cfdp::ConditionCode, cfdp::FaultHandlerCode, 10> faultHandlerMap = {
      etl::pair{cfdp::ConditionCode::POSITIVE_ACK_LIMIT_REACHED,
-                cfdp::FaultHandlerCodes::IGNORE_ERROR},
+                cfdp::FaultHandlerCode::IGNORE_ERROR},
      etl::pair{cfdp::ConditionCode::KEEP_ALIVE_LIMIT_REACHED,
-                cfdp::FaultHandlerCodes::IGNORE_ERROR},
+                cfdp::FaultHandlerCode::IGNORE_ERROR},
      etl::pair{cfdp::ConditionCode::INVALID_TRANSMISSION_MODE,
-                cfdp::FaultHandlerCodes::IGNORE_ERROR},
-      etl::pair{cfdp::ConditionCode::FILE_CHECKSUM_FAILURE, cfdp::FaultHandlerCodes::IGNORE_ERROR},
-      etl::pair{cfdp::ConditionCode::FILE_SIZE_ERROR, cfdp::FaultHandlerCodes::IGNORE_ERROR},
-      etl::pair{cfdp::ConditionCode::NAK_LIMIT_REACHED, cfdp::FaultHandlerCodes::IGNORE_ERROR},
-      etl::pair{cfdp::ConditionCode::INACTIVITY_DETECTED, cfdp::FaultHandlerCodes::IGNORE_ERROR},
+                cfdp::FaultHandlerCode::IGNORE_ERROR},
+      etl::pair{cfdp::ConditionCode::FILE_CHECKSUM_FAILURE, cfdp::FaultHandlerCode::IGNORE_ERROR},
+      etl::pair{cfdp::ConditionCode::FILE_SIZE_ERROR, cfdp::FaultHandlerCode::IGNORE_ERROR},
+      etl::pair{cfdp::ConditionCode::NAK_LIMIT_REACHED, cfdp::FaultHandlerCode::IGNORE_ERROR},
+      etl::pair{cfdp::ConditionCode::INACTIVITY_DETECTED, cfdp::FaultHandlerCode::IGNORE_ERROR},
      etl::pair{cfdp::ConditionCode::UNSUPPORTED_CHECKSUM_TYPE,
-                cfdp::FaultHandlerCodes::IGNORE_ERROR},
-      etl::pair{cfdp::ConditionCode::FILESTORE_REJECTION, cfdp::FaultHandlerCodes::IGNORE_ERROR},
-      etl::pair{cfdp::ConditionCode::CHECK_LIMIT_REACHED, cfdp::FaultHandlerCodes::IGNORE_ERROR}};
+                cfdp::FaultHandlerCode::IGNORE_ERROR},
+      etl::pair{cfdp::ConditionCode::FILESTORE_REJECTION, cfdp::FaultHandlerCode::IGNORE_ERROR},
+      etl::pair{cfdp::ConditionCode::CHECK_LIMIT_REACHED, cfdp::FaultHandlerCode::IGNORE_ERROR}};
 };

 }  // namespace cfdp
@@ -11,6 +11,25 @@ class RemoteConfigTableIF {
  virtual bool getRemoteCfg(const cfdp::EntityId& remoteId, cfdp::RemoteEntityCfg** cfg) = 0;
 };

+/**
+ * Helper class for the common case that there is exactly one remote entity
+ */
+class OneRemoteConfigProvider : public RemoteConfigTableIF {
+ public:
+  explicit OneRemoteConfigProvider(RemoteEntityCfg cfg) : cfg(std::move(cfg)) {}
+
+  bool getRemoteCfg(const EntityId& remoteId, cfdp::RemoteEntityCfg** cfg_) override {
+    if (remoteId != cfg.remoteId) {
+      return false;
+    }
+    *cfg_ = &cfg;
+    return true;
+  }
+
+ private:
+  RemoteEntityCfg cfg;
+};
+
 }  // namespace cfdp

 #endif  // FSFW_CFDP_HANDLER_REMOTECONFIGTABLEIF_H
@@ -1 +0,0 @@
-#include "SourceHandler.h"
@@ -1,6 +0,0 @@
-#ifndef FSFW_CFDP_CFDPSOURCEHANDLER_H
-#define FSFW_CFDP_CFDPSOURCEHANDLER_H
-
-class SourceHandler {};
-
-#endif  // FSFW_CFDP_CFDPSOURCEHANDLER_H
@@ -27,12 +27,13 @@ struct LocalEntityCfg {
 };

 struct RemoteEntityCfg {
+  explicit RemoteEntityCfg(EntityId id) : remoteId(std::move(id)) {}
  EntityId remoteId;
  size_t maxFileSegmentLen = 2048;
  bool closureRequested = false;
  bool crcOnTransmission = false;
-  TransmissionModes defaultTransmissionMode = TransmissionModes::UNACKNOWLEDGED;
-  ChecksumTypes defaultChecksum = ChecksumTypes::NULL_CHECKSUM;
+  TransmissionMode defaultTransmissionMode = TransmissionMode::UNACKNOWLEDGED;
+  ChecksumType defaultChecksum = ChecksumType::NULL_CHECKSUM;
  const uint8_t version = CFDP_VERSION_2;
 };

@@ -0,0 +1,50 @@
+#include "helpers.h"
+
+const char* COND_CODE_STRINGS[14] = {"Unknown",
+                                     "No Error",
+                                     "Positive ACK Limit Reached",
+                                     "Keep Alive Limit Reached",
+                                     "Invalid Transmission Mode",
+                                     "Filestore Rejection",
+                                     "File Checksum Failure",
+                                     "File Size Error",
+                                     "NAK limit reached",
+                                     "Inactivity Detected",
+                                     "Check Limit Reached",
+                                     "Unsupported Checksum Type",
+                                     "Suspend Request Received",
+                                     "Cancel Request Received"};
+
+const char* cfdp::getConditionCodeString(cfdp::ConditionCode code) {
+  switch (code) {
+    case NO_CONDITION_FIELD:
+      return COND_CODE_STRINGS[0];
+    case NO_ERROR:
+      return COND_CODE_STRINGS[1];
+    case POSITIVE_ACK_LIMIT_REACHED:
+      return COND_CODE_STRINGS[2];
+    case KEEP_ALIVE_LIMIT_REACHED:
+      return COND_CODE_STRINGS[3];
+    case INVALID_TRANSMISSION_MODE:
+      return COND_CODE_STRINGS[4];
+    case FILESTORE_REJECTION:
+      return COND_CODE_STRINGS[5];
+    case FILE_CHECKSUM_FAILURE:
+      return COND_CODE_STRINGS[6];
+    case FILE_SIZE_ERROR:
+      return COND_CODE_STRINGS[7];
+    case NAK_LIMIT_REACHED:
+      return COND_CODE_STRINGS[8];
+    case INACTIVITY_DETECTED:
+      return COND_CODE_STRINGS[9];
+    case CHECK_LIMIT_REACHED:
+      return COND_CODE_STRINGS[10];
+    case UNSUPPORTED_CHECKSUM_TYPE:
+      return COND_CODE_STRINGS[11];
+    case SUSPEND_REQUEST_RECEIVED:
+      return COND_CODE_STRINGS[12];
+    case CANCEL_REQUEST_RECEIVED:
+      return COND_CODE_STRINGS[13];
+  }
+  return "Unknown";
+}
@@ -0,0 +1,11 @@
+#ifndef FSFW_EXAMPLE_HOSTED_HELPER_H
+#define FSFW_EXAMPLE_HOSTED_HELPER_H
+
+#include "definitions.h"
+
+namespace cfdp {
+
+const char* getConditionCodeString(cfdp::ConditionCode code);
+
+}
+#endif  // FSFW_EXAMPLE_HOSTED_HELPER_H
@@ -1,12 +1,12 @@
 #include "AckInfo.h"

-AckInfo::AckInfo(cfdp::FileDirectives ackedDirective, cfdp::ConditionCode ackedConditionCode,
+AckInfo::AckInfo(cfdp::FileDirective ackedDirective, cfdp::ConditionCode ackedConditionCode,
                 cfdp::AckTransactionStatus transactionStatus, uint8_t directiveSubtypeCode)
    : ackedDirective(ackedDirective),
      ackedConditionCode(ackedConditionCode),
      transactionStatus(transactionStatus),
      directiveSubtypeCode(directiveSubtypeCode) {
-  if (ackedDirective == cfdp::FileDirectives::FINISH) {
+  if (ackedDirective == cfdp::FileDirective::FINISH) {
    this->directiveSubtypeCode = 0b0001;
  } else {
    this->directiveSubtypeCode = 0b0000;
@@ -17,16 +17,16 @@ cfdp::ConditionCode AckInfo::getAckedConditionCode() const { return ackedConditi

 void AckInfo::setAckedConditionCode(cfdp::ConditionCode ackedConditionCode) {
  this->ackedConditionCode = ackedConditionCode;
-  if (ackedDirective == cfdp::FileDirectives::FINISH) {
+  if (ackedDirective == cfdp::FileDirective::FINISH) {
    this->directiveSubtypeCode = 0b0001;
  } else {
    this->directiveSubtypeCode = 0b0000;
  }
 }

-cfdp::FileDirectives AckInfo::getAckedDirective() const { return ackedDirective; }
+cfdp::FileDirective AckInfo::getAckedDirective() const { return ackedDirective; }

-void AckInfo::setAckedDirective(cfdp::FileDirectives ackedDirective) {
+void AckInfo::setAckedDirective(cfdp::FileDirective ackedDirective) {
  this->ackedDirective = ackedDirective;
 }

@@ -6,14 +6,14 @@
 class AckInfo {
 public:
  AckInfo();
-  AckInfo(cfdp::FileDirectives ackedDirective, cfdp::ConditionCode ackedConditionCode,
+  AckInfo(cfdp::FileDirective ackedDirective, cfdp::ConditionCode ackedConditionCode,
          cfdp::AckTransactionStatus transactionStatus, uint8_t directiveSubtypeCode = 0);

  cfdp::ConditionCode getAckedConditionCode() const;
  void setAckedConditionCode(cfdp::ConditionCode ackedConditionCode);

-  cfdp::FileDirectives getAckedDirective() const;
-  void setAckedDirective(cfdp::FileDirectives ackedDirective);
+  cfdp::FileDirective getAckedDirective() const;
+  void setAckedDirective(cfdp::FileDirective ackedDirective);

  uint8_t getDirectiveSubtypeCode() const;
  void setDirectiveSubtypeCode(uint8_t directiveSubtypeCode);
@@ -22,7 +22,7 @@ class AckInfo {
  void setTransactionStatus(cfdp::AckTransactionStatus transactionStatus);

 private:
-  cfdp::FileDirectives ackedDirective = cfdp::FileDirectives::INVALID_DIRECTIVE;
+  cfdp::FileDirective ackedDirective = cfdp::FileDirective::INVALID_DIRECTIVE;
  cfdp::ConditionCode ackedConditionCode = cfdp::ConditionCode::NO_CONDITION_FIELD;
  cfdp::AckTransactionStatus transactionStatus = cfdp::AckTransactionStatus::UNDEFINED;
  uint8_t directiveSubtypeCode = 0;
@@ -1,24 +1,22 @@
-#include "AckPduSerializer.h"
+#include "AckPduCreator.h"

-AckPduSerializer::AckPduSerializer(AckInfo &ackInfo, PduConfig &pduConf)
-    : FileDirectiveCreator(pduConf, cfdp::FileDirectives::ACK, 2), ackInfo(ackInfo) {}
+AckPduCreator::AckPduCreator(AckInfo &ackInfo, PduConfig &pduConf)
+    : FileDirectiveCreator(pduConf, cfdp::FileDirective::ACK, 2), ackInfo(ackInfo) {}

-size_t AckPduSerializer::getSerializedSize() const {
-  return FileDirectiveCreator::getWholePduSize();
-}
+size_t AckPduCreator::getSerializedSize() const { return FileDirectiveCreator::getWholePduSize(); }

-ReturnValue_t AckPduSerializer::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
-                                          Endianness streamEndianness) const {
+ReturnValue_t AckPduCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+                                       Endianness streamEndianness) const {
  ReturnValue_t result = FileDirectiveCreator::serialize(buffer, size, maxSize, streamEndianness);
  if (result != returnvalue::OK) {
    return result;
  }
-  cfdp::FileDirectives ackedDirective = ackInfo.getAckedDirective();
+  cfdp::FileDirective ackedDirective = ackInfo.getAckedDirective();
  uint8_t directiveSubtypeCode = ackInfo.getDirectiveSubtypeCode();
  cfdp::ConditionCode ackedConditionCode = ackInfo.getAckedConditionCode();
  cfdp::AckTransactionStatus transactionStatus = ackInfo.getTransactionStatus();
-  if (ackedDirective != cfdp::FileDirectives::FINISH and
-      ackedDirective != cfdp::FileDirectives::EOF_DIRECTIVE) {
+  if (ackedDirective != cfdp::FileDirective::FINISH and
+      ackedDirective != cfdp::FileDirective::EOF_DIRECTIVE) {
    // TODO: better returncode
    return returnvalue::FAILED;
  }
@@ -1,11 +1,11 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_ACKPDUSERIALIZER_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_ACKPDUSERIALIZER_H_
+#ifndef FSFW_CFDP_PDU_ACKPDUSERIALIZER_H_
+#define FSFW_CFDP_PDU_ACKPDUSERIALIZER_H_

 #include "AckInfo.h"
 #include "FileDirectiveCreator.h"
 #include "FileDirectiveReader.h"

-class AckPduSerializer : public FileDirectiveCreator {
+class AckPduCreator : public FileDirectiveCreator {
 public:
  /**
   * @brief   Serializer to pack ACK PDUs
@@ -16,9 +16,9 @@ class AckPduSerializer : public FileDirectiveCreator {
   * @param transactionStatus
   * @param pduConf
   */
-  AckPduSerializer(AckInfo& ackInfo, PduConfig& pduConf);
+  AckPduCreator(AckInfo& ackInfo, PduConfig& pduConf);

-  size_t getSerializedSize() const override;
+  [[nodiscard]] size_t getSerializedSize() const override;

  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                          Endianness streamEndianness) const override;
@@ -27,4 +27,4 @@ class AckPduSerializer : public FileDirectiveCreator {
  AckInfo& ackInfo;
 };

-#endif /* FSFW_SRC_FSFW_CFDP_PDU_ACKPDUSERIALIZER_H_ */
+#endif /* FSFW_CFDP_PDU_ACKPDUSERIALIZER_H_ */
@@ -1,9 +1,9 @@
-#include "AckPduDeserializer.h"
+#include "AckPduReader.h"

-AckPduDeserializer::AckPduDeserializer(const uint8_t* pduBuf, size_t maxSize, AckInfo& info)
+AckPduReader::AckPduReader(const uint8_t* pduBuf, size_t maxSize, AckInfo& info)
    : FileDirectiveReader(pduBuf, maxSize), info(info) {}

-ReturnValue_t AckPduDeserializer::parseData() {
+ReturnValue_t AckPduReader::parseData() {
  ReturnValue_t result = FileDirectiveReader::parseData();
  if (result != returnvalue::OK) {
    return result;
@@ -18,14 +18,12 @@ ReturnValue_t AckPduDeserializer::parseData() {
  return returnvalue::OK;
 }

-bool AckPduDeserializer::checkAndSetCodes(uint8_t firstByte, uint8_t secondByte) {
-  uint8_t ackedDirective = static_cast<cfdp::FileDirectives>(firstByte >> 4);
-
-  if (ackedDirective != cfdp::FileDirectives::EOF_DIRECTIVE and
-      ackedDirective != cfdp::FileDirectives::FINISH) {
+bool AckPduReader::checkAndSetCodes(uint8_t firstByte, uint8_t secondByte) {
+  cfdp::FileDirective directive;
+  if (not checkAckedDirectiveField(firstByte, directive)) {
    return false;
  }
-  this->info.setAckedDirective(static_cast<cfdp::FileDirectives>(ackedDirective));
+  this->info.setAckedDirective(directive);
  uint8_t directiveSubtypeCode = firstByte & 0x0f;
  if (directiveSubtypeCode != 0b0000 and directiveSubtypeCode != 0b0001) {
    return false;
@@ -35,3 +33,13 @@ bool AckPduDeserializer::checkAndSetCodes(uint8_t firstByte, uint8_t secondByte)
  this->info.setTransactionStatus(static_cast<cfdp::AckTransactionStatus>(secondByte & 0x0f));
  return true;
 }
+bool AckPduReader::checkAckedDirectiveField(uint8_t firstPduDataByte,
+                                            cfdp::FileDirective& ackedDirective) {
+  uint8_t ackedDirectiveRaw = static_cast<cfdp::FileDirective>(firstPduDataByte >> 4);
+  if (ackedDirectiveRaw != cfdp::FileDirective::EOF_DIRECTIVE and
+      ackedDirectiveRaw != cfdp::FileDirective::FINISH) {
+    return false;
+  }
+  ackedDirective = (static_cast<cfdp::FileDirective>(ackedDirectiveRaw));
+  return true;
+}
@@ -4,16 +4,19 @@
 #include "AckInfo.h"
 #include "fsfw/cfdp/pdu/FileDirectiveReader.h"

-class AckPduDeserializer : public FileDirectiveReader {
+class AckPduReader : public FileDirectiveReader {
 public:
-  AckPduDeserializer(const uint8_t* pduBuf, size_t maxSize, AckInfo& info);
+  AckPduReader(const uint8_t* pduBuf, size_t maxSize, AckInfo& info);

  /**
   *
   * @return
   *  - cfdp::INVALID_DIRECTIVE_FIELDS: Invalid fields
   */
-  ReturnValue_t parseData();
+  ReturnValue_t parseData() override;
+
+  static bool checkAckedDirectiveField(uint8_t firstPduDataByte,
+                                       cfdp::FileDirective& ackedDirective);

 private:
  bool checkAndSetCodes(uint8_t rawAckedByte, uint8_t rawAckedConditionCode);
@@ -6,24 +6,24 @@ target_sources(
          FileDirectiveReader.cpp
          FileDirectiveCreator.cpp
          AckInfo.cpp
-          AckPduSerializer.cpp
-          AckPduDeserializer.cpp
+          AckPduCreator.cpp
+          AckPduReader.cpp
          EofInfo.cpp
          EofPduCreator.cpp
          EofPduReader.cpp
          NakInfo.cpp
-          NakPduSerializer.cpp
-          NakPduDeserializer.cpp
+          NakPduCreator.cpp
+          NakPduReader.cpp
          FinishedInfo.cpp
          FinishedPduCreator.cpp
          FinishedPduReader.cpp
          MetadataInfo.cpp
          MetadataPduCreator.cpp
          MetadataPduReader.cpp
-          KeepAlivePduSerializer.cpp
-          KeepAlivePduDeserializer.cpp
-          PromptPduSerializer.cpp
-          PromptPduDeserializer.cpp
+          KeepAlivePduCreator.cpp
+          KeepAlivePduReader.cpp
+          PromptPduCreator.cpp
+          PromptPduReader.cpp
          FileDataCreator.cpp
          FileDataReader.cpp
          FileDataInfo.cpp)
@@ -3,7 +3,7 @@
 #include "fsfw/FSFW.h"

 EofPduCreator::EofPduCreator(PduConfig &conf, EofInfo &info)
-    : FileDirectiveCreator(conf, cfdp::FileDirectives::EOF_DIRECTIVE, 9), info(info) {
+    : FileDirectiveCreator(conf, cfdp::FileDirective::EOF_DIRECTIVE, 9), info(info) {
  setDirectiveDataFieldLen(info.getSerializedSize(HeaderCreator::getLargeFileFlag()));
 }

@@ -3,7 +3,7 @@
 #include <cstring>

 FileDataCreator::FileDataCreator(PduConfig& conf, FileDataInfo& info)
-    : HeaderCreator(conf, cfdp::PduTypes::FILE_DATA, 0, info.getSegmentMetadataFlag()), info(info) {
+    : HeaderCreator(conf, cfdp::PduType::FILE_DATA, 0, info.getSegmentMetadataFlag()), info(info) {
  update();
 }

@@ -1,8 +1,8 @@
 #include "FileDirectiveCreator.h"

-FileDirectiveCreator::FileDirectiveCreator(PduConfig &pduConf, cfdp::FileDirectives directiveCode,
+FileDirectiveCreator::FileDirectiveCreator(PduConfig &pduConf, cfdp::FileDirective directiveCode,
                                           size_t directiveParamFieldLen)
-    : HeaderCreator(pduConf, cfdp::PduTypes::FILE_DIRECTIVE, directiveParamFieldLen + 1),
+    : HeaderCreator(pduConf, cfdp::PduType::FILE_DIRECTIVE, directiveParamFieldLen + 1),
      directiveCode(directiveCode) {}

 size_t FileDirectiveCreator::getSerializedSize() const {
@@ -36,4 +36,4 @@ void FileDirectiveCreator::setDirectiveDataFieldLen(size_t len) {
  HeaderCreator::setPduDataFieldLen(len + 1);
 }

-cfdp::FileDirectives FileDirectiveCreator::getDirectiveCode() const { return directiveCode; }
+cfdp::FileDirective FileDirectiveCreator::getDirectiveCode() const { return directiveCode; }
@@ -5,10 +5,10 @@

 class FileDirectiveCreator : public HeaderCreator {
 public:
-  FileDirectiveCreator(PduConfig& pduConf, cfdp::FileDirectives directiveCode,
+  FileDirectiveCreator(PduConfig& pduConf, cfdp::FileDirective directiveCode,
                       size_t directiveParamFieldLen);

-  [[nodiscard]] cfdp::FileDirectives getDirectiveCode() const;
+  [[nodiscard]] cfdp::FileDirective getDirectiveCode() const;

  /**
   * This only returns the size of the PDU header + 1 for the directive code octet.
@@ -28,7 +28,7 @@ class FileDirectiveCreator : public HeaderCreator {
  void setDirectiveDataFieldLen(size_t len);

 private:
-  cfdp::FileDirectives directiveCode = cfdp::FileDirectives::INVALID_DIRECTIVE;
+  cfdp::FileDirective directiveCode = cfdp::FileDirective::INVALID_DIRECTIVE;
 };

 #endif /* FSFW_SRC_FSFW_CFDP_PDU_FILEDIRECTIVESERIALIZER_H_ */
@@ -3,7 +3,7 @@
 FileDirectiveReader::FileDirectiveReader(const uint8_t *pduBuf, size_t maxSize)
    : PduHeaderReader(pduBuf, maxSize) {}

-cfdp::FileDirectives FileDirectiveReader::getFileDirective() const { return fileDirective; }
+cfdp::FileDirective FileDirectiveReader::getFileDirective() const { return fileDirective; }

 ReturnValue_t FileDirectiveReader::parseData() {
  ReturnValue_t result = PduHeaderReader::parseData();
@@ -18,9 +18,9 @@ ReturnValue_t FileDirectiveReader::parseData() {
  }
  size_t currentIdx = PduHeaderReader::getHeaderSize();
  if (not checkFileDirective(pointers.rawPtr[currentIdx])) {
-    return cfdp::INVALID_DIRECTIVE_FIELDS;
+    return cfdp::INVALID_DIRECTIVE_FIELD;
  }
-  setFileDirective(static_cast<cfdp::FileDirectives>(pointers.rawPtr[currentIdx]));
+  setFileDirective(static_cast<cfdp::FileDirective>(pointers.rawPtr[currentIdx]));
  return returnvalue::OK;
 }

@@ -30,15 +30,15 @@ size_t FileDirectiveReader::getHeaderSize() const {
 }

 bool FileDirectiveReader::checkFileDirective(uint8_t rawByte) {
-  if (rawByte < cfdp::FileDirectives::EOF_DIRECTIVE or
-      (rawByte > cfdp::FileDirectives::PROMPT and rawByte != cfdp::FileDirectives::KEEP_ALIVE)) {
-    // Invalid directive field. TODO: Custom returnvalue
+  if (rawByte < cfdp::FileDirective::EOF_DIRECTIVE or
+      (rawByte > cfdp::FileDirective::PROMPT and rawByte != cfdp::FileDirective::KEEP_ALIVE)) {
+    // Invalid directive field
    return false;
  }
  return true;
 }

-void FileDirectiveReader::setFileDirective(cfdp::FileDirectives fileDirective_) {
+void FileDirectiveReader::setFileDirective(cfdp::FileDirective fileDirective_) {
  fileDirective = fileDirective_;
 }

@@ -22,17 +22,16 @@ class FileDirectiveReader : public PduHeaderReader {
  ReturnValue_t parseData() override;
  [[nodiscard]] size_t getHeaderSize() const override;

-  [[nodiscard]] cfdp::FileDirectives getFileDirective() const;
+  [[nodiscard]] cfdp::FileDirective getFileDirective() const;

  void setEndianness(SerializeIF::Endianness endianness);
  [[nodiscard]] SerializeIF::Endianness getEndianness() const;
-
- protected:
  static bool checkFileDirective(uint8_t rawByte);

+ protected:
 private:
-  void setFileDirective(cfdp::FileDirectives fileDirective);
-  cfdp::FileDirectives fileDirective = cfdp::FileDirectives::INVALID_DIRECTIVE;
+  void setFileDirective(cfdp::FileDirective fileDirective);
+  cfdp::FileDirective fileDirective = cfdp::FileDirective::INVALID_DIRECTIVE;
  SerializeIF::Endianness endianness = SerializeIF::Endianness::NETWORK;
 };

@@ -1,7 +1,7 @@
 #include "FinishedPduCreator.h"

 FinishPduCreator::FinishPduCreator(PduConfig &conf, FinishedInfo &finishInfo)
-    : FileDirectiveCreator(conf, cfdp::FileDirectives::FINISH, 0), finishInfo(finishInfo) {
+    : FileDirectiveCreator(conf, cfdp::FileDirective::FINISH, 0), finishInfo(finishInfo) {
  updateDirectiveFieldLen();
 }

@@ -17,7 +17,7 @@ ReturnValue_t FinishPduCreator::serialize(uint8_t **buffer, size_t *size, size_t
  if (result != returnvalue::OK) {
    return result;
  }
-  if (*size + 1 >= maxSize) {
+  if (*size + 1 > maxSize) {
    return SerializeIF::BUFFER_TOO_SHORT;
  }
  **buffer = finishInfo.getConditionCode() << 4 | finishInfo.getDeliveryCode() << 2 |
@@ -38,7 +38,7 @@ ReturnValue_t FinishPduReader::parseTlvs(size_t remLen, size_t currentIdx, const
  FilestoreResponseTlv** fsResponseArray = nullptr;
  size_t fsResponseMaxArrayLen = 0;
  EntityIdTlv* faultLocation = nullptr;
-  cfdp::TlvTypes nextTlv = cfdp::TlvTypes::INVALID_TLV;
+  cfdp::TlvType nextTlv = cfdp::TlvType::INVALID_TLV;
  while (remLen > 0) {
    // Simply forward parse the TLV type. Every TLV type except the last one must be a Filestore
    // Response TLV, and even the last one can be a Filestore Response TLV if the fault
@@ -46,8 +46,8 @@ ReturnValue_t FinishPduReader::parseTlvs(size_t remLen, size_t currentIdx, const
    if (currentIdx + 2 > maxSize) {
      return SerializeIF::STREAM_TOO_SHORT;
    }
-    nextTlv = static_cast<cfdp::TlvTypes>(*buf);
-    if (nextTlv == cfdp::TlvTypes::FILESTORE_RESPONSE) {
+    nextTlv = static_cast<cfdp::TlvType>(*buf);
+    if (nextTlv == cfdp::TlvType::FILESTORE_RESPONSE) {
      if (fsResponseArray == nullptr) {
        if (not finishedInfo.canHoldFsResponses()) {
          return cfdp::FINISHED_CANT_PARSE_FS_RESPONSES;
@@ -63,7 +63,7 @@ ReturnValue_t FinishPduReader::parseTlvs(size_t remLen, size_t currentIdx, const
        return result;
      }
      fsResponsesIdx += 1;
-    } else if (nextTlv == cfdp::TlvTypes::ENTITY_ID) {
+    } else if (nextTlv == cfdp::TlvType::ENTITY_ID) {
      // This needs to be the last TLV and it should not be here if the condition code
      // is "No Error" or "Unsupported Checksum Type"
      if (conditionCode == cfdp::ConditionCode::NO_ERROR or
@@ -1,6 +1,6 @@
 #include "HeaderCreator.h"

-HeaderCreator::HeaderCreator(PduConfig &pduConf, cfdp::PduTypes pduType, size_t initPduDataFieldLen,
+HeaderCreator::HeaderCreator(PduConfig &pduConf, cfdp::PduType pduType, size_t initPduDataFieldLen,
                             cfdp::SegmentMetadataFlag segmentMetadataFlag,
                             cfdp::SegmentationControl segCtrl)
    : pduType(pduType),
@@ -24,8 +24,8 @@ ReturnValue_t HeaderCreator::serialize(uint8_t **buffer, size_t *size, size_t ma
  *buffer += 1;
  **buffer = pduDataFieldLen & 0x00ff;
  *buffer += 1;
-  **buffer = segmentationCtrl << 7 | pduConf.sourceId.getWidth() << 4 | segmentMetadataFlag << 3 |
-             pduConf.seqNum.getWidth();
+  **buffer = segmentationCtrl << 7 | ((pduConf.sourceId.getWidth() - 1) << 4) |
+             segmentMetadataFlag << 3 | (pduConf.seqNum.getWidth() - 1);
  *buffer += 1;
  *size += 4;
  ReturnValue_t result = pduConf.sourceId.serialize(buffer, size, maxSize, streamEndianness);
@@ -65,17 +65,17 @@ void HeaderCreator::setPduDataFieldLen(size_t pduDataFieldLen_) {
  pduDataFieldLen = pduDataFieldLen_;
 }

-void HeaderCreator::setPduType(cfdp::PduTypes pduType_) { pduType = pduType_; }
+void HeaderCreator::setPduType(cfdp::PduType pduType_) { pduType = pduType_; }

 void HeaderCreator::setSegmentMetadataFlag(cfdp::SegmentMetadataFlag segmentMetadataFlag_) {
  segmentMetadataFlag = segmentMetadataFlag_;
 }

-cfdp::PduTypes HeaderCreator::getPduType() const { return pduType; }
+cfdp::PduType HeaderCreator::getPduType() const { return pduType; }

 cfdp::Direction HeaderCreator::getDirection() const { return pduConf.direction; }

-cfdp::TransmissionModes HeaderCreator::getTransmissionMode() const { return pduConf.mode; }
+cfdp::TransmissionMode HeaderCreator::getTransmissionMode() const { return pduConf.mode; }

 bool HeaderCreator::getCrcFlag() const { return pduConf.crcFlag; }

@@ -9,7 +9,7 @@
 class HeaderCreator : public SerializeIF, public PduHeaderIF {
 public:
  HeaderCreator(
-      PduConfig& pduConf, cfdp::PduTypes pduType, size_t initPduDataFieldLen,
+      PduConfig& pduConf, cfdp::PduType pduType, size_t initPduDataFieldLen,
      cfdp::SegmentMetadataFlag segmentMetadataFlag = cfdp::SegmentMetadataFlag::NOT_PRESENT,
      cfdp::SegmentationControl segCtrl =
          cfdp::SegmentationControl::NO_RECORD_BOUNDARIES_PRESERVATION);
@@ -29,15 +29,15 @@ class HeaderCreator : public SerializeIF, public PduHeaderIF {
                            Endianness streamEndianness) override;

  void setPduDataFieldLen(size_t pduDataFieldLen);
-  void setPduType(cfdp::PduTypes pduType);
+  void setPduType(cfdp::PduType pduType);
  void setSegmentMetadataFlag(cfdp::SegmentMetadataFlag);

  [[nodiscard]] size_t getPduDataFieldLen() const override;
  [[nodiscard]] size_t getWholePduSize() const override;

-  [[nodiscard]] cfdp::PduTypes getPduType() const override;
+  [[nodiscard]] cfdp::PduType getPduType() const override;
  [[nodiscard]] cfdp::Direction getDirection() const override;
-  [[nodiscard]] cfdp::TransmissionModes getTransmissionMode() const override;
+  [[nodiscard]] cfdp::TransmissionMode getTransmissionMode() const override;
  [[nodiscard]] bool getCrcFlag() const override;
  [[nodiscard]] bool getLargeFileFlag() const override;
  [[nodiscard]] cfdp::SegmentationControl getSegmentationControl() const override;
@@ -52,7 +52,7 @@ class HeaderCreator : public SerializeIF, public PduHeaderIF {
  void getTransactionSeqNum(cfdp::TransactionSeqNum& seqNum) const override;

 private:
-  cfdp::PduTypes pduType;
+  cfdp::PduType pduType;
  cfdp::SegmentMetadataFlag segmentMetadataFlag;
  cfdp::SegmentationControl segmentationCtrl;
  size_t pduDataFieldLen;
@@ -57,16 +57,16 @@ size_t PduHeaderReader::getWholePduSize() const {
  return getPduDataFieldLen() + PduHeaderReader::getHeaderSize();
 }

-cfdp::PduTypes PduHeaderReader::getPduType() const {
-  return static_cast<cfdp::PduTypes>((pointers.fixedHeader->firstByte >> 4) & 0x01);
+cfdp::PduType PduHeaderReader::getPduType() const {
+  return static_cast<cfdp::PduType>((pointers.fixedHeader->firstByte >> 4) & 0x01);
 }

 cfdp::Direction PduHeaderReader::getDirection() const {
  return static_cast<cfdp::Direction>((pointers.fixedHeader->firstByte >> 3) & 0x01);
 }

-cfdp::TransmissionModes PduHeaderReader::getTransmissionMode() const {
-  return static_cast<cfdp::TransmissionModes>((pointers.fixedHeader->firstByte >> 2) & 0x01);
+cfdp::TransmissionMode PduHeaderReader::getTransmissionMode() const {
+  return static_cast<cfdp::TransmissionMode>((pointers.fixedHeader->firstByte >> 2) & 0x01);
 }

 bool PduHeaderReader::getCrcFlag() const { return (pointers.fixedHeader->firstByte >> 1) & 0x01; }
@@ -78,11 +78,11 @@ cfdp::SegmentationControl PduHeaderReader::getSegmentationControl() const {
 }

 cfdp::WidthInBytes PduHeaderReader::getLenEntityIds() const {
-  return static_cast<cfdp::WidthInBytes>((pointers.fixedHeader->fourthByte >> 4) & 0x07);
+  return static_cast<cfdp::WidthInBytes>(((pointers.fixedHeader->fourthByte >> 4) & 0b111) + 1);
 }

 cfdp::WidthInBytes PduHeaderReader::getLenSeqNum() const {
-  return static_cast<cfdp::WidthInBytes>(pointers.fixedHeader->fourthByte & 0x07);
+  return static_cast<cfdp::WidthInBytes>((pointers.fixedHeader->fourthByte & 0b111) + 1);
 }

 cfdp::SegmentMetadataFlag PduHeaderReader::getSegmentMetadataFlag() const {
@@ -0,0 +1,25 @@
+#include "KeepAlivePduCreator.h"
+
+KeepAlivePduCreator::KeepAlivePduCreator(PduConfig &conf, cfdp::FileSize &progress)
+    : FileDirectiveCreator(conf, cfdp::FileDirective::KEEP_ALIVE, 4), progress(progress) {
+  updateDirectiveFieldLen();
+}
+
+size_t KeepAlivePduCreator::getSerializedSize() const {
+  return FileDirectiveCreator::getWholePduSize();
+}
+
+void KeepAlivePduCreator::updateDirectiveFieldLen() {
+  if (this->getLargeFileFlag()) {
+    this->setDirectiveDataFieldLen(8);
+  }
+}
+
+ReturnValue_t KeepAlivePduCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+                                             Endianness streamEndianness) const {
+  ReturnValue_t result = FileDirectiveCreator::serialize(buffer, size, maxSize, streamEndianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  return progress.serialize(this->getLargeFileFlag(), buffer, size, maxSize, streamEndianness);
+}
@@ -0,0 +1,22 @@
+#ifndef FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_
+#define FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_
+
+#include "fsfw/cfdp/FileSize.h"
+#include "fsfw/cfdp/pdu/FileDirectiveCreator.h"
+
+class KeepAlivePduCreator : public FileDirectiveCreator {
+ public:
+  KeepAlivePduCreator(PduConfig& conf, cfdp::FileSize& progress);
+
+  void updateDirectiveFieldLen();
+
+  [[nodiscard]] size_t getSerializedSize() const override;
+
+  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
+                          Endianness streamEndianness) const override;
+
+ private:
+  cfdp::FileSize& progress;
+};
+
+#endif /* FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_ */
@@ -1,19 +0,0 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_KEEPALIVEPDUDESERIALIZER_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_KEEPALIVEPDUDESERIALIZER_H_
-
-#include "fsfw/cfdp/FileSize.h"
-#include "fsfw/cfdp/pdu/FileDirectiveReader.h"
-
-class KeepAlivePduDeserializer : public FileDirectiveReader {
- public:
-  KeepAlivePduDeserializer(const uint8_t* pduBuf, size_t maxSize, cfdp::FileSize& progress);
-
-  ReturnValue_t parseData() override;
-
-  cfdp::FileSize& getProgress();
-
- private:
-  cfdp::FileSize& progress;
-};
-
-#endif /* FSFW_SRC_FSFW_CFDP_PDU_KEEPALIVEPDUDESERIALIZER_H_ */
@@ -1,10 +1,10 @@
-#include "KeepAlivePduDeserializer.h"
+#include "KeepAlivePduReader.h"

-KeepAlivePduDeserializer::KeepAlivePduDeserializer(const uint8_t* pduBuf, size_t maxSize,
-                                                   cfdp::FileSize& progress)
+KeepAlivePduReader::KeepAlivePduReader(const uint8_t* pduBuf, size_t maxSize,
+                                       cfdp::FileSize& progress)
    : FileDirectiveReader(pduBuf, maxSize), progress(progress) {}

-ReturnValue_t KeepAlivePduDeserializer::parseData() {
+ReturnValue_t KeepAlivePduReader::parseData() {
  ReturnValue_t result = FileDirectiveReader::parseData();
  if (result != returnvalue::OK) {
    return result;
@@ -15,4 +15,4 @@ ReturnValue_t KeepAlivePduDeserializer::parseData() {
  return progress.deSerialize(&buffer, &remLen, getEndianness());
 }

-cfdp::FileSize& KeepAlivePduDeserializer::getProgress() { return progress; }
+cfdp::FileSize& KeepAlivePduReader::getProgress() { return progress; }
@@ -0,0 +1,19 @@
+#ifndef FSFW_CFDP_PDU_KEEPALIVEREADER_H_
+#define FSFW_CFDP_PDU_KEEPALIVEREADER_H_
+
+#include "fsfw/cfdp/FileSize.h"
+#include "fsfw/cfdp/pdu/FileDirectiveReader.h"
+
+class KeepAlivePduReader : public FileDirectiveReader {
+ public:
+  KeepAlivePduReader(const uint8_t* pduBuf, size_t maxSize, cfdp::FileSize& progress);
+
+  ReturnValue_t parseData() override;
+
+  cfdp::FileSize& getProgress();
+
+ private:
+  cfdp::FileSize& progress;
+};
+
+#endif /* FSFW_CFDP_PDU_KEEPALIVEPDUREADER_H_ */
@@ -1,25 +0,0 @@
-#include "KeepAlivePduSerializer.h"
-
-KeepAlivePduSerializer::KeepAlivePduSerializer(PduConfig &conf, cfdp::FileSize &progress)
-    : FileDirectiveCreator(conf, cfdp::FileDirectives::KEEP_ALIVE, 4), progress(progress) {
-  updateDirectiveFieldLen();
-}
-
-size_t KeepAlivePduSerializer::getSerializedSize() const {
-  return FileDirectiveCreator::getWholePduSize();
-}
-
-void KeepAlivePduSerializer::updateDirectiveFieldLen() {
-  if (this->getLargeFileFlag()) {
-    this->setDirectiveDataFieldLen(8);
-  }
-}
-
-ReturnValue_t KeepAlivePduSerializer::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
-                                                Endianness streamEndianness) const {
-  ReturnValue_t result = FileDirectiveCreator::serialize(buffer, size, maxSize, streamEndianness);
-  if (result != returnvalue::OK) {
-    return result;
-  }
-  return progress.serialize(this->getLargeFileFlag(), buffer, size, maxSize, streamEndianness);
-}
@@ -1,22 +0,0 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_
-
-#include "fsfw/cfdp/FileSize.h"
-#include "fsfw/cfdp/pdu/FileDirectiveCreator.h"
-
-class KeepAlivePduSerializer : public FileDirectiveCreator {
- public:
-  KeepAlivePduSerializer(PduConfig& conf, cfdp::FileSize& progress);
-
-  void updateDirectiveFieldLen();
-
-  size_t getSerializedSize() const override;
-
-  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
-                          Endianness streamEndianness) const override;
-
- private:
-  cfdp::FileSize& progress;
-};
-
-#endif /* FSFW_SRC_FSFW_CFDP_PDU_KEEPALIVEPDUSERIALIZER_H_ */
@@ -1,6 +1,6 @@
 #include "MetadataInfo.h"

-MetadataInfo::MetadataInfo(bool closureRequested, cfdp::ChecksumTypes checksumType,
+MetadataInfo::MetadataInfo(bool closureRequested, cfdp::ChecksumType checksumType,
                           cfdp::FileSize& fileSize, cfdp::StringLv& sourceFileName,
                           cfdp::StringLv& destFileName)
    : MetadataInfo(fileSize, sourceFileName, destFileName) {
@@ -23,9 +23,9 @@ void MetadataInfo::setOptionsArray(cfdp::Tlv** optionsArray_, std::optional<size
  }
 }

-cfdp::ChecksumTypes MetadataInfo::getChecksumType() const { return checksumType; }
+cfdp::ChecksumType MetadataInfo::getChecksumType() const { return checksumType; }

-void MetadataInfo::setChecksumType(cfdp::ChecksumTypes checksumType_) {
+void MetadataInfo::setChecksumType(cfdp::ChecksumType checksumType_) {
  checksumType = checksumType_;
 }

@@ -13,15 +13,15 @@ class MetadataInfo {
 public:
  MetadataInfo(cfdp::FileSize& fileSize, cfdp::StringLv& sourceFileName,
               cfdp::StringLv& destFileName);
-  MetadataInfo(bool closureRequested, cfdp::ChecksumTypes checksumType, cfdp::FileSize& fileSize,
+  MetadataInfo(bool closureRequested, cfdp::ChecksumType checksumType, cfdp::FileSize& fileSize,
               cfdp::StringLv& sourceFileName, cfdp::StringLv& destFileName);

  size_t getSerializedSize(bool fssLarge = false);

  void setOptionsArray(cfdp::Tlv** optionsArray, std::optional<size_t> optionsLen,
                       std::optional<size_t> maxOptionsLen);
-  [[nodiscard]] cfdp::ChecksumTypes getChecksumType() const;
-  void setChecksumType(cfdp::ChecksumTypes checksumType);
+  [[nodiscard]] cfdp::ChecksumType getChecksumType() const;
+  void setChecksumType(cfdp::ChecksumType checksumType);
  [[nodiscard]] bool isClosureRequested() const;
  void setClosureRequested(bool closureRequested = false);

@@ -42,7 +42,7 @@ class MetadataInfo {

 private:
  bool closureRequested = false;
-  cfdp::ChecksumTypes checksumType = cfdp::ChecksumTypes::NULL_CHECKSUM;
+  cfdp::ChecksumType checksumType = cfdp::ChecksumType::NULL_CHECKSUM;
  cfdp::FileSize& fileSize;
  cfdp::StringLv& sourceFileName;
  cfdp::StringLv& destFileName;
@@ -1,7 +1,7 @@
 #include "MetadataPduCreator.h"

 MetadataPduCreator::MetadataPduCreator(PduConfig &conf, MetadataInfo &info)
-    : FileDirectiveCreator(conf, cfdp::FileDirectives::METADATA, 5), info(info) {
+    : FileDirectiveCreator(conf, cfdp::FileDirective::METADATA, 5), info(info) {
  updateDirectiveFieldLen();
 }

@@ -15,7 +15,7 @@ ReturnValue_t MetadataPduReader::parseData() {
    return SerializeIF::STREAM_TOO_SHORT;
  }
  info.setClosureRequested((*buf >> 6) & 0x01);
-  info.setChecksumType(static_cast<cfdp::ChecksumTypes>(*buf & 0x0f));
+  info.setChecksumType(static_cast<cfdp::ChecksumType>(*buf & 0x0f));
  remSize -= 1;
  buf += 1;
  auto endianness = getEndianness();
@@ -1,20 +1,18 @@
-#include "NakPduSerializer.h"
+#include "NakPduCreator.h"

-NakPduSerializer::NakPduSerializer(PduConfig &pduConf, NakInfo &nakInfo)
-    : FileDirectiveCreator(pduConf, cfdp::FileDirectives::NAK, 0), nakInfo(nakInfo) {
+NakPduCreator::NakPduCreator(PduConfig &pduConf, NakInfo &nakInfo)
+    : FileDirectiveCreator(pduConf, cfdp::FileDirective::NAK, 0), nakInfo(nakInfo) {
  updateDirectiveFieldLen();
 }

-void NakPduSerializer::updateDirectiveFieldLen() {
+void NakPduCreator::updateDirectiveFieldLen() {
  this->setDirectiveDataFieldLen(nakInfo.getSerializedSize(getLargeFileFlag()));
 }

-size_t NakPduSerializer::getSerializedSize() const {
-  return FileDirectiveCreator::getWholePduSize();
-}
+size_t NakPduCreator::getSerializedSize() const { return FileDirectiveCreator::getWholePduSize(); }

-ReturnValue_t NakPduSerializer::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
-                                          Endianness streamEndianness) const {
+ReturnValue_t NakPduCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+                                       Endianness streamEndianness) const {
  ReturnValue_t result = FileDirectiveCreator::serialize(buffer, size, maxSize, streamEndianness);
  if (result != returnvalue::OK) {
    return result;
@@ -1,5 +1,5 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_NAKPDUSERIALIZER_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_NAKPDUSERIALIZER_H_
+#ifndef FSFW_CFDP_PDU_NAKPDUSERIALIZER_H_
+#define FSFW_CFDP_PDU_NAKPDUSERIALIZER_H_

 #include <vector>

@@ -8,7 +8,7 @@
 #include "fsfw/cfdp/definitions.h"
 #include "fsfw/cfdp/pdu/FileDirectiveCreator.h"

-class NakPduSerializer : public FileDirectiveCreator {
+class NakPduCreator : public FileDirectiveCreator {
 public:
  /**
   *
@@ -18,9 +18,9 @@ class NakPduSerializer : public FileDirectiveCreator {
   * @param [in] segmentRequests Pointer to the start of a list of segment requests
   * @param segmentRequestLen Length of the segment request list to be serialized
   */
-  NakPduSerializer(PduConfig& PduConf, NakInfo& nakInfo);
+  NakPduCreator(PduConfig& PduConf, NakInfo& nakInfo);

-  size_t getSerializedSize() const override;
+  [[nodiscard]] size_t getSerializedSize() const override;

  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                          Endianness streamEndianness) const override;
@@ -35,4 +35,4 @@ class NakPduSerializer : public FileDirectiveCreator {
  NakInfo& nakInfo;
 };

-#endif /* FSFW_SRC_FSFW_CFDP_PDU_NAKPDUSERIALIZER_H_ */
+#endif /* FSFW_CFDP_PDU_NAKPDUSERIALIZER_H_ */
@@ -1,21 +0,0 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_NAKPDUDESERIALIZER_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_NAKPDUDESERIALIZER_H_
-
-#include "fsfw/cfdp/pdu/FileDirectiveReader.h"
-#include "fsfw/cfdp/pdu/NakInfo.h"
-
-class NakPduDeserializer : public FileDirectiveReader {
- public:
-  NakPduDeserializer(const uint8_t* pduBuf, size_t maxSize, NakInfo& info);
-
-  /**
-   * This needs to be called before accessing the PDU fields to avoid segmentation faults.
-   * @return
-   */
-  virtual ReturnValue_t parseData() override;
-
- private:
-  NakInfo& nakInfo;
-};
-
-#endif /* FSFW_SRC_FSFW_CFDP_PDU_NAKPDUDESERIALIZER_H_ */
@@ -1,9 +1,9 @@
-#include "NakPduDeserializer.h"
+#include "NakPduReader.h"

-NakPduDeserializer::NakPduDeserializer(const uint8_t* pduBuf, size_t maxSize, NakInfo& info)
+NakPduReader::NakPduReader(const uint8_t* pduBuf, size_t maxSize, NakInfo& info)
    : FileDirectiveReader(pduBuf, maxSize), nakInfo(info) {}

-ReturnValue_t NakPduDeserializer::parseData() {
+ReturnValue_t NakPduReader::parseData() {
  ReturnValue_t result = FileDirectiveReader::parseData();
  if (result != returnvalue::OK) {
    return result;
@@ -0,0 +1,21 @@
+#ifndef FSFW_CFDP_PDU_NAKPDUDESERIALIZER_H_
+#define FSFW_CFDP_PDU_NAKPDUDESERIALIZER_H_
+
+#include "fsfw/cfdp/pdu/FileDirectiveReader.h"
+#include "fsfw/cfdp/pdu/NakInfo.h"
+
+class NakPduReader : public FileDirectiveReader {
+ public:
+  NakPduReader(const uint8_t* pduBuf, size_t maxSize, NakInfo& info);
+
+  /**
+   * This needs to be called before accessing the PDU fields to avoid segmentation faults.
+   * @return
+   */
+  ReturnValue_t parseData() override;
+
+ private:
+  NakInfo& nakInfo;
+};
+
+#endif /* FSFW_CFDP_PDU_NAKPDUDESERIALIZER_H_ */
@@ -2,7 +2,7 @@

 #include <utility>

-PduConfig::PduConfig(cfdp::EntityId sourceId, cfdp::EntityId destId, cfdp::TransmissionModes mode,
+PduConfig::PduConfig(cfdp::EntityId sourceId, cfdp::EntityId destId, cfdp::TransmissionMode mode,
                     cfdp::TransactionSeqNum seqNum, bool crcFlag, bool largeFile,
                     cfdp::Direction direction)
    : mode(mode),
@@ -7,11 +7,11 @@
 class PduConfig {
 public:
  PduConfig() = default;
-  PduConfig(cfdp::EntityId sourceId, cfdp::EntityId destId, cfdp::TransmissionModes mode,
+  PduConfig(cfdp::EntityId sourceId, cfdp::EntityId destId, cfdp::TransmissionMode mode,
            cfdp::TransactionSeqNum seqNum, bool crcFlag = false, bool largeFile = false,
            cfdp::Direction direction = cfdp::Direction::TOWARDS_RECEIVER);

-  cfdp::TransmissionModes mode = cfdp::TransmissionModes::ACKNOWLEDGED;
+  cfdp::TransmissionMode mode = cfdp::TransmissionMode::ACKNOWLEDGED;
  cfdp::TransactionSeqNum seqNum;
  cfdp::EntityId sourceId;
  cfdp::EntityId destId;
@@ -17,9 +17,9 @@ class PduHeaderIF {

  [[nodiscard]] virtual size_t getWholePduSize() const = 0;
  [[nodiscard]] virtual size_t getPduDataFieldLen() const = 0;
-  [[nodiscard]] virtual cfdp::PduTypes getPduType() const = 0;
+  [[nodiscard]] virtual cfdp::PduType getPduType() const = 0;
  [[nodiscard]] virtual cfdp::Direction getDirection() const = 0;
-  [[nodiscard]] virtual cfdp::TransmissionModes getTransmissionMode() const = 0;
+  [[nodiscard]] virtual cfdp::TransmissionMode getTransmissionMode() const = 0;
  [[nodiscard]] virtual bool getCrcFlag() const = 0;
  [[nodiscard]] virtual bool getLargeFileFlag() const = 0;
  [[nodiscard]] virtual cfdp::SegmentationControl getSegmentationControl() const = 0;
@@ -56,9 +56,9 @@ class PduHeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
  [[nodiscard]] size_t getPduDataFieldLen() const override;
  [[nodiscard]] size_t getWholePduSize() const override;

-  [[nodiscard]] cfdp::PduTypes getPduType() const override;
+  [[nodiscard]] cfdp::PduType getPduType() const override;
  [[nodiscard]] cfdp::Direction getDirection() const override;
-  [[nodiscard]] cfdp::TransmissionModes getTransmissionMode() const override;
+  [[nodiscard]] cfdp::TransmissionMode getTransmissionMode() const override;
  [[nodiscard]] bool getCrcFlag() const override;
  [[nodiscard]] bool getLargeFileFlag() const override;
  [[nodiscard]] cfdp::SegmentationControl getSegmentationControl() const override;
@@ -0,0 +1,24 @@
+#include "PromptPduCreator.h"
+
+PromptPduCreator::PromptPduCreator(PduConfig &conf, cfdp::PromptResponseRequired responseRequired)
+    : FileDirectiveCreator(conf, cfdp::FileDirective::PROMPT, 1),
+      responseRequired(responseRequired) {}
+
+size_t PromptPduCreator::getSerializedSize() const {
+  return FileDirectiveCreator::getWholePduSize();
+}
+
+ReturnValue_t PromptPduCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
+                                          Endianness streamEndianness) const {
+  ReturnValue_t result = FileDirectiveCreator::serialize(buffer, size, maxSize, streamEndianness);
+  if (result != returnvalue::OK) {
+    return result;
+  }
+  if (*size + 1 > maxSize) {
+    return SerializeIF::BUFFER_TOO_SHORT;
+  }
+  **buffer = responseRequired << 7;
+  *buffer += 1;
+  *size += 1;
+  return result;
+}
@@ -3,9 +3,9 @@

 #include "fsfw/cfdp/pdu/FileDirectiveCreator.h"

-class PromptPduSerializer : public FileDirectiveCreator {
+class PromptPduCreator : public FileDirectiveCreator {
 public:
-  PromptPduSerializer(PduConfig& conf, cfdp::PromptResponseRequired responseRequired);
+  PromptPduCreator(PduConfig& conf, cfdp::PromptResponseRequired responseRequired);

  [[nodiscard]] size_t getSerializedSize() const override;

@@ -1,13 +1,13 @@
-#include "PromptPduDeserializer.h"
+#include "PromptPduReader.h"

-PromptPduDeserializer::PromptPduDeserializer(const uint8_t *pduBuf, size_t maxSize)
+PromptPduReader::PromptPduReader(const uint8_t *pduBuf, size_t maxSize)
    : FileDirectiveReader(pduBuf, maxSize) {}

-cfdp::PromptResponseRequired PromptPduDeserializer::getPromptResponseRequired() const {
+cfdp::PromptResponseRequired PromptPduReader::getPromptResponseRequired() const {
  return responseRequired;
 }

-ReturnValue_t PromptPduDeserializer::parseData() {
+ReturnValue_t PromptPduReader::parseData() {
  ReturnValue_t result = FileDirectiveReader::parseData();
  if (result != returnvalue::OK) {
    return result;
@@ -3,9 +3,9 @@

 #include "fsfw/cfdp/pdu/FileDirectiveReader.h"

-class PromptPduDeserializer : public FileDirectiveReader {
+class PromptPduReader : public FileDirectiveReader {
 public:
-  PromptPduDeserializer(const uint8_t *pduBuf, size_t maxSize);
+  PromptPduReader(const uint8_t *pduBuf, size_t maxSize);

  [[nodiscard]] cfdp::PromptResponseRequired getPromptResponseRequired() const;
  ReturnValue_t parseData() override;
@@ -1,25 +0,0 @@
-#include "PromptPduSerializer.h"
-
-PromptPduSerializer::PromptPduSerializer(PduConfig &conf,
-                                         cfdp::PromptResponseRequired responseRequired)
-    : FileDirectiveCreator(conf, cfdp::FileDirectives::PROMPT, 1),
-      responseRequired(responseRequired) {}
-
-size_t PromptPduSerializer::getSerializedSize() const {
-  return FileDirectiveCreator::getWholePduSize();
-}
-
-ReturnValue_t PromptPduSerializer::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
-                                             Endianness streamEndianness) const {
-  ReturnValue_t result = FileDirectiveCreator::serialize(buffer, size, maxSize, streamEndianness);
-  if (result != returnvalue::OK) {
-    return result;
-  }
-  if (*size + 1 > maxSize) {
-    return SerializeIF::BUFFER_TOO_SHORT;
-  }
-  **buffer = responseRequired << 7;
-  *buffer += 1;
-  *size += 1;
-  return result;
-}
@@ -11,7 +11,7 @@ ReturnValue_t EntityIdTlv::serialize(uint8_t **buffer, size_t *size, size_t maxS
  if (maxSize < this->getSerializedSize()) {
    return BUFFER_TOO_SHORT;
  }
-  **buffer = cfdp::TlvTypes::ENTITY_ID;
+  **buffer = cfdp::TlvType::ENTITY_ID;
  *size += 1;
  *buffer += 1;
  size_t serLen = entityId.getSerializedSize();
@@ -28,8 +28,8 @@ ReturnValue_t EntityIdTlv::deSerialize(const uint8_t **buffer, size_t *size,
  if (*size < 3) {
    return STREAM_TOO_SHORT;
  }
-  cfdp::TlvTypes type = static_cast<cfdp::TlvTypes>(**buffer);
-  if (type != cfdp::TlvTypes::ENTITY_ID) {
+  cfdp::TlvType type = static_cast<cfdp::TlvType>(**buffer);
+  if (type != cfdp::TlvType::ENTITY_ID) {
    return cfdp::INVALID_TLV_TYPE;
  }
  *buffer += 1;
@@ -54,6 +54,6 @@ ReturnValue_t EntityIdTlv::deSerialize(cfdp::Tlv &tlv, Endianness endianness) {

 uint8_t EntityIdTlv::getLengthField() const { return 1 + entityId.getSerializedSize(); }

-cfdp::TlvTypes EntityIdTlv::getType() const { return cfdp::TlvTypes::ENTITY_ID; }
+cfdp::TlvType EntityIdTlv::getType() const { return cfdp::TlvType::ENTITY_ID; }

 cfdp::EntityId &EntityIdTlv::getEntityId() { return entityId; }
@@ -23,11 +23,13 @@ class EntityIdTlv : public TlvIF {
   */
  ReturnValue_t deSerialize(cfdp::Tlv& tlv, Endianness endianness);

+  using SerializeIF::deSerialize;  // we overloaded this function, so this is needed to unconfuse
+                                   // the compiler
  ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
                            Endianness streamEndianness) override;

  uint8_t getLengthField() const override;
-  cfdp::TlvTypes getType() const override;
+  cfdp::TlvType getType() const override;

  cfdp::EntityId& getEntityId();

@@ -1,7 +1,7 @@
 #include "FaultHandlerOverrideTlv.h"

 FaultHandlerOverrideTlv::FaultHandlerOverrideTlv(cfdp::ConditionCode conditionCode,
-                                                 cfdp::FaultHandlerCodes handlerCode)
+                                                 cfdp::FaultHandlerCode handlerCode)
    : conditionCode(conditionCode), handlerCode(handlerCode) {}

 FaultHandlerOverrideTlv::FaultHandlerOverrideTlv() = default;
@@ -32,8 +32,8 @@ ReturnValue_t FaultHandlerOverrideTlv::deSerialize(const uint8_t **buffer, size_
  if (*size < 3) {
    return SerializeIF::STREAM_TOO_SHORT;
  }
-  auto detectedType = static_cast<cfdp::TlvTypes>(**buffer);
-  if (detectedType != cfdp::TlvTypes::FAULT_HANDLER) {
+  auto detectedType = static_cast<cfdp::TlvType>(**buffer);
+  if (detectedType != cfdp::TlvType::FAULT_HANDLER) {
    return cfdp::INVALID_TLV_TYPE;
  }
  *buffer += 1;
@@ -45,10 +45,10 @@ ReturnValue_t FaultHandlerOverrideTlv::deSerialize(const uint8_t **buffer, size_
  *buffer += 1;
  *size += 1;
  this->conditionCode = static_cast<cfdp::ConditionCode>((**buffer >> 4) & 0x0f);
-  this->handlerCode = static_cast<cfdp::FaultHandlerCodes>(**buffer & 0x0f);
+  this->handlerCode = static_cast<cfdp::FaultHandlerCode>(**buffer & 0x0f);
  *buffer += 1;
  *size += 1;
  return returnvalue::OK;
 }

-cfdp::TlvTypes FaultHandlerOverrideTlv::getType() const { return cfdp::TlvTypes::FAULT_HANDLER; }
+cfdp::TlvType FaultHandlerOverrideTlv::getType() const { return cfdp::TlvType::FAULT_HANDLER; }
@@ -6,7 +6,7 @@
 class FaultHandlerOverrideTlv : public TlvIF {
 public:
  FaultHandlerOverrideTlv();
-  FaultHandlerOverrideTlv(cfdp::ConditionCode conditionCode, cfdp::FaultHandlerCodes handlerCode);
+  FaultHandlerOverrideTlv(cfdp::ConditionCode conditionCode, cfdp::FaultHandlerCode handlerCode);

  ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
                          Endianness streamEndianness) const override;
@@ -16,11 +16,11 @@ class FaultHandlerOverrideTlv : public TlvIF {
  ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
                            Endianness streamEndianness) override;
  [[nodiscard]] uint8_t getLengthField() const override;
-  [[nodiscard]] cfdp::TlvTypes getType() const override;
+  [[nodiscard]] cfdp::TlvType getType() const override;

 private:
  cfdp::ConditionCode conditionCode = cfdp::ConditionCode::NO_CONDITION_FIELD;
-  cfdp::FaultHandlerCodes handlerCode = cfdp::FaultHandlerCodes::RESERVED;
+  cfdp::FaultHandlerCode handlerCode = cfdp::FaultHandlerCode::RESERVED;
 };

 #endif /* FSFW_SRC_FSFW_CFDP_TLV_FAULTHANDLEROVERRIDETLV_H_ */
@@ -76,4 +76,4 @@ ReturnValue_t FilestoreRequestTlv::deSerializeFromValue(const uint8_t **buffer,
  return result;
 }

-cfdp::TlvTypes FilestoreRequestTlv::getType() const { return cfdp::TlvTypes::FILESTORE_REQUEST; }
+cfdp::TlvType FilestoreRequestTlv::getType() const { return cfdp::TlvType::FILESTORE_REQUEST; }
@@ -30,7 +30,7 @@ class FilestoreRequestTlv : public cfdp::FilestoreTlvBase {
                            Endianness streamEndianness) override;

  [[nodiscard]] uint8_t getLengthField() const override;
-  [[nodiscard]] cfdp::TlvTypes getType() const override;
+  [[nodiscard]] cfdp::TlvType getType() const override;

 private:
  cfdp::Lv *secondFileName = nullptr;
@@ -112,4 +112,4 @@ ReturnValue_t FilestoreResponseTlv::deSerialize(const cfdp::Tlv &tlv, Endianness

 uint8_t FilestoreResponseTlv::getStatusCode() const { return statusCode; }

-cfdp::TlvTypes FilestoreResponseTlv::getType() const { return cfdp::TlvTypes::FILESTORE_RESPONSE; }
+cfdp::TlvType FilestoreResponseTlv::getType() const { return cfdp::TlvType::FILESTORE_RESPONSE; }
@@ -29,11 +29,13 @@ class FilestoreResponseTlv : public cfdp::FilestoreTlvBase {
   */
  ReturnValue_t deSerialize(const cfdp::Tlv& tlv, Endianness endianness);

+  using SerializeIF::deSerialize;  // we overloaded this function, so this is needed to unconfuse
+                                   // the compiler
  ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
                            Endianness streamEndianness) override;

  [[nodiscard]] uint8_t getLengthField() const override;
-  [[nodiscard]] cfdp::TlvTypes getType() const override;
+  [[nodiscard]] cfdp::TlvType getType() const override;

 private:
  uint8_t statusCode;
@@ -102,7 +102,7 @@ class FilestoreTlvBase : public TlvIF {
    if (*size < 3) {
      return SerializeIF::STREAM_TOO_SHORT;
    }
-    auto type = static_cast<cfdp::TlvTypes>(**buffer);
+    auto type = static_cast<cfdp::TlvType>(**buffer);
    if (type != getType()) {
      return cfdp::INVALID_TLV_TYPE;
    }
@@ -1,4 +1,4 @@
 #include "FlowLabelTlv.h"

 FlowLabelTlv::FlowLabelTlv(uint8_t* value, size_t size)
-    : Tlv(cfdp::TlvTypes::FLOW_LABEL, value, size) {}
+    : Tlv(cfdp::TlvType::FLOW_LABEL, value, size) {}
@@ -76,7 +76,7 @@ ReturnValue_t cfdp::Lv::deSerialize(const uint8_t** buffer, size_t* size,
  }
  zeroLen = false;
  // Zero-copy implementation
-  value.setConstBuffer(const_cast<uint8_t*>(*buffer + 1), lengthField);
+  value.setConstBuffer(*buffer + 1, lengthField);
  *buffer += 1 + lengthField;
  *size -= 1 + lengthField;
  return returnvalue::OK;
@@ -1,9 +1,9 @@
 #include "MessageToUserTlv.h"

 MessageToUserTlv::MessageToUserTlv(uint8_t* value, size_t size)
-    : Tlv(cfdp::TlvTypes::MSG_TO_USER, value, size) {}
+    : Tlv(cfdp::TlvType::MSG_TO_USER, value, size) {}

 MessageToUserTlv::MessageToUserTlv() : Tlv() {}

 MessageToUserTlv::MessageToUserTlv(const std::vector<uint8_t>& data)
-    : Tlv(cfdp::TlvTypes::MSG_TO_USER, data.data(), data.size()) {}
+    : Tlv(cfdp::TlvType::MSG_TO_USER, data.data(), data.size()) {}
@@ -1,6 +1,6 @@
 #include "Tlv.h"

-cfdp::Tlv::Tlv(TlvTypes type, const uint8_t *value, size_t size)
+cfdp::Tlv::Tlv(TlvType type, const uint8_t *value, size_t size)
    : type(type), value(value, size, true) {
  if (size > 0) {
    zeroLen = false;
@@ -17,7 +17,7 @@ ReturnValue_t cfdp::Tlv::serialize(uint8_t **buffer, size_t *size, size_t maxSiz
  if (*size + 2 > maxSize) {
    return BUFFER_TOO_SHORT;
  }
-  if (type == TlvTypes::INVALID_TLV) {
+  if (type == TlvType::INVALID_TLV) {
    return INVALID_TLV_TYPE;
  }
  **buffer = type;
@@ -59,7 +59,7 @@ ReturnValue_t cfdp::Tlv::deSerialize(const uint8_t **buffer, size_t *size,
    return INVALID_TLV_TYPE;
  }

-  type = static_cast<TlvTypes>(rawType);
+  type = static_cast<TlvType>(rawType);
  *buffer += 1;
  *size -= 1;

@@ -75,7 +75,7 @@ ReturnValue_t cfdp::Tlv::deSerialize(const uint8_t **buffer, size_t *size,
  }
  zeroLen = false;
  // Zero-copy implementation
-  value.setConstBuffer(const_cast<uint8_t *>(*buffer + 1), lengthField);
+  value.setConstBuffer(*buffer + 1, lengthField);
  *buffer += 1 + lengthField;
  *size -= 1 + lengthField;
  return returnvalue::OK;
@@ -83,7 +83,7 @@ ReturnValue_t cfdp::Tlv::deSerialize(const uint8_t **buffer, size_t *size,

 const uint8_t *cfdp::Tlv::getValue() const { return value.getConstBuffer(); }

-cfdp::TlvTypes cfdp::Tlv::getType() const { return type; }
+cfdp::TlvType cfdp::Tlv::getType() const { return type; }

 bool cfdp::Tlv::checkType(uint8_t rawType) {
  if (rawType != 0x03 and rawType <= 6) {
@@ -101,4 +101,4 @@ void cfdp::Tlv::setValue(uint8_t *value, size_t len) {

 uint8_t cfdp::Tlv::getLengthField() const { return this->value.getSerializedSize() - 1; }

-void cfdp::Tlv::setType(TlvTypes type) { this->type = type; }
+void cfdp::Tlv::setType(TlvType type) { this->type = type; }
@@ -13,7 +13,7 @@ namespace cfdp {
 */
 class Tlv : public TlvIF {
 public:
-  Tlv(TlvTypes type, const uint8_t *value, size_t size);
+  Tlv(TlvType type, const uint8_t *value, size_t size);
  Tlv();

  /**
@@ -47,15 +47,15 @@ class Tlv : public TlvIF {
  void setValue(uint8_t *value, size_t len);

  [[nodiscard]] const uint8_t *getValue() const;
-  void setType(TlvTypes type);
-  [[nodiscard]] TlvTypes getType() const override;
+  void setType(TlvType type);
+  [[nodiscard]] TlvType getType() const override;
  [[nodiscard]] uint8_t getLengthField() const override;

 private:
  bool checkType(uint8_t rawType);

  bool zeroLen = true;
-  TlvTypes type = TlvTypes::INVALID_TLV;
+  TlvType type = TlvType::INVALID_TLV;
  SerialBufferAdapter<uint8_t> value;
 };

@@ -8,7 +8,7 @@ class TlvIF : public SerializeIF {
  virtual ~TlvIF(){};

  virtual uint8_t getLengthField() const = 0;
-  virtual cfdp::TlvTypes getType() const = 0;
+  virtual cfdp::TlvType getType() const = 0;
 };

 #endif /* FSFW_SRC_FSFW_CFDP_TLVIF_H_ */
@@ -4,6 +4,7 @@
 #include "../returnvalues/returnvalue.h"
 #include "../serialize/SerializeAdapter.h"
 #include "../serialize/SerializeIF.h"
+#include "definitions.h"

 /**
 * @brief     A List that stores its values in an array.
@@ -19,9 +20,6 @@ class ArrayList {
  friend class SerialArrayListAdapter;

 public:
-  static const uint8_t INTERFACE_ID = CLASS_ID::ARRAY_LIST;
-  static const ReturnValue_t FULL = MAKE_RETURN_CODE(0x01);
-
  /**
   * This is the allocating constructor.
   * It allocates an array of the specified size.
@@ -187,7 +185,7 @@ class ArrayList {
   */
  ReturnValue_t insert(T entry) {
    if (size >= maxSize_) {
-      return FULL;
+      return containers::LIST_FULL;
    }
    entries[size] = entry;
    ++size;
@@ -12,6 +12,7 @@ template <typename T, size_t MAX_SIZE, typename count_t = uint8_t>
 class FixedArrayList : public ArrayList<T, count_t> {
  static_assert(MAX_SIZE <= std::numeric_limits<count_t>::max(),
                "count_t is not large enough to hold MAX_SIZE");
+  static_assert(MAX_SIZE > 0, "MAX_SIZE is 0");

 private:
  T data[MAX_SIZE];
@@ -20,15 +21,19 @@ class FixedArrayList : public ArrayList<T, count_t> {
  FixedArrayList() : ArrayList<T, count_t>(data, MAX_SIZE) {}

  FixedArrayList(const FixedArrayList& other) : ArrayList<T, count_t>(data, MAX_SIZE) {
-    memcpy(this->data, other.data, sizeof(this->data));
    this->entries = data;
    this->size = other.size;
+    for (size_t idx = 0; idx < this->size; idx++) {
+      data[idx] = other.data[idx];
+    }
  }

  FixedArrayList& operator=(FixedArrayList other) {
-    memcpy(this->data, other.data, sizeof(this->data));
    this->entries = data;
    this->size = other.size;
+    for (size_t idx = 0; idx < this->size; idx++) {
+      data[idx] = other.data[idx];
+    }
    return *this;
  }

@@ -4,8 +4,8 @@
 #include <type_traits>
 #include <utility>

-#include "../returnvalues/returnvalue.h"
 #include "ArrayList.h"
+#include "definitions.h"

 /**
 * @brief    Map implementation for maps with a pre-defined size.
@@ -24,11 +24,6 @@ class FixedMap : public SerializeIF {
                "derived class from SerializeIF to be serialize-able");

 public:
-  static const uint8_t INTERFACE_ID = CLASS_ID::FIXED_MAP;
-  static const ReturnValue_t KEY_ALREADY_EXISTS = MAKE_RETURN_CODE(0x01);
-  static const ReturnValue_t MAP_FULL = MAKE_RETURN_CODE(0x02);
-  static const ReturnValue_t KEY_DOES_NOT_EXIST = MAKE_RETURN_CODE(0x03);
-
 private:
  static const key_t EMPTY_SLOT = -1;
  ArrayList<std::pair<key_t, T>, uint32_t> theMap;
@@ -76,10 +71,10 @@ class FixedMap : public SerializeIF {

  ReturnValue_t insert(key_t key, T value, Iterator* storedValue = nullptr) {
    if (exists(key) == returnvalue::OK) {
-      return KEY_ALREADY_EXISTS;
+      return containers::KEY_ALREADY_EXISTS;
    }
    if (_size == theMap.maxSize()) {
-      return MAP_FULL;
+      return containers::MAP_FULL;
    }
    theMap[_size].first = key;
    theMap[_size].second = value;
@@ -93,7 +88,7 @@ class FixedMap : public SerializeIF {
  ReturnValue_t insert(std::pair<key_t, T> pair) { return insert(pair.first, pair.second); }

  ReturnValue_t exists(key_t key) const {
-    ReturnValue_t result = KEY_DOES_NOT_EXIST;
+    ReturnValue_t result = containers::KEY_DOES_NOT_EXIST;
    if (findIndex(key) < _size) {
      result = returnvalue::OK;
    }
@@ -103,7 +98,7 @@ class FixedMap : public SerializeIF {
  ReturnValue_t erase(Iterator* iter) {
    uint32_t i;
    if ((i = findIndex((*iter).value->first)) >= _size) {
-      return KEY_DOES_NOT_EXIST;
+      return containers::KEY_DOES_NOT_EXIST;
    }
    theMap[i] = theMap[_size - 1];
    --_size;
@@ -114,7 +109,7 @@ class FixedMap : public SerializeIF {
  ReturnValue_t erase(key_t key) {
    uint32_t i;
    if ((i = findIndex(key)) >= _size) {
-      return KEY_DOES_NOT_EXIST;
+      return containers::KEY_DOES_NOT_EXIST;
    }
    theMap[i] = theMap[_size - 1];
    --_size;
@@ -160,8 +155,8 @@ class FixedMap : public SerializeIF {

  uint32_t maxSize() const { return theMap.maxSize(); }

-  virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
-                                  Endianness streamEndianness) const {
+  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
+                          Endianness streamEndianness) const override {
    ReturnValue_t result =
        SerializeAdapter::serialize(&this->_size, buffer, size, maxSize, streamEndianness);
    uint32_t i = 0;
@@ -175,7 +170,7 @@ class FixedMap : public SerializeIF {
    return result;
  }

-  virtual size_t getSerializedSize() const {
+  size_t getSerializedSize() const override {
    uint32_t printSize = sizeof(_size);
    uint32_t i = 0;

@@ -187,8 +182,8 @@ class FixedMap : public SerializeIF {
    return printSize;
  }

-  virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
-                                    Endianness streamEndianness) {
+  ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
+                            Endianness streamEndianness) override {
    ReturnValue_t result =
        SerializeAdapter::deSerialize(&this->_size, buffer, size, streamEndianness);
    if (this->_size > theMap.maxSize()) {
--- a/Show More
+++ b/Show More