Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack-with-retval-refactoring

src/fsfw_tests/integration/assemblies/TestAssembly.h

@@ -22,7 +22,7 @@ class TestAssembly : public AssemblyBase {
    * @param mode
    * @param submode
    * @return
-   *    - @c RETURN_OK if ok
+   *    - @c returnvalue::OK if ok
    *    - @c NEED_SECOND_STEP if children need to be commanded again
    */
   ReturnValue_t commandChildren(Mode_t mode, Submode_t submode) override;

src/fsfw_tests/integration/devices/TestDeviceHandler.cpp

@@ -645,13 +645,8 @@ ReturnValue_t TestDevice::initializeLocalDataPool(localpool::DataPool& localData
   sid_t sid(this->getObjectId(), td::TEST_SET_ID);
   /* Subscribe for periodic HK packets but do not enable reporting for now.
   Non-diangostic with a period of one second */
-<<<<<<< HEAD
-  poolManager.subscribeForRegularPeriodicPacket(subdp::RegularHkPeriodicParams(sid, false, 1.0));
+  poolManager.subscribeForRegularPeriodicPacket({sid, false, 1.0});
   return HasReturnvaluesIF::RETURN_OK;
-=======
-  poolManager.subscribeForPeriodicPacket(sid, false, 1.0, false);
-  return returnvalue::OK;
->>>>>>> mueller/expand-retval-if
 }
 
 ReturnValue_t TestDevice::getParameter(uint8_t domainId, uint8_t uniqueId,

src/fsfw_tests/integration/task/TestTask.h

@@ -11,7 +11,7 @@
  * @details
  * Should not be used for board specific tests. Instead, a derived board test class should be used.
  */
-class TestTask : public SystemObject, public ExecutableObjectIF, public HasReturnvaluesIF {
+class TestTask : public SystemObject, public ExecutableObjectIF {
  public:
   explicit TestTask(object_id_t objectId);
   ~TestTask() override;

src/fsfw_tests/internal/InternalUnitTester.h

@@ -2,7 +2,7 @@
 #define FRAMEWORK_TEST_UNITTESTCLASS_H_
 
 #include "UnittDefinitions.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @brief	Can be used for internal testing, for example for hardware specific

src/fsfw_tests/internal/UnittDefinitions.h

@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <string>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
 namespace tv {

src/fsfw_tests/internal/serialize/IntTestSerialization.h

@@ -3,7 +3,7 @@
 
 #include <array>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 namespace testserialize {
 ReturnValue_t test_serialization();