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

tmtc update

Browse Source
This commit is contained in:
Robin Müller
2021-07-16 13:22:59 +02:00
parent 61bd99f59f
commit 6cacd8ab99
10 changed files with 126 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bsp_stm32h7_rtems/core/InitMission.cpp
View File

@ -40,7 +40,7 @@ void InitMission::createTasks() {
task::printInitError("TM funnel", objects::TM_FUNNEL);
}
#if OBSW_ADD_LWIP_NETWORKING == 1
#if OBSW_ADD_LWIP_COMPONENTS == 1
/* UDP bridge */
PeriodicTaskIF* udpBridgeTask = TaskFactory::instance()->createPeriodicTask(
"UDP_UNIX_BRIDGE", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, nullptr);
@ -55,7 +55,7 @@ void InitMission::createTasks() {
if(result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("UDP polling task", objects::UDP_POLLING_TASK);
}
#endif /* OBSW_ADD_LWIP_NETWORKING == 1 */
#endif /* OBSW_ADD_LWIP_COMPONENTS == 1 */
#endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
#if OBSW_ADD_PUS_STACK == 1
@ -150,10 +150,10 @@ void InitMission::createTasks() {
#if OBSW_ADD_CORE_COMPONENTS == 1
distributerTask->startTask();
eventManagerTask->startTask();
#if OBSW_ADD_LWIP_NETWORKING == 1
#if OBSW_ADD_LWIP_COMPONENTS == 1
udpBridgeTask->startTask();
udpPollingTask->startTask();
#endif /* OBSW_ADD_LWIP_NETWORKING == 1 */
#endif /* OBSW_ADD_LWIP_COMPONENTS == 1 */
#endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
#if OBSW_ADD_PUS_STACK == 1

8
bsp_stm32h7_rtems/core/ObjectFactory.cpp
View File

@ -16,6 +16,8 @@
#include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h>
#include <rtems_lwip/rtems_lwip.h>
void ObjectFactory::produce(void* args) {
/* Located inside GenericFactory source file */
Factory::setStaticFrameworkObjectIds();
@ -42,12 +44,12 @@ void ObjectFactory::produce(void* args) {
new PoolManager(objects::IPC_STORE, poolCfg);
}
#if OBSW_ADD_LWIP_NETWORKING == 1
#if OBSW_ADD_LWIP_COMPONENTS == 1
/* UDP Server */
new TmTcLwIpUdpBridge(objects::UDP_BRIDGE,
objects::CCSDS_DISTRIBUTOR, objects::TM_STORE, objects::TC_STORE);
new UdpTcLwIpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
new UdpTcLwIpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE,
rtems_lwip_get_netif(0));
#endif /* OBSW_ADD_LWIP_NETWORKING == 1 */
#endif /* OBSW_ADD_CORE_COMPONENTS == 1 */