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

This commit is contained in:
2022-08-22 15:57:22 +02:00
163 changed files with 397 additions and 569 deletions

View File

@ -1,7 +1,7 @@
#ifndef FSFW_OBJECTMANAGER_OBJECTMANAGERIF_H_
#define FSFW_OBJECTMANAGER_OBJECTMANAGERIF_H_
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../returnvalues/returnvalue.h"
#include "../serviceinterface/ServiceInterface.h"
#include "SystemObjectIF.h"
#include "frameworkObjects.h"
@ -48,14 +48,14 @@ class ObjectManagerIF {
* @param id The new id to be added to the list.
* @param object A pointer to the object to be added.
* @return @li INSERTION_FAILED in case the object could not be inserted.
* @li RETURN_OK in case the object was successfully inserted
* @li returnvalue::OK in case the object was successfully inserted
*/
virtual ReturnValue_t insert(object_id_t id, SystemObjectIF* object) = 0;
/**
* @brief With this call, an object is removed from the list.
* @param id The object id of the object to be removed.
* @return @li NOT_FOUND in case the object was not found
* @li RETURN_OK in case the object was successfully removed
* @li returnvalue::OK in case the object was successfully removed
*/
virtual ReturnValue_t remove(object_id_t id) = 0;
virtual void initialize() = 0;

View File

@ -4,7 +4,7 @@
#include <cstdint>
#include "../events/EventReportingProxyIF.h"
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../returnvalues/returnvalue.h"
/**
* @defgroup system_objects Software System Object Management
* The classes to create System Objects and classes to manage these are
@ -45,8 +45,8 @@ class SystemObjectIF : public EventReportingProxyIF {
* which might not have been built yet.
* Therefore, a two-step initialization resolves this problem and prevents
* circular dependencies of not-fully initialized objects on start up.
* @return - @c RETURN_OK in case the initialization was successful
* - @c returnvalue::FAILED otherwise
* @return - @c returnvalue::OK in case the initialization was successful
* - @c returnvalue::FAILED otherwise
*/
virtual ReturnValue_t initialize() = 0;
/**
@ -54,7 +54,7 @@ class SystemObjectIF : public EventReportingProxyIF {
* for operation.
* Some objects need certain other objects (or a certain number), to be
* registered as children. These checks can be done in this method.
* @return - @c RETURN_OK in case the check was successful
* @return - @c returnvalue::OK in case the check was successful
* - @c any other code otherwise
*/
virtual ReturnValue_t checkObjectConnections() = 0;