fsfw/fsfw-example-common
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add CFDP_DISTRIB and CFDP_HANDLER obj IDs

Browse Source
This commit is contained in:
Robin Müller 2022-09-08 16:26:23 +02:00
parent bf36e7f8f9
commit a36d951209
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/commonObjects.h
View File

@ -25,6 +25,8 @@ enum commonObjects : object_id_t {
CCSDS_DISTRIBUTOR = 0x63000000, CCSDS_DISTRIBUTOR = 0x63000000,
PUS_DISTRIBUTOR = 0x63000001, PUS_DISTRIBUTOR = 0x63000001,
TM_FUNNEL = 0x63000002, TM_FUNNEL = 0x63000002,
CFDP_DISTRIBUTOR = 0x63000003,
CFDP_HANDLER = 0x63000004,
/* 0x74 ('t') for test and example objects */ /* 0x74 ('t') for test and example objects */
TEST_TASK = 0x7400CAFE, TEST_TASK = 0x7400CAFE,

1
config/commonPollingSequenceFactory.cpp
View File

@ -1,5 +1,4 @@
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <fsfw/tasks/FixedTimeslotTaskIF.h> #include <fsfw/tasks/FixedTimeslotTaskIF.h>
#include "example/test/FsfwExampleTask.h" #include "example/test/FsfwExampleTask.h"

4
example/core/GenericFactory.cpp
View File

@ -34,7 +34,7 @@
#include "objects/systemObjectList.h" #include "objects/systemObjectList.h"
#include "tmtc/apid.h" #include "tmtc/apid.h"
void ObjectFactory::produceGenericObjects() { void ObjectFactory::produceGenericObjects(TmFunnel **tmFunnel) {
#if OBSW_ADD_CORE_COMPONENTS == 1 #if OBSW_ADD_CORE_COMPONENTS == 1
/* Framework objects */ /* Framework objects */
new EventManager(objects::EVENT_MANAGER); new EventManager(objects::EVENT_MANAGER);
@ -44,7 +44,7 @@ void ObjectFactory::produceGenericObjects() {
new VerificationReporter(); new VerificationReporter();
auto *ccsdsDistrib = new CcsdsDistributor(apid::APID, objects::CCSDS_DISTRIBUTOR); auto *ccsdsDistrib = new CcsdsDistributor(apid::APID, objects::CCSDS_DISTRIBUTOR);
new PusDistributor(apid::APID, objects::PUS_DISTRIBUTOR, ccsdsDistrib); new PusDistributor(apid::APID, objects::PUS_DISTRIBUTOR, ccsdsDistrib);
new TmFunnel(*stamperAndReader, objects::TM_FUNNEL); *tmFunnel = new TmFunnel(*stamperAndReader, objects::TM_FUNNEL);
#endif /* OBSW_ADD_CORE_COMPONENTS == 1 */ #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
/* PUS stack */ /* PUS stack */

4
example/core/GenericFactory.h
View File

@ -3,13 +3,15 @@
#include <fsfw/objectmanager/SystemObjectIF.h> #include <fsfw/objectmanager/SystemObjectIF.h>
class TmFunnel;
namespace ObjectFactory { namespace ObjectFactory {
/** /**
* @brief Produce hardware independant objects. Called by bsp specific * @brief Produce hardware independant objects. Called by bsp specific
* object factory. * object factory.
*/ */
void produceGenericObjects(); void produceGenericObjects(TmFunnel** funnel);
} // namespace ObjectFactory } // namespace ObjectFactory