eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 4 Pull Requests 2 Releases 119 Wiki Activity

Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler

Browse Source
This commit is contained in:
Jakob Meier 2020-12-27 17:07:37 +01:00
commit cb01bcd97d
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp_linux/InitMission.cpp
View File

@ -4,7 +4,6 @@
#include <fsfw/objectmanager/ObjectManagerIF.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
#include <fsfw/datapool/DataPool.h>
#include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/tasks/FixedTimeslotTaskIF.h>
#include <fsfw/tasks/PeriodicTaskIF.h>
@ -30,9 +29,6 @@ ServiceInterfaceStream sif::error("ERROR", true, false, true);
ObjectManagerIF *objectManager = nullptr;
//Initialize Data Pool
DataPool dataPool(nullptr);
void InitMission::initMission() {
sif::info << "Building global objects.." << std::endl;
/* Instantiate global object manager and also create all objects */

5
fsfwconfig/cdatapool/dataPoolInit.cpp
View File

@ -1,5 +0,0 @@
#include <fsfwconfig/cdatapool/dataPoolInit.h>
void datapool::dataPoolInit(std::map<uint32_t, PoolEntryIF*>* poolMap) {
}

13
fsfwconfig/cdatapool/dataPoolInit.h
View File

@ -1,13 +0,0 @@
#ifndef FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_
#define FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_
#include <fsfw/datapool/DataPool.h>
namespace datapool{
void dataPoolInit(std::map<uint32_t, PoolEntryIF*>* poolMap);
enum datapoolvariables {
NO_PARAMETER = 0,
};
}
#endif /* FSFWCONFIG_CDATAPOOL_DATAPOOLINIT_H_ */