KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

Update to current FSFW status

Browse Source
This commit is contained in:
petriVM18
2020-09-16 07:04:33 +02:00
parent 86f2004569 42bfedd36c
commit bdec426196
442 changed files with 11808 additions and 4922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
objectmanager/ObjectManager.cpp
View File

@ -1,5 +1,5 @@
#include <framework/objectmanager/ObjectManager.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
#include "ObjectManager.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
#include <iomanip>
#include <cstdlib>
#include <iomanip>
@ -101,7 +101,6 @@ void ObjectManager::initialize() {
}
void ObjectManager::printList() {
std::map<object_id_t, SystemObjectIF*>::iterator it;
sif::debug << "ObjectManager: Object List contains:" << std::endl;
for (auto const& it : objectList) {
sif::debug << std::hex << it.first << " | " << it.second << std::endl;

4
objectmanager/ObjectManager.h
View File

@ -8,8 +8,8 @@
#ifndef OBJECTMANAGER_H_
#define OBJECTMANAGER_H_
#include <framework/objectmanager/ObjectManagerIF.h>
#include <framework/objectmanager/SystemObjectIF.h>
#include "ObjectManagerIF.h"
#include "SystemObjectIF.h"
#include <map>
/**

11
objectmanager/ObjectManagerIF.h
View File

@ -1,10 +1,10 @@
#ifndef FRAMEWORK_OBJECTMANAGER_OBJECTMANAGERIF_H_
#define FRAMEWORK_OBJECTMANAGER_OBJECTMANAGERIF_H_
#include <framework/objectmanager/frameworkObjects.h>
#include <framework/objectmanager/SystemObjectIF.h>
#include <framework/returnvalues/HasReturnvaluesIF.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
#include "frameworkObjects.h"
#include "SystemObjectIF.h"
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
/**
* @brief This class provides an interface to the global object manager.
@ -21,7 +21,8 @@ public:
static constexpr uint8_t INTERFACE_ID = CLASS_ID::OBJECT_MANAGER_IF;
static constexpr ReturnValue_t INSERTION_FAILED = MAKE_RETURN_CODE( 1 );
static constexpr ReturnValue_t NOT_FOUND = MAKE_RETURN_CODE( 2 );
static constexpr ReturnValue_t CHILD_INIT_FAILED = MAKE_RETURN_CODE( 3 );
static constexpr ReturnValue_t CHILD_INIT_FAILED = MAKE_RETURN_CODE( 3 ); //!< Can be used if the initialization of a SystemObject failed.
static constexpr ReturnValue_t INTERNAL_ERR_REPORTER_UNINIT = MAKE_RETURN_CODE( 4 );
protected:

6
objectmanager/SystemObject.cpp
View File

@ -1,6 +1,6 @@
#include <framework/events/EventManagerIF.h>
#include <framework/objectmanager/ObjectManager.h>
#include <framework/objectmanager/SystemObject.h>
#include "../events/EventManagerIF.h"
#include "ObjectManager.h"
#include "SystemObject.h"
SystemObject::SystemObject(object_id_t setObjectId, bool doRegister) :
objectId(setObjectId), registered(doRegister) {

8
objectmanager/SystemObject.h
View File

@ -8,10 +8,10 @@
#ifndef SYSTEMOBJECT_H_
#define SYSTEMOBJECT_H_
#include <framework/events/Event.h>
#include <framework/events/EventReportingProxyIF.h>
#include <framework/objectmanager/SystemObjectIF.h>
#include <framework/timemanager/Clock.h>
#include "../events/Event.h"
#include "../events/EventReportingProxyIF.h"
#include "SystemObjectIF.h"
#include "../timemanager/Clock.h"
/**
* @brief This class automates insertion into the ObjectManager and

4
objectmanager/SystemObjectIF.h
View File

@ -8,8 +8,8 @@
#ifndef SYSTEMOBJECTIF_H_
#define SYSTEMOBJECTIF_H_
#include <framework/events/EventReportingProxyIF.h>
#include <framework/returnvalues/HasReturnvaluesIF.h>
#include "../events/EventReportingProxyIF.h"
#include "../returnvalues/HasReturnvaluesIF.h"
#include <stdint.h>
/**
* \defgroup system_objects Software System Object Management