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

fixes hosted build

Browse Source
This commit is contained in:
Robin Müller 2021-06-05 20:23:38 +02:00
parent 0747db41ff
commit 9a491fc7dd
No known key found for this signature in database
GPG Key ID: BE6480244DFE612C
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_hosted/core/InitMission.cpp
View File

@ -283,7 +283,7 @@ void InitMission::createTasks() {
#endif #endif
#if OBSW_ADD_DEVICE_HANDLER_DEMO #if OBSW_ADD_DEVICE_HANDLER_DEMO
HasModesIF* assembly = objectManager->get<HasModesIF>(objects::TEST_ASSEMBLY); HasModesIF* assembly = ObjectManager::instance()->get<HasModesIF>(objects::TEST_ASSEMBLY);
if (assembly == nullptr){ if (assembly == nullptr){
return; return;
} }

8
bsp_hosted/core/ObjectFactory.cpp
View File

@ -1,8 +1,6 @@
#include <OBSWConfig.h> #include "ObjectFactory.h"
#include "OBSWConfig.h"
#include <bsp_hosted/core/ObjectFactory.h>
#include <bsp_hosted/fsfwconfig/objects/systemObjectList.h> #include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
#include <bsp_hosted/fsfwconfig/OBSWConfig.h>
#include <bsp_hosted/fsfwconfig/tmtc/apid.h> #include <bsp_hosted/fsfwconfig/tmtc/apid.h>
#include <bsp_hosted/fsfwconfig/tmtc/pusIds.h> #include <bsp_hosted/fsfwconfig/tmtc/pusIds.h>
@ -21,7 +19,7 @@
#include <fsfw/osal/common/UdpTcPollingTask.h> #include <fsfw/osal/common/UdpTcPollingTask.h>
#include <fsfw/osal/common/UdpTmTcBridge.h> #include <fsfw/osal/common/UdpTmTcBridge.h>
void ObjectFactory::produce(){ void ObjectFactory::produce(void* args) {
Factory::setStaticFrameworkObjectIds(); Factory::setStaticFrameworkObjectIds();
#if OBSW_ADD_CORE_COMPONENTS == 1 #if OBSW_ADD_CORE_COMPONENTS == 1

2
bsp_hosted/core/ObjectFactory.h
View File

@ -4,7 +4,7 @@
namespace ObjectFactory { namespace ObjectFactory {
void setStatics(); void setStatics();
void produce(); void produce(void* args);
}; };

2
bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.h
View File

@ -1,7 +1,7 @@
#ifndef POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_ #ifndef POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_
#define POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_ #define POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_
#include <bsp_hosted/fsfwconfig/OBSWConfig.h> #include "OBSWConfig.h"
#include <fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/returnvalues/HasReturnvaluesIF.h>
class FixedTimeslotTaskIF; class FixedTimeslotTaskIF;

8
bsp_hosted/main.cpp
View File

@ -26,8 +26,6 @@ ServiceInterfaceStream sif::warning("WARNING", false);
ServiceInterfaceStream sif::error("ERROR", false, true, true); ServiceInterfaceStream sif::error("ERROR", false, true, true);
#endif #endif
ObjectManagerIF *objectManager = nullptr;
int main() { int main() {
utility::commonInitPrint("Hosted", COMPILE_PRINTOUT); utility::commonInitPrint("Hosted", COMPILE_PRINTOUT);
@ -38,7 +36,9 @@ int main() {
sif::printInfo("Producing system objects..\n"); sif::printInfo("Producing system objects..\n");
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
objectManager = new ObjectManager(ObjectFactory::produce); ObjectManager* objManager = ObjectManager::instance();
objManager->setObjectFactoryFunction(ObjectFactory::produce, nullptr);
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << "Objects created successfully.." << std::endl; sif::info << "Objects created successfully.." << std::endl;
@ -47,7 +47,7 @@ int main() {
sif::printInfo("Objects created successfully..\n"); sif::printInfo("Objects created successfully..\n");
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
objectManager->initialize(); objManager->initialize();
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << "Creating tasks.." << std::endl; sif::info << "Creating tasks.." << std::endl;