eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge branch 'master' into mueller/master

Browse Source
This commit is contained in:
Robin Müller
2020-11-20 17:26:15 +01:00
committed by Robin Mueller
parent 3494fcc59b e25fd2f9b9
commit ba0f874a38
5 changed files with 200 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mission/core/ObjectFactory.cpp
View File

@ -99,19 +99,12 @@ void ObjectFactory::produce(){
/* TMTC Reception via UDP socket */
new TmFunnel(objects::TM_FUNNEL);
#ifdef LINUX
new TmTcUnixUdpBridge(objects::UDP_BRIDGE,
objects::CCSDS_PACKET_DISTRIBUTOR,
objects::TM_STORE, objects::TC_STORE);
new TcUnixUdpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
#elif WIN32
new TmTcWinUdpBridge(objects::UDP_BRIDGE,
objects::CCSDS_PACKET_DISTRIBUTOR, objects::TM_STORE,
objects::TC_STORE);
new TcWinUdpPollingTask(objects::UDP_POLLING_TASK,
objects::UDP_BRIDGE);
#endif
new TcUnixUdpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
/* PUS stack */
new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION,