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

new CFDP and PUS TM funnel

Browse Source
This commit is contained in:
Robin Müller 2022-10-17 16:28:03 +02:00
parent 45c1ba70e3
commit 5f59186ace
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp_hosted/core/ObjectFactory.cpp
View File

@ -52,9 +52,8 @@ void ObjectFactory::produce(void* args) {
{30, 128}, {20, 1024}, {10, 2048}}; {30, 128}, {20, 1024}, {10, 2048}};
new PoolManager(objects::IPC_STORE, poolCfg); new PoolManager(objects::IPC_STORE, poolCfg);
} }
TmFunnel* funnel; PusTmFunnel* funnel;
CcsdsDistributor* ccsdsDistrib; CcsdsDistributor* ccsdsDistrib;
ObjectFactory::produceGenericObjects(&funnel, &ccsdsDistrib, *tcStore, *tmStore);
// TMTC Reception via TCP/IP socket // TMTC Reception via TCP/IP socket
#if OBSW_USE_TCP_SERVER == 0 #if OBSW_USE_TCP_SERVER == 0
auto tmtcBridge = new UdpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR); auto tmtcBridge = new UdpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);
@ -68,6 +67,7 @@ void ObjectFactory::produce(void* args) {
sif::info << "Opening TCP TMTC server on port " << tmtcServer->getTcpPort() << std::endl; sif::info << "Opening TCP TMTC server on port " << tmtcServer->getTcpPort() << std::endl;
// TODO: Set the set of valid space packet IDs. Otherwise, parsing might fail // TODO: Set the set of valid space packet IDs. Otherwise, parsing might fail
#endif #endif
ObjectFactory::produceGenericObjects(&funnel, *tmtcBridge, &ccsdsDistrib, *tcStore, *tmStore);
#endif /* OBSW_ADD_CORE_COMPONENTS == 1 */ #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */

2
example_common

@ -1 +1 @@
Subproject commit 6bcd0ce05f31fbc8b2d49205a1a90071442dbdd0 Subproject commit 7bb9ffc3f73bcfefa030b2546382fc6353702096

2
fsfw

@ -1 +1 @@
Subproject commit 14a8924a83dc15e29cd4bf8c6ac495c8729e4828 Subproject commit 1aa062df7fc43135b8e45115eef45d45afca5a81