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

12
test/FsfwExampleTask.cpp
View File

@ -1,9 +1,10 @@
#include "FsfwExampleTask.h"
#include <OBSWConfig.h>
#include <commonSystemObjects.h>
#include <objects/systemObjectList.h>
#include "OBSWConfig.h"
#include "commonSystemObjects.h"
#include "objects/systemObjectList.h"
#include <fsfw/serviceinterface/ServiceInterface.h>
#include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/tasks/TaskFactory.h>
#include <fsfw/ipc/QueueFactory.h>
#include <fsfw/ipc/CommandMessage.h>
@ -83,8 +84,7 @@ object_id_t FsfwExampleTask::getSender() {
ReturnValue_t FsfwExampleTask::initialize() {
// Get the dataset of the sender. Will be cached for later checks.
object_id_t sender = getSender();
HasLocalDataPoolIF* senderIF =
objectManager->get<HasLocalDataPoolIF>(sender);
HasLocalDataPoolIF* senderIF = ObjectManager::instance()->get<HasLocalDataPoolIF>(sender);
if(senderIF == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "FsfwDemoTask::initialize: Sender object invalid!" << std::endl;
@ -163,7 +163,7 @@ ReturnValue_t FsfwExampleTask::performMonitoringDemo() {
ReturnValue_t FsfwExampleTask::performSendOperation() {
object_id_t nextRecipient = getNextRecipient();
FsfwExampleTask* target = objectManager->get<FsfwExampleTask>(nextRecipient);
FsfwExampleTask* target = ObjectManager::instance()->get<FsfwExampleTask>(nextRecipient);
if (target == nullptr) {
/* Configuration error */
#if FSFW_CPP_OSTREAM_ENABLED == 1

4
test/TestTask.cpp
View File

@ -1,6 +1,6 @@
#include "TestTask.h"
#include <fsfw/objectmanager/ObjectManagerIF.h>
#include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/serviceinterface/ServiceInterface.h>
bool TestTask::oneShotAction = true;
@ -12,7 +12,7 @@ TestTask::TestTask(object_id_t objectId, bool periodicPrintout):
if(testLock == nullptr) {
testLock = MutexFactory::instance()->createMutex();
}
IPCStore = objectManager->get<StorageManagerIF>(objects::IPC_STORE);
IPCStore = ObjectManager::instance()->get<StorageManagerIF>(objects::IPC_STORE);
}
TestTask::~TestTask() {