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

fixed linux example

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

1
bsp_hosted/main.cpp
View File

@ -39,7 +39,6 @@ int main() {
ObjectManager* objManager = ObjectManager::instance(); ObjectManager* objManager = ObjectManager::instance();
objManager->setObjectFactoryFunction(ObjectFactory::produce, nullptr); 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;
sif::info << "Initializing objects.." << std::endl; sif::info << "Initializing objects.." << std::endl;

4
bsp_linux/core/InitMission.cpp
View File

@ -1,5 +1,5 @@
#include "InitMission.h" #include "InitMission.h"
#include <OBSWConfig.h> #include "OBSWConfig.h"
#include <bsp_linux/fsfwconfig/objects/systemObjectList.h> #include <bsp_linux/fsfwconfig/objects/systemObjectList.h>
#include <bsp_linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h> #include <bsp_linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h>
@ -216,7 +216,7 @@ void InitMission::createTasks() {
#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;
} }

2
bsp_linux/core/ObjectFactory.cpp
View File

@ -20,7 +20,7 @@
#include <fsfw/osal/common/UdpTmTcBridge.h> #include <fsfw/osal/common/UdpTmTcBridge.h>
void ObjectFactory::produce() { void ObjectFactory::produce(void* args) {
/* Located inside the GenericFactory source file */ /* Located inside the GenericFactory source file */
Factory::setStaticFrameworkObjectIds(); Factory::setStaticFrameworkObjectIds();

2
bsp_linux/core/ObjectFactory.h
View File

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

5
bsp_linux/main.cpp
View File

@ -39,7 +39,8 @@ 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;
@ -48,7 +49,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;

2
fsfw

@ -1 +1 @@
Subproject commit 50fac22f54031e409306931e15d2e63426aa03b2 Subproject commit 145dd33fb1e467ef7370ccd44671a91d96c60e26