Merge branch 'development' into mohr/timetag_fix

Reviewed-on: #743

CHANGELOG.md

@@ -8,15 +8,155 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 # [unreleased]
 
-# [v6.0.0]
+## Fixes
+
+- 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
+- PUS Scheduling Service: Use timeval internally
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/735
 
 ## Added
 
+- add CFDP subsystem ID
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/742
+
+## 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
+
+# [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 +164,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
 

CMakeLists.txt

@@ -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}.35.14
     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}.1.0
     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()
@@ -360,7 +369,8 @@ if(NOT FSFW_CONFIG_PATH)
   if(NOT FSFW_BUILD_DOCS)
     message(
       WARNING
-        "${MSG_PREFIX} Flight Software Framework configuration path not set")
+        "${MSG_PREFIX} Flight Software Framework configuration path FSFW_CONFIG_PATH not set"
+    )
     message(
       WARNING
         "${MSG_PREFIX} Setting default configuration from ${DEF_CONF_PATH} ..")

README.md

@@ -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

automation/Dockerfile

@@ -5,16 +5,25 @@ 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
+
+RUN python3 -m pip install sphinx 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

automation/Jenkinsfile

@@ -1,41 +1,125 @@
 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:d6'
+            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 {
+                branch 'development'
+            }
             steps {
+                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:/fsfw/development'
+                    }
+                }
                 dir(BUILDDIR) {
-                    sh 'cmake --build . -- fsfw-tests_coverage -j4'
+                    sshagent(credentials: ['documentation-buildfix']) {
+                        sh 'rsync -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/fsfw/coverage/development'
+                    }
                 }
             }
         }
-        stage('Valgrind') {
+        stage('Master Documentation') {
+            when {
+                branch 'master'
+            }
             steps {
+                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:/fsfw/master'
+                    }
+                }
                 dir(BUILDDIR) {
-                    sh 'valgrind --leak-check=full --error-exitcode=1 ./fsfw-tests'
+                    sshagent(credentials: ['documentation-buildfix']) {
+                        sh 'rsync -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/fsfw/coverage/master'
+                    }
                 }
             }
         }

cmake/cmake-modules/bilke/CodeCoverage.cmake

@@ -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)

docs/README-config.md

@@ -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;
-}
-```
-

docs/README-controllers.md

@@ -1 +0,0 @@
-## Controllers

docs/README-core.md

@@ -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
-

docs/README-devicehandlers.md

@@ -1 +0,0 @@
-## Device Handlers

docs/README-highlevel.md

@@ -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)

docs/README-localpools.md

@@ -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
-
-

docs/README-osal.md

@@ -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.
-
-

docs/README-pus.md

@@ -1 +0,0 @@
-## PUS Services

docs/conf.py

@@ -22,7 +22,7 @@ copyright = "2021, Institute of Space Systems (IRS)"
 author = "Institute of Space Systems (IRS)"
 
 # The full version, including alpha/beta/rc tags
-release = "2.0.1"
+release = "5.0.0"
 
 
 # -- General configuration ---------------------------------------------------
@@ -50,6 +50,11 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 #
 html_theme = "alabaster"
 
+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,
 # so a file named "default.css" will overwrite the builtin "default.css".

docs/highlevel.rst

@@ -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
 -----------------

misc/defaultcfg/fsfwconfig/FSFWConfig.h

@@ -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

misc/defaultcfg/fsfwconfig/objects/FsfwFactory.cpp

@@ -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;
 }
 

scripts/check_release.py

@@ -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()

scripts/helper.py

@@ -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]):

src/fsfw/cfdp.h

@@ -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"

src/fsfw/cfdp/CMakeLists.txt

@@ -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)

src/fsfw/cfdp/CfdpDistributor.cpp

@@ -21,7 +21,8 @@ ReturnValue_t CfdpDistributor::selectDestination(MessageQueueId_t& destId) {
   if (accessorPair.first != returnvalue::OK) {
     return accessorPair.first;
   }
-  ReturnValue_t result = pduReader.setData(accessorPair.second.data(), accessorPair.second.size());
+  ReturnValue_t result =
+      pduReader.setReadOnlyData(accessorPair.second.data(), accessorPair.second.size());
   if (result != returnvalue::OK) {
     return result;
   }

src/fsfw/cfdp/CfdpDistributor.h

@@ -4,7 +4,7 @@
 #include <utility>
 #include <vector>
 
-#include "fsfw/cfdp/pdu/HeaderReader.h"
+#include "fsfw/cfdp/pdu/PduHeaderReader.h"
 #include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tcdistribution/CfdpPacketChecker.h"
 #include "fsfw/tcdistribution/TcDistributorBase.h"
@@ -60,7 +60,7 @@ class CfdpDistributor : public TcDistributorBase, public AcceptsTelecommandsIF {
     const char* name;
     MessageQueueId_t queueId;
   };
-  HeaderReader pduReader;
+  PduHeaderReader pduReader;
   ReturnValue_t lastTcError = returnvalue::OK;
   ReturnValue_t lastTmError = returnvalue::OK;
   // I don't think a regular OBSW will have more than 1 or 2 of these destinations, so I think

src/fsfw/cfdp/CfdpHandler.cpp

@@ -1,54 +0,0 @@
-//#include "fsfw/cfdp/CfdpHandler.h"
-//
-//#include "fsfw/cfdp/CfdpMessage.h"
-//#include "fsfw/ipc/CommandMessage.h"
-//#include "fsfw/ipc/QueueFactory.h"
-//#include "fsfw/objectmanager/ObjectManager.h"
-//#include "fsfw/storagemanager/storeAddress.h"
-//#include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
-//
-// CfdpHandler::CfdpHandler(object_id_t setObjectId, CfdpHandler* dist)
-//    : SystemObject(setObjectId) {
-//  requestQueue = QueueFactory::instance()->createMessageQueue(CFDP_HANDLER_MAX_RECEPTION);
-//  distributor = dist;
-//}
-//
-// CfdpHandler::~CfdpHandler() = default;
-//
-// ReturnValue_t CfdpHandler::initialize() {
-//  ReturnValue_t result = SystemObject::initialize();
-//  if (result != RETURN_OK) {
-//    return result;
-//  }
-//  this->distributor->registerHandler(this);
-//  return HasReturnvaluesIF::RETURN_OK;
-//}
-//
-// ReturnValue_t CfdpHandler::handleRequest(store_address_t storeId) {
-//#if FSFW_VERBOSE_LEVEL >= 1
-//#if FSFW_CPP_OSTREAM_ENABLED == 1
-//  sif::debug << "CFDPHandler::handleRequest" << std::endl;
-//#else
-//  sif::printDebug("CFDPHandler::handleRequest\n");
-//#endif /* !FSFW_CPP_OSTREAM_ENABLED == 1 */
-//#endif
-//
-//  // TODO read out packet from store using storeId
-//
-//  return RETURN_OK;
-//}
-//
-// ReturnValue_t CfdpHandler::performOperation(uint8_t opCode) {
-//  ReturnValue_t status = RETURN_OK;
-//  CommandMessage currentMessage;
-//  for (status = this->requestQueue->receiveMessage(&currentMessage); status == RETURN_OK;
-//       status = this->requestQueue->receiveMessage(&currentMessage)) {
-//    store_address_t storeId = CfdpMessage::getStoreId(&currentMessage);
-//    this->handleRequest(storeId);
-//  }
-//  return RETURN_OK;
-//}
-//
-// uint32_t CfdpHandler::getIdentifier() const { return 0; }
-//
-// MessageQueueId_t CfdpHandler::getRequestQueue() const { return this->requestQueue->getId(); }

src/fsfw/cfdp/CfdpHandler.h

@@ -1,63 +0,0 @@
-//#ifndef FSFW_CFDP_CFDPHANDLER_H_
-//#define FSFW_CFDP_CFDPHANDLER_H_
-//
-//#include "fsfw/ipc/MessageQueueIF.h"
-//#include "fsfw/objectmanager/SystemObject.h"
-//#include "fsfw/returnvalues/HasReturnvaluesIF.h"
-//#include "fsfw/storagemanager/storeAddress.h"
-//#include "fsfw/tasks/ExecutableObjectIF.h"
-//#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
-//
-// namespace Factory {
-// void setStaticFrameworkObjectIds();
-//}
-//
-// class CfdpHandler : public ExecutableObjectIF,
-//                    public AcceptsTelecommandsIF,
-//                    public SystemObject,
-//                    public HasReturnvaluesIF {
-//  friend void(Factory::setStaticFrameworkObjectIds)();
-//
-// public:
-//  CfdpHandler(object_id_t setObjectId, CfdpHandler* distributor);
-//  /**
-//   * The destructor is empty.
-//   */
-//  virtual ~CfdpHandler();
-//
-//  virtual ReturnValue_t handleRequest(store_address_t storeId);
-//
-//  virtual ReturnValue_t initialize() override;
-//  virtual uint32_t getIdentifier() const override;
-//  MessageQueueId_t getRequestQueue() const override;
-//  ReturnValue_t performOperation(uint8_t opCode) override;
-//
-// protected:
-//  /**
-//   * This is a complete instance of the telecommand reception queue
-//   * of the class. It is initialized on construction of the class.
-//   */
-//  MessageQueueIF* requestQueue = nullptr;
-//
-//  CfdpHandler* distributor = nullptr;
-//
-//  /**
-//   * The current CFDP packet to be processed.
-//   * It is deleted after handleRequest was executed.
-//   */
-//  CfdpPacketStored currentPacket;
-//
-//  static object_id_t packetSource;
-//
-//  static object_id_t packetDestination;
-//
-// private:
-//  /**
-//   * This constant sets the maximum number of packets accepted per call.
-//   * Remember that one packet must be completely handled in one
-//   * #handleRequest call.
-//   */
-//  static const uint8_t CFDP_HANDLER_MAX_RECEPTION = 100;
-//};
-//
-//#endif /* FSFW_CFDP_CFDPHANDLER_H_ */

src/fsfw/cfdp/FileSize.h

@@ -1,6 +1,8 @@
 #ifndef FSFW_CFDP_FILESIZE_H_
 #define FSFW_CFDP_FILESIZE_H_
 
+#include <optional>
+
 #include "fsfw/serialize/SerializeAdapter.h"
 #include "fsfw/serialize/SerializeIF.h"
 
@@ -52,13 +54,15 @@ struct FileSize : public SerializeIF {
     }
   }
 
-  ReturnValue_t setFileSize(uint64_t fileSize_, bool largeFile_) {
+  ReturnValue_t setFileSize(uint64_t fileSize_, std::optional<bool> largeFile_) {
+    if (largeFile_) {
+      largeFile = largeFile_.value();
+    }
     if (not largeFile and fileSize > UINT32_MAX) {
       // TODO: emit warning here
       return returnvalue::FAILED;
     }
     this->fileSize = fileSize_;
-    this->largeFile = largeFile_;
     return returnvalue::OK;
   }
 

src/fsfw/cfdp/VarLenFields.cpp

@@ -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);
+}

src/fsfw/cfdp/VarLenFields.h

@@ -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,6 +44,14 @@ 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:
   ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size,
                             Endianness streamEndianness) override;
@@ -78,10 +88,16 @@ struct TransactionId {
   TransactionId(EntityId entityId, TransactionSeqNum seqNum)
       : entityId(std::move(entityId)), seqNum(std::move(seqNum)) {}
 
-  bool operator==(const TransactionId &other) {
+  bool operator==(const TransactionId &other) const {
     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;
 };

src/fsfw/cfdp/definitions.h

@@ -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,13 +30,14 @@ 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/
@@ -51,7 +52,7 @@ enum ChecksumType {
 
 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,

src/fsfw/cfdp/handler/CMakeLists.txt

@@ -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)

src/fsfw/cfdp/handler/DestHandler.cpp

@@ -1,267 +0,0 @@
-#include "DestHandler.h"
-
-#include <utility>
-
-#include "fsfw/FSFW.h"
-#include "fsfw/cfdp/pdu/EofPduReader.h"
-#include "fsfw/cfdp/pdu/FileDataReader.h"
-#include "fsfw/cfdp/pdu/HeaderReader.h"
-#include "fsfw/objectmanager.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;
-}
-
-ReturnValue_t cfdp::DestHandler::performStateMachine() {
-  ReturnValue_t result;
-  ReturnValue_t status = returnvalue::OK;
-  if (step == TransactionStep::IDLE) {
-    for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
-      if (infoIter->pduType == PduType::FILE_DIRECTIVE and
-          infoIter->directiveType == FileDirectives::METADATA) {
-        result = handleMetadataPdu(*infoIter);
-        if (result != OK) {
-          status = result;
-        }
-        // Store data was deleted in PDU handler because a store guard is used
-        dp.packetListRef.erase(infoIter++);
-      }
-    }
-    if (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);
-      }
-      dp.packetListRef.clear();
-    }
-
-    if (step != TransactionStep::IDLE) {
-      return CALL_FSM_AGAIN;
-    }
-    return status;
-  }
-  if (cfdpState == CfdpStates::BUSY_CLASS_1_NACKED) {
-    for (auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
-      if (infoIter->pduType == PduType::FILE_DATA) {
-        result = handleFileDataPdu(*infoIter);
-        if (result != OK) {
-          status = result;
-        }
-        // Store data was deleted in PDU handler because a store guard is used
-        dp.packetListRef.erase(infoIter++);
-      }
-      if (infoIter->pduType == PduType::FILE_DIRECTIVE and
-          infoIter->directiveType == FileDirectives::EOF_DIRECTIVE) {
-        result = handleEofPdu(*infoIter);
-      }
-    }
-    return OK;
-  }
-  if (cfdpState == 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 OK;
-}
-
-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;
-    }
-  }
-  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(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.sourceName.data(), fileSegmentLen);
-  result = dp.user.vfs.writeToFile(fileOpParams, fileData);
-  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);
-  }
-  if (result != returnvalue::OK) {
-    // TODO: Proper Error handling
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "File write error" << std::endl;
-#endif
-  }
-  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;
-  }
-  if (eofInfo.getConditionCode() == ConditionCode::NO_ERROR) {
-    tp.crc = eofInfo.getChecksum();
-  }
-  return returnvalue::OK;
-}
-
-ReturnValue_t cfdp::DestHandler::handleMetadataParseError(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
-  HeaderReader headerReader(rawData, maxSize);
-  ReturnValue_t 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 (cfdpState != CfdpStates::IDLE) {
-    // According to standard, discard metadata PDU if we are busy
-    return returnvalue::OK;
-  }
-  step = TransactionStep::TRANSACTION_START;
-  if (reader.getTransmissionMode() == TransmissionModes::UNACKNOWLEDGED) {
-    cfdpState = CfdpStates::BUSY_CLASS_1_NACKED;
-  } else if (reader.getTransmissionMode() == TransmissionModes::ACKNOWLEDGED) {
-    cfdpState = 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.destId, &tp.remoteCfg)) {
-    // TODO: Warning, event etc.
-    return FAILED;
-  }
-  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();
-  dp.user.metadataRecvdIndication(params);
-  return OK;
-}
-
-cfdp::CfdpStates cfdp::DestHandler::getCfdpState() const { return cfdpState; }

src/fsfw/cfdp/handler/DestHandler.h

@@ -1,122 +0,0 @@
-#ifndef FSFW_CFDP_CFDPDESTHANDLER_H
-#define FSFW_CFDP_CFDPDESTHANDLER_H
-
-#include <etl/list.h>
-
-#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(PduType type, FileDirectives directive, store_address_t storeId)
-      : pduType(type), directiveType(directive), storeId(storeId) {}
-
-  PduType pduType = PduType::FILE_DATA;
-  FileDirectives directiveType = FileDirectives::INVALID_DIRECTIVE;
-  store_address_t storeId = store_address_t::invalid();
-  PacketInfo() = default;
-};
-
-struct DestHandlerParams {
-  DestHandlerParams(LocalEntityCfg cfg, UserBase& user, RemoteConfigTableIF& remoteCfgTable,
-                    etl::ilist<PacketInfo>& packetList)
-      : cfg(std::move(cfg)),
-        user(user),
-        remoteCfgTable(remoteCfgTable),
-        packetListRef(packetList) {}
-
-  LocalEntityCfg cfg;
-  UserBase& user;
-  RemoteConfigTableIF& remoteCfgTable;
-
-  etl::ilist<PacketInfo>& packetListRef;
-  uint8_t maxTlvsInOnePdu = 10;
-  size_t maxFilenameLen = 255;
-};
-
-struct FsfwParams {
-  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF& msgQueue,
-             EventReportingProxyIF& eventReporter)
-      : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
-  AcceptsTelemetryIF& packetDest;
-  MessageQueueIF& msgQueue;
-  EventReportingProxyIF& eventReporter;
-  StorageManagerIF* tcStore = nullptr;
-  StorageManagerIF* tmStore = nullptr;
-};
-
-class DestHandler {
- public:
-  /**
-   * Will be returned if it is advisable to call the state machine operation call again
-   */
-  ReturnValue_t CALL_FSM_AGAIN = returnvalue::makeCode(1, 0);
-  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.
-   */
-  ReturnValue_t performStateMachine();
-
-  ReturnValue_t passPacket(PacketInfo packet);
-
-  ReturnValue_t initialize();
-
-  [[nodiscard]] CfdpStates getCfdpState() const;
-
- private:
-  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 TransactionParams {
-    explicit TransactionParams(size_t maxFileNameLen)
-        : sourceName(maxFileNameLen), destName(maxFileNameLen) {}
-
-    ChecksumType checksumType = ChecksumType::NULL_CHECKSUM;
-    bool closureRequested = false;
-    std::vector<char> sourceName;
-    std::vector<char> destName;
-    cfdp::FileSize fileSize;
-    TransactionId transactionId;
-    PduConfig pduConf;
-    uint32_t crc = 0;
-    RemoteEntityCfg* remoteCfg = nullptr;
-  };
-
-  TransactionStep step = TransactionStep::IDLE;
-  CfdpStates cfdpState = CfdpStates::IDLE;
-  std::vector<cfdp::Tlv> tlvVec;
-  std::vector<cfdp::Tlv> userTlvVec;
-  DestHandlerParams dp;
-  FsfwParams fp;
-  TransactionParams tp;
-
-  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(const uint8_t* rawData, size_t maxSize);
-};
-
-}  // namespace cfdp
-
-#endif  // FSFW_CFDP_CFDPDESTHANDLER_H

src/fsfw/cfdp/handler/FaultHandlerBase.cpp

@@ -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;

src/fsfw/cfdp/handler/FaultHandlerBase.h

@@ -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

src/fsfw/cfdp/handler/RemoteConfigTableIF.h

@@ -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

src/fsfw/cfdp/handler/SourceHandler.cpp

@@ -1 +0,0 @@
-#include "SourceHandler.h"

src/fsfw/cfdp/handler/SourceHandler.h

@@ -1,6 +0,0 @@
-#ifndef FSFW_CFDP_CFDPSOURCEHANDLER_H
-#define FSFW_CFDP_CFDPSOURCEHANDLER_H
-
-class SourceHandler {};
-
-#endif  // FSFW_CFDP_CFDPSOURCEHANDLER_H

src/fsfw/cfdp/handler/UserBase.h

@@ -14,11 +14,11 @@
 namespace cfdp {
 
 struct TransactionFinishedParams {
-  TransactionFinishedParams(TransactionId id, ConditionCode code, FileDeliveryStatus status,
-                            FileDeliveryCode delivCode)
-      : id(std::move(id)), condCode(code), status(status), deliveryCode(delivCode) {}
+  TransactionFinishedParams(const TransactionId& id, ConditionCode code, FileDeliveryCode delivCode,
+                            FileDeliveryStatus status)
+      : id(id), condCode(code), status(status), deliveryCode(delivCode) {}
 
-  TransactionId id;
+  const TransactionId& id;
   ConditionCode condCode;
   FileDeliveryStatus status;
   FileDeliveryCode deliveryCode;

src/fsfw/cfdp/handler/mib.h

@@ -27,11 +27,12 @@ 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;
+  TransmissionMode defaultTransmissionMode = TransmissionMode::UNACKNOWLEDGED;
   ChecksumType defaultChecksum = ChecksumType::NULL_CHECKSUM;
   const uint8_t version = CFDP_VERSION_2;
 };

src/fsfw/cfdp/helpers.cpp

@@ -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";
+}

src/fsfw/cfdp/helpers.h

@@ -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

src/fsfw/cfdp/pdu/AckInfo.cpp

@@ -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;
 }
 

src/fsfw/cfdp/pdu/AckInfo.h

@@ -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;

src/fsfw/cfdp/pdu/AckPduCreator.cpp

@@ -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;
   }

src/fsfw/cfdp/pdu/AckPduCreator.h

@@ -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_ */

src/fsfw/cfdp/pdu/AckPduReader.cpp

@@ -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;
+}

src/fsfw/cfdp/pdu/AckPduReader.h

@@ -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);

src/fsfw/cfdp/pdu/CMakeLists.txt

@@ -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
-          FinishedPduSerializer.cpp
-          FinishedPduDeserializer.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)

src/fsfw/cfdp/pdu/EofPduCreator.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()));
 }
 

src/fsfw/cfdp/pdu/EofPduCreator.h

@@ -14,6 +14,8 @@ class EofPduCreator : public FileDirectiveCreator {
   ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                           Endianness streamEndianness) const override;
 
+  using FileDirectiveCreator::serialize;
+
  private:
   EofInfo& info;
 };

src/fsfw/cfdp/pdu/FileDataCreator.cpp

@@ -15,13 +15,17 @@ void FileDataCreator::update() {
 
 ReturnValue_t FileDataCreator::serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                                          Endianness streamEndianness) const {
+  if (buffer == nullptr or size == nullptr) {
+    return returnvalue::FAILED;
+  }
+  if (*size + getSerializedSize() > maxSize) {
+    return SerializeIF::BUFFER_TOO_SHORT;
+  }
   ReturnValue_t result = HeaderCreator::serialize(buffer, size, maxSize, streamEndianness);
   if (result != returnvalue::OK) {
     return result;
   }
-  if (*size + this->getSerializedSize() > maxSize) {
-    return SerializeIF::BUFFER_TOO_SHORT;
-  }
+
   const uint8_t* readOnlyPtr = nullptr;
   if (this->hasSegmentMetadataFlag()) {
     size_t segmentMetadataLen = info.getSegmentMetadataLen();

src/fsfw/cfdp/pdu/FileDataCreator.h

@@ -11,6 +11,10 @@ class FileDataCreator : public HeaderCreator {
 
   void update();
 
+  ReturnValue_t serialize(uint8_t* buf, size_t& serLen, size_t maxSize) const {
+    return SerializeIF::serialize(buf, serLen, maxSize, SerializeIF::Endianness::NETWORK);
+  }
+
   ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                           Endianness streamEndianness) const override;
 

src/fsfw/cfdp/pdu/FileDataReader.cpp

@@ -1,16 +1,16 @@
 #include "FileDataReader.h"
 
 FileDataReader::FileDataReader(const uint8_t* pduBuf, size_t maxSize, FileDataInfo& info)
-    : HeaderReader(pduBuf, maxSize), info(info) {}
+    : PduHeaderReader(pduBuf, maxSize), info(info) {}
 
 ReturnValue_t FileDataReader::parseData() {
-  ReturnValue_t result = HeaderReader::parseData();
+  ReturnValue_t result = PduHeaderReader::parseData();
   if (result != returnvalue::OK) {
     return result;
   }
-  size_t currentIdx = HeaderReader::getHeaderSize();
+  size_t currentIdx = PduHeaderReader::getHeaderSize();
   const uint8_t* buf = pointers.rawPtr + currentIdx;
-  size_t remSize = HeaderReader::getWholePduSize() - currentIdx;
+  size_t remSize = PduHeaderReader::getWholePduSize() - currentIdx;
   if (remSize < 1) {
     return SerializeIF::STREAM_TOO_SHORT;
   }

src/fsfw/cfdp/pdu/FileDataReader.h

@@ -3,9 +3,9 @@
 
 #include "../definitions.h"
 #include "FileDataInfo.h"
-#include "HeaderReader.h"
+#include "PduHeaderReader.h"
 
-class FileDataReader : public HeaderReader {
+class FileDataReader : public PduHeaderReader {
  public:
   FileDataReader(const uint8_t* pduBuf, size_t maxSize, FileDataInfo& info);
 

src/fsfw/cfdp/pdu/FileDirectiveCreator.cpp

@@ -1,6 +1,6 @@
 #include "FileDirectiveCreator.h"
 
-FileDirectiveCreator::FileDirectiveCreator(PduConfig &pduConf, cfdp::FileDirectives directiveCode,
+FileDirectiveCreator::FileDirectiveCreator(PduConfig &pduConf, cfdp::FileDirective directiveCode,
                                            size_t directiveParamFieldLen)
     : HeaderCreator(pduConf, cfdp::PduType::FILE_DIRECTIVE, directiveParamFieldLen + 1),
       directiveCode(directiveCode) {}
@@ -35,3 +35,5 @@ void FileDirectiveCreator::setDirectiveDataFieldLen(size_t len) {
   // Set length of data field plus 1 byte for the directive octet
   HeaderCreator::setPduDataFieldLen(len + 1);
 }
+
+cfdp::FileDirective FileDirectiveCreator::getDirectiveCode() const { return directiveCode; }

src/fsfw/cfdp/pdu/FileDirectiveCreator.h

@@ -5,9 +5,11 @@
 
 class FileDirectiveCreator : public HeaderCreator {
  public:
-  FileDirectiveCreator(PduConfig& pduConf, cfdp::FileDirectives directiveCode,
+  FileDirectiveCreator(PduConfig& pduConf, cfdp::FileDirective directiveCode,
                        size_t directiveParamFieldLen);
 
+  [[nodiscard]] cfdp::FileDirective getDirectiveCode() const;
+
   /**
    * This only returns the size of the PDU header + 1 for the directive code octet.
    * Use FileDirectiveCreator::getWholePduSize to get the full packet length, assuming
@@ -16,13 +18,17 @@ class FileDirectiveCreator : public HeaderCreator {
    */
   [[nodiscard]] size_t getSerializedSize() const override;
 
+  [[nodiscard]] ReturnValue_t serialize(uint8_t* buffer, size_t& serLen, size_t maxSize) const {
+    return SerializeIF::serialize(buffer, serLen, maxSize, SerializeIF::Endianness::NETWORK);
+  }
+
   ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                           Endianness streamEndianness) const override;
 
   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_ */

src/fsfw/cfdp/pdu/FileDirectiveReader.cpp

@@ -1,12 +1,12 @@
 #include "FileDirectiveReader.h"
 
 FileDirectiveReader::FileDirectiveReader(const uint8_t *pduBuf, size_t maxSize)
-    : HeaderReader(pduBuf, 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 = HeaderReader::parseData();
+  ReturnValue_t result = PduHeaderReader::parseData();
   if (result != returnvalue::OK) {
     return result;
   }
@@ -16,29 +16,29 @@ ReturnValue_t FileDirectiveReader::parseData() {
   if (FileDirectiveReader::getWholePduSize() > maxSize) {
     return SerializeIF::STREAM_TOO_SHORT;
   }
-  size_t currentIdx = HeaderReader::getHeaderSize();
+  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;
 }
 
 size_t FileDirectiveReader::getHeaderSize() const {
   // return size of header plus the directive byte
-  return HeaderReader::getHeaderSize() + 1;
+  return PduHeaderReader::getHeaderSize() + 1;
 }
 
 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_;
 }
 

src/fsfw/cfdp/pdu/FileDirectiveReader.h

@@ -2,7 +2,7 @@
 #define FSFW_SRC_FSFW_CFDP_PDU_FILEDIRECTIVEDESERIALIZER_H_
 
 #include "../definitions.h"
-#include "fsfw/cfdp/pdu/HeaderReader.h"
+#include "fsfw/cfdp/pdu/PduHeaderReader.h"
 
 /**
  * @brief   This class is used to deserialize a PDU file directive header from raw memory.
@@ -11,7 +11,7 @@
  * This is a zero-copy implementation and #parseData needs to be called to ensure the data is
  * valid.
  */
-class FileDirectiveReader : public HeaderReader {
+class FileDirectiveReader : public PduHeaderReader {
  public:
   FileDirectiveReader(const uint8_t* pduBuf, size_t maxSize);
 
@@ -22,17 +22,16 @@ class FileDirectiveReader : public HeaderReader {
   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;
 };
 

src/fsfw/cfdp/pdu/FinishedPduCreator.cpp

@@ -1,25 +1,23 @@
-#include "FinishedPduSerializer.h"
+#include "FinishedPduCreator.h"
 
-FinishPduSerializer::FinishPduSerializer(PduConfig &conf, FinishedInfo &finishInfo)
-    : FileDirectiveCreator(conf, cfdp::FileDirectives::FINISH, 0), finishInfo(finishInfo) {
+FinishPduCreator::FinishPduCreator(PduConfig &conf, FinishedInfo &finishInfo)
+    : FileDirectiveCreator(conf, cfdp::FileDirective::FINISH, 0), finishInfo(finishInfo) {
   updateDirectiveFieldLen();
 }
 
-size_t FinishPduSerializer::getSerializedSize() const {
-  return FinishPduSerializer::getWholePduSize();
-}
+size_t FinishPduCreator::getSerializedSize() const { return FinishPduCreator::getWholePduSize(); }
 
-void FinishPduSerializer::updateDirectiveFieldLen() {
+void FinishPduCreator::updateDirectiveFieldLen() {
   setDirectiveDataFieldLen(finishInfo.getSerializedSize());
 }
 
-ReturnValue_t FinishPduSerializer::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
-                                             Endianness streamEndianness) const {
+ReturnValue_t FinishPduCreator::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) {
+  if (*size + 1 > maxSize) {
     return SerializeIF::BUFFER_TOO_SHORT;
   }
   **buffer = finishInfo.getConditionCode() << 4 | finishInfo.getDeliveryCode() << 2 |

src/fsfw/cfdp/pdu/FinishedPduCreator.h

@@ -0,0 +1,24 @@
+#ifndef FSFW_CFDP_PDU_FINISHEDPDUSERIALIZER_H_
+#define FSFW_CFDP_PDU_FINISHEDPDUSERIALIZER_H_
+
+#include "FinishedInfo.h"
+#include "fsfw/cfdp/pdu/FileDataCreator.h"
+#include "fsfw/cfdp/pdu/FileDirectiveCreator.h"
+
+class FinishPduCreator : public FileDirectiveCreator {
+ public:
+  FinishPduCreator(PduConfig& pduConf, FinishedInfo& finishInfo);
+
+  void updateDirectiveFieldLen();
+
+  [[nodiscard]] size_t getSerializedSize() const override;
+
+  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
+                          Endianness streamEndianness) const override;
+  using FileDirectiveCreator::serialize;
+
+ private:
+  FinishedInfo& finishInfo;
+};
+
+#endif /* FSFW_CFDP_PDU_FINISHEDPDUSERIALIZER_H_ */

src/fsfw/cfdp/pdu/FinishedPduReader.cpp

@@ -1,10 +1,9 @@
-#include "FinishedPduDeserializer.h"
+#include "FinishedPduReader.h"
 
-FinishPduDeserializer::FinishPduDeserializer(const uint8_t* pduBuf, size_t maxSize,
-                                             FinishedInfo& info)
+FinishPduReader::FinishPduReader(const uint8_t* pduBuf, size_t maxSize, FinishedInfo& info)
     : FileDirectiveReader(pduBuf, maxSize), finishedInfo(info) {}
 
-ReturnValue_t FinishPduDeserializer::parseData() {
+ReturnValue_t FinishPduReader::parseData() {
   ReturnValue_t result = FileDirectiveReader::parseData();
   if (result != returnvalue::OK) {
     return result;
@@ -29,17 +28,17 @@ ReturnValue_t FinishPduDeserializer::parseData() {
   return result;
 }
 
-FinishedInfo& FinishPduDeserializer::getInfo() { return finishedInfo; }
+FinishedInfo& FinishPduReader::getInfo() { return finishedInfo; }
 
-ReturnValue_t FinishPduDeserializer::parseTlvs(size_t remLen, size_t currentIdx, const uint8_t* buf,
-                                               cfdp::ConditionCode conditionCode) {
+ReturnValue_t FinishPduReader::parseTlvs(size_t remLen, size_t currentIdx, const uint8_t* buf,
+                                         cfdp::ConditionCode conditionCode) {
   ReturnValue_t result = returnvalue::OK;
   size_t fsResponsesIdx = 0;
   auto endianness = getEndianness();
   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
@@ -47,8 +46,8 @@ ReturnValue_t FinishPduDeserializer::parseTlvs(size_t remLen, size_t currentIdx,
     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;
@@ -64,7 +63,7 @@ ReturnValue_t FinishPduDeserializer::parseTlvs(size_t remLen, size_t currentIdx,
         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

src/fsfw/cfdp/pdu/FinishedPduReader.h

@@ -1,12 +1,12 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_FINISHEDPDUDESERIALIZER_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_FINISHEDPDUDESERIALIZER_H_
+#ifndef FSFW_CFDP_PDU_FINISHEDPDUDESERIALIZER_H_
+#define FSFW_CFDP_PDU_FINISHEDPDUDESERIALIZER_H_
 
 #include "fsfw/cfdp/pdu/FileDirectiveReader.h"
 #include "fsfw/cfdp/pdu/FinishedInfo.h"
 
-class FinishPduDeserializer : public FileDirectiveReader {
+class FinishPduReader : public FileDirectiveReader {
  public:
-  FinishPduDeserializer(const uint8_t* pduBuf, size_t maxSize, FinishedInfo& info);
+  FinishPduReader(const uint8_t* pduBuf, size_t maxSize, FinishedInfo& info);
 
   ReturnValue_t parseData() override;
 
@@ -19,4 +19,4 @@ class FinishPduDeserializer : public FileDirectiveReader {
                           cfdp::ConditionCode conditionCode);
 };
 
-#endif /* FSFW_SRC_FSFW_CFDP_PDU_FINISHEDPDUDESERIALIZER_H_ */
+#endif /* FSFW_CFDP_PDU_FINISHEDPDUDESERIALIZER_H_ */

src/fsfw/cfdp/pdu/FinishedPduSerializer.h

@@ -1,23 +0,0 @@
-#ifndef FSFW_SRC_FSFW_CFDP_PDU_FINISHEDPDUSERIALIZER_H_
-#define FSFW_SRC_FSFW_CFDP_PDU_FINISHEDPDUSERIALIZER_H_
-
-#include "FinishedInfo.h"
-#include "fsfw/cfdp/pdu/FileDataCreator.h"
-#include "fsfw/cfdp/pdu/FileDirectiveCreator.h"
-
-class FinishPduSerializer : public FileDirectiveCreator {
- public:
-  FinishPduSerializer(PduConfig& pduConf, FinishedInfo& finishInfo);
-
-  void updateDirectiveFieldLen();
-
-  size_t getSerializedSize() const override;
-
-  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
-                          Endianness streamEndianness) const override;
-
- private:
-  FinishedInfo& finishInfo;
-};
-
-#endif /* FSFW_SRC_FSFW_CFDP_PDU_FINISHEDPDUSERIALIZER_H_ */

src/fsfw/cfdp/pdu/HeaderCreator.cpp

@@ -75,7 +75,7 @@ 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; }
 

src/fsfw/cfdp/pdu/HeaderCreator.h

@@ -37,7 +37,7 @@ class HeaderCreator : public SerializeIF, public PduHeaderIF {
 
   [[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;

src/fsfw/cfdp/pdu/HeaderReader.cpp

@@ -1,12 +1,14 @@
-#include "HeaderReader.h"
-
 #include <fsfw/serialize/SerializeAdapter.h>
 
 #include <cstring>
 
-HeaderReader::HeaderReader(const uint8_t *pduBuf, size_t maxSize) { setData(pduBuf, maxSize); }
+#include "PduHeaderReader.h"
 
-ReturnValue_t HeaderReader::parseData() {
+PduHeaderReader::PduHeaderReader(const uint8_t *pduBuf, size_t maxSize) {
+  setReadOnlyData(pduBuf, maxSize);
+}
+
+ReturnValue_t PduHeaderReader::parseData() {
   if (pointers.rawPtr == nullptr) {
     return returnvalue::FAILED;
   }
@@ -20,10 +22,15 @@ ReturnValue_t HeaderReader::parseData() {
   cfdp::WidthInBytes widthSeqNum = getLenSeqNum();
   seqNumRaw = static_cast<uint8_t *>(sourceIdRaw) + static_cast<uint8_t>(widthEntityIds);
   destIdRaw = static_cast<uint8_t *>(seqNumRaw) + static_cast<uint8_t>(widthSeqNum);
+  if (getWholePduSize() > PduHeaderReader::getHeaderSize()) {
+    pointers.dataFieldStart = reinterpret_cast<const uint8_t *>(destIdRaw) + widthEntityIds;
+  } else {
+    pointers.dataFieldStart = nullptr;
+  }
   return returnvalue::OK;
 }
 
-ReturnValue_t HeaderReader::setData(uint8_t *dataPtr, size_t maxSize_, void *args) {
+ReturnValue_t PduHeaderReader::setData(uint8_t *dataPtr, size_t maxSize_, void *args) {
   if (dataPtr == nullptr) {
     return returnvalue::FAILED;
   }
@@ -35,68 +42,68 @@ ReturnValue_t HeaderReader::setData(uint8_t *dataPtr, size_t maxSize_, void *arg
   return returnvalue::OK;
 }
 
-size_t HeaderReader::getHeaderSize() const {
+size_t PduHeaderReader::getHeaderSize() const {
   if (pointers.fixedHeader != nullptr) {
     return getLenEntityIds() * 2 + getLenSeqNum() + 4;
   }
   return 0;
 }
 
-size_t HeaderReader::getPduDataFieldLen() const {
+size_t PduHeaderReader::getPduDataFieldLen() const {
   return (pointers.fixedHeader->pduDataFieldLenH << 8) | pointers.fixedHeader->pduDataFieldLenL;
 }
 
-size_t HeaderReader::getWholePduSize() const {
-  return getPduDataFieldLen() + HeaderReader::getHeaderSize();
+size_t PduHeaderReader::getWholePduSize() const {
+  return getPduDataFieldLen() + PduHeaderReader::getHeaderSize();
 }
 
-cfdp::PduType HeaderReader::getPduType() const {
+cfdp::PduType PduHeaderReader::getPduType() const {
   return static_cast<cfdp::PduType>((pointers.fixedHeader->firstByte >> 4) & 0x01);
 }
 
-cfdp::Direction HeaderReader::getDirection() const {
+cfdp::Direction PduHeaderReader::getDirection() const {
   return static_cast<cfdp::Direction>((pointers.fixedHeader->firstByte >> 3) & 0x01);
 }
 
-cfdp::TransmissionModes HeaderReader::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 HeaderReader::getCrcFlag() const { return (pointers.fixedHeader->firstByte >> 1) & 0x01; }
+bool PduHeaderReader::getCrcFlag() const { return (pointers.fixedHeader->firstByte >> 1) & 0x01; }
 
-bool HeaderReader::getLargeFileFlag() const { return pointers.fixedHeader->firstByte & 0x01; }
+bool PduHeaderReader::getLargeFileFlag() const { return pointers.fixedHeader->firstByte & 0x01; }
 
-cfdp::SegmentationControl HeaderReader::getSegmentationControl() const {
+cfdp::SegmentationControl PduHeaderReader::getSegmentationControl() const {
   return static_cast<cfdp::SegmentationControl>((pointers.fixedHeader->fourthByte >> 7) & 0x01);
 }
 
-cfdp::WidthInBytes HeaderReader::getLenEntityIds() const {
+cfdp::WidthInBytes PduHeaderReader::getLenEntityIds() const {
   return static_cast<cfdp::WidthInBytes>((pointers.fixedHeader->fourthByte >> 4) & 0x07);
 }
 
-cfdp::WidthInBytes HeaderReader::getLenSeqNum() const {
+cfdp::WidthInBytes PduHeaderReader::getLenSeqNum() const {
   return static_cast<cfdp::WidthInBytes>(pointers.fixedHeader->fourthByte & 0x07);
 }
 
-cfdp::SegmentMetadataFlag HeaderReader::getSegmentMetadataFlag() const {
+cfdp::SegmentMetadataFlag PduHeaderReader::getSegmentMetadataFlag() const {
   return static_cast<cfdp::SegmentMetadataFlag>((pointers.fixedHeader->fourthByte >> 3) & 0x01);
 }
 
-void HeaderReader::getSourceId(cfdp::EntityId &sourceId) const {
+void PduHeaderReader::getSourceId(cfdp::EntityId &sourceId) const {
   assignVarLenField(dynamic_cast<cfdp::VarLenField *>(&sourceId), getLenEntityIds(),
                     this->sourceIdRaw);
 }
 
-void HeaderReader::getDestId(cfdp::EntityId &destId) const {
+void PduHeaderReader::getDestId(cfdp::EntityId &destId) const {
   assignVarLenField(dynamic_cast<cfdp::VarLenField *>(&destId), getLenEntityIds(), this->destIdRaw);
 }
 
-void HeaderReader::getTransactionSeqNum(cfdp::TransactionSeqNum &seqNum) const {
+void PduHeaderReader::getTransactionSeqNum(cfdp::TransactionSeqNum &seqNum) const {
   assignVarLenField(dynamic_cast<cfdp::VarLenField *>(&seqNum), getLenSeqNum(), this->seqNumRaw);
 }
 
-void HeaderReader::assignVarLenField(cfdp::VarLenField *field, cfdp::WidthInBytes width,
-                                     void *sourcePtr) const {
+void PduHeaderReader::assignVarLenField(cfdp::VarLenField *field, cfdp::WidthInBytes width,
+                                        void *sourcePtr) const {
   switch (width) {
     case (cfdp::WidthInBytes::ONE_BYTE): {
       auto *fieldTyped = static_cast<uint8_t *>(sourcePtr);
@@ -122,25 +129,25 @@ void HeaderReader::assignVarLenField(cfdp::VarLenField *field, cfdp::WidthInByte
   }
 }
 
-size_t HeaderReader::getMaxSize() const { return maxSize; }
+size_t PduHeaderReader::getMaxSize() const { return maxSize; }
 
-bool HeaderReader::hasSegmentMetadataFlag() const {
+bool PduHeaderReader::hasSegmentMetadataFlag() const {
   if (this->getSegmentMetadataFlag() == cfdp::SegmentMetadataFlag::PRESENT) {
     return true;
   }
   return false;
 }
 
-ReturnValue_t HeaderReader::setData(const uint8_t *dataPtr, size_t maxSize_) {
+ReturnValue_t PduHeaderReader::setReadOnlyData(const uint8_t *dataPtr, size_t maxSize_) {
   return setData(const_cast<uint8_t *>(dataPtr), maxSize_, nullptr);
 }
-bool HeaderReader::isNull() const {
+bool PduHeaderReader::isNull() const {
   return pointers.rawPtr == nullptr or pointers.fixedHeader == nullptr;
 }
 
-HeaderReader::operator bool() const { return not isNull(); }
+PduHeaderReader::operator bool() const { return not isNull(); }
 
-void HeaderReader::fillConfig(PduConfig &cfg) const {
+void PduHeaderReader::fillConfig(PduConfig &cfg) const {
   cfg.largeFile = getLargeFileFlag();
   cfg.crcFlag = getCrcFlag();
   cfg.mode = getTransmissionMode();
@@ -149,3 +156,5 @@ void HeaderReader::fillConfig(PduConfig &cfg) const {
   getSourceId(cfg.sourceId);
   getDestId(cfg.destId);
 }
+
+const uint8_t *PduHeaderReader::getPduDataField() const { return pointers.dataFieldStart; }

src/fsfw/cfdp/pdu/KeepAlivePduCreator.cpp

@@ -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);
+}

src/fsfw/cfdp/pdu/KeepAlivePduCreator.h

@@ -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_ */

src/fsfw/cfdp/pdu/KeepAlivePduDeserializer.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_ */

src/fsfw/cfdp/pdu/KeepAlivePduReader.cpp

@@ -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; }

src/fsfw/cfdp/pdu/KeepAlivePduReader.h

@@ -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_ */

src/fsfw/cfdp/pdu/KeepAlivePduSerializer.cpp

@@ -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);
-}

src/fsfw/cfdp/pdu/KeepAlivePduSerializer.h

@@ -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_ */

src/fsfw/cfdp/pdu/MetadataPduCreator.cpp

@@ -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();
 }
 

src/fsfw/cfdp/pdu/MetadataPduCreator.h

@@ -14,6 +14,7 @@ class MetadataPduCreator : public FileDirectiveCreator {
 
   ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                           Endianness streamEndianness) const override;
+  using FileDirectiveCreator::serialize;
 
  private:
   MetadataInfo& info;

src/fsfw/cfdp/pdu/NakPduCreator.cpp

@@ -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;

src/fsfw/cfdp/pdu/NakPduCreator.h

@@ -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_ */

src/fsfw/cfdp/pdu/NakPduDeserializer.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_ */

src/fsfw/cfdp/pdu/NakPduReader.cpp

@@ -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;

src/fsfw/cfdp/pdu/NakPduReader.h

@@ -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_ */

src/fsfw/cfdp/pdu/PduConfig.cpp

@@ -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),

src/fsfw/cfdp/pdu/PduConfig.h

@@ -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;

src/fsfw/cfdp/pdu/PduHeaderIF.h

@@ -19,7 +19,7 @@ class PduHeaderIF {
   [[nodiscard]] virtual size_t getPduDataFieldLen() 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;

src/fsfw/cfdp/pdu/PduHeaderReader.h

@@ -23,16 +23,16 @@ struct PduHeaderFixedStruct {
  * This is a zero-copy implementation and #parseData needs to be called to ensure the data is
  * valid.
  */
-class HeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
+class PduHeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
  public:
-  HeaderReader() = default;
+  PduHeaderReader() = default;
   /**
    * Initialize a PDU header from raw data. This is a zero-copy implementation and #parseData
    * needs to be called to ensure the data is valid
    * @param pduBuf
    * @param maxSize
    */
-  HeaderReader(const uint8_t* pduBuf, size_t maxSize);
+  PduHeaderReader(const uint8_t* pduBuf, size_t maxSize);
 
   /**
    * This needs to be called before accessing the PDU fields to avoid segmentation faults.
@@ -58,7 +58,7 @@ class HeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
 
   [[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;
@@ -74,6 +74,7 @@ class HeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
   ReturnValue_t deserResult = returnvalue::OK;
 
   [[nodiscard]] size_t getMaxSize() const;
+  [[nodiscard]] const uint8_t* getPduDataField() const;
 
   /**
    * Can also be used to reset the pointer to a nullptr, but the getter functions will not
@@ -83,11 +84,12 @@ class HeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
    * @param args
    * @return
    */
-  ReturnValue_t setData(const uint8_t* dataPtr, size_t maxSize);
+  ReturnValue_t setReadOnlyData(const uint8_t* dataPtr, size_t maxSize);
 
  protected:
   struct Pointers {
     PduHeaderFixedStruct* fixedHeader = nullptr;
+    const uint8_t* dataFieldStart = nullptr;
     const uint8_t* rawPtr = nullptr;
   };
 
@@ -96,8 +98,7 @@ class HeaderReader : public RedirectableDataPointerIF, public PduHeaderIF {
 
  private:
   /**
-   * Can also be used to reset the pointer to a nullptr, but the getter functions will not
-   * perform nullptr checks!
+   * This is a reader class and setting mutable data is forbidden. Use @setReadOnlyData instead.
    * @param dataPtr
    * @param maxSize
    * @param args

src/fsfw/cfdp/pdu/PromptPduCreator.cpp

@@ -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;
+}

src/fsfw/cfdp/pdu/PromptPduCreator.h

@@ -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;
 

src/fsfw/cfdp/pdu/PromptPduReader.cpp

@@ -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;

src/fsfw/cfdp/pdu/PromptPduReader.h

@@ -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;

src/fsfw/cfdp/pdu/PromptPduSerializer.cpp

@@ -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;
-}

src/fsfw/cfdp/tlv/EntityIdTlv.cpp

@@ -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; }

src/fsfw/cfdp/tlv/EntityIdTlv.h

@@ -27,7 +27,7 @@ class EntityIdTlv : public TlvIF {
                             Endianness streamEndianness) override;
 
   uint8_t getLengthField() const override;
-  cfdp::TlvTypes getType() const override;
+  cfdp::TlvType getType() const override;
 
   cfdp::EntityId& getEntityId();
 

src/fsfw/cfdp/tlv/FaultHandlerOverrideTlv.cpp

@@ -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; }

src/fsfw/cfdp/tlv/FaultHandlerOverrideTlv.h

@@ -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_ */

src/fsfw/cfdp/tlv/FilestoreRequestTlv.cpp

@@ -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; }

src/fsfw/cfdp/tlv/FilestoreRequestTlv.h

@@ -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;

src/fsfw/cfdp/tlv/FilestoreResponseTlv.cpp

@@ -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; }

src/fsfw/cfdp/tlv/FilestoreResponseTlv.h

@@ -33,7 +33,7 @@ class FilestoreResponseTlv : 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:
   uint8_t statusCode;

src/fsfw/cfdp/tlv/FilestoreTlvBase.h

@@ -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;
     }

src/fsfw/cfdp/tlv/FlowLabelTlv.cpp

@@ -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) {}