fsfw/fsfw-example-hosted
fsfw/fsfw-example-hosted
12
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge branch 'mueller/example-code-as-test' into mueller/master

Browse Source
This commit is contained in:
Robin Müller 2021-11-19 14:02:35 +01:00
commit af98399f14
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bsp_hosted/core/InitMission.cpp
View File

@ -3,16 +3,17 @@
#include <bsp_hosted/core/InitMission.h> #include <bsp_hosted/core/InitMission.h>
#include <bsp_hosted/fsfwconfig/objects/systemObjectList.h> #include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
#include <bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.h> #include <bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.h>
#include "example/utility/TaskCreation.h"
#include "fsfw_tests/integration/assemblies/TestAssembly.h"
#include <fsfw/modes/HasModesIF.h> #include <fsfw/modes/HasModesIF.h>
#include <mission/utility/TaskCreation.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
#include <fsfw/tasks/FixedTimeslotTaskIF.h> #include <fsfw/tasks/FixedTimeslotTaskIF.h>
#include <fsfw/tasks/PeriodicTaskIF.h> #include <fsfw/tasks/PeriodicTaskIF.h>
#include <fsfw/tasks/TaskFactory.h> #include <fsfw/tasks/TaskFactory.h>
#include <mission/assemblies/TestAssembly.h>
#ifdef _WIN32 #ifdef _WIN32
#include <fsfw/osal/windows/winTaskHelpers.h> #include <fsfw/osal/windows/winTaskHelpers.h>

6
bsp_hosted/core/ObjectFactory.cpp
View File

@ -4,10 +4,10 @@
#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>
#include <test/TestTask.h> #include "fsfw_tests/integration/task/TestTask.h"
#include <mission/utility/TmFunnel.h> #include "example/utility/TmFunnel.h"
#include <mission/core/GenericFactory.h> #include "example/core/GenericFactory.h"
#include <fsfw/monitoring/MonitoringMessageContent.h> #include <fsfw/monitoring/MonitoringMessageContent.h>
#include <fsfw/storagemanager/PoolManager.h> #include <fsfw/storagemanager/PoolManager.h>

7
bsp_hosted/main.cpp
View File

@ -1,9 +1,8 @@
#include <bsp_hosted/core/InitMission.h> #include <bsp_hosted/core/InitMission.h>
#include <bsp_hosted/core/ObjectFactory.h> #include <bsp_hosted/core/ObjectFactory.h>
#include <test/MutexExample.h> #include "example/test/MutexExample.h"
#include <utility/utility.h> #include "example/utility/utility.h"
#include <mission/utility/PusPacketCreator.h>
#include <fsfw/platform.h> #include <fsfw/platform.h>
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
@ -58,7 +57,7 @@ int main() {
InitMission::createTasks(); InitMission::createTasks();
MutexExample::example(); MutexExample::example();
PusPacketCreator::createPusPacketAndPrint(); //PusPacketCreator::createPusPacketAndPrint();
/* Permanent loop. */ /* Permanent loop. */
for(;;) { for(;;) {

2
example_common

@ -1 +1 @@
Subproject commit a0d775e086c9fa0506ad656c5e2d863f8f8e7f9b Subproject commit cf97d690fe34fc66436d8f32de0b8c893f3c56e8