eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
Robin Müller
2022-08-22 15:57:22 +02:00
parent dab1b1d067 8c8d1cfa84
commit 10f34e5a48
163 changed files with 397 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw_tests/integration/assemblies/TestAssembly.h
View File

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

7
src/fsfw_tests/integration/devices/TestDeviceHandler.cpp
View File

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

2
src/fsfw_tests/integration/task/TestTask.h
View File

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