fsfw/fsfw_example_public
Archived
13
1
Fork 1
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

obj factory is singleton now

Browse Source
This commit is contained in:
Robin Müller
2021-06-05 20:16:57 +02:00
parent dfc2e6bf67
commit 0747db41ff
11 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mission/controller/TestController.cpp
View File

@ -1,7 +1,8 @@
#include "TestController.h"
#include <OBSWConfig.h>
#include "OBSWConfig.h"
#include <fsfw/datapool/PoolReadGuard.h>
#include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/serviceinterface/ServiceInterface.h>
TestController::TestController(object_id_t objectId, size_t commandQueueDepth):
@ -161,7 +162,7 @@ ReturnValue_t TestController::initializeLocalDataPool(localpool::DataPool &local
ReturnValue_t TestController::initializeAfterTaskCreation() {
namespace td = testdevice;
HasLocalDataPoolIF* device0 = objectManager->get<HasLocalDataPoolIF>(
HasLocalDataPoolIF* device0 = ObjectManager::instance()->get<HasLocalDataPoolIF>(
objects::TEST_DEVICE_HANDLER_0);
if(device0 == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
@ -183,7 +184,7 @@ ReturnValue_t TestController::initializeAfterTaskCreation() {
}
HasLocalDataPoolIF* device1 = objectManager->get<HasLocalDataPoolIF>(
HasLocalDataPoolIF* device1 = ObjectManager::instance()->get<HasLocalDataPoolIF>(
objects::TEST_DEVICE_HANDLER_1);
if(device1 == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1