Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler
This commit is contained in:
commit
cb01bcd97d
@ -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 */
|
||||
|
@ -1,5 +0,0 @@
|
||||
#include <fsfwconfig/cdatapool/dataPoolInit.h>
|
||||
|
||||
void datapool::dataPoolInit(std::map<uint32_t, PoolEntryIF*>* poolMap) {
|
||||
|
||||
}
|
@ -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_ */
|
Loading…
Reference in New Issue
Block a user