fsfw/fsfw_example_public
Archived
12
1
Fork 1
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

submodule update, obj factory update, cmake form

Browse Source
This commit is contained in:
Robin Müller 2021-05-05 19:43:03 +02:00
parent 5f4b1520d5
commit 8502b7ad26
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bsp_hosted/core/ObjectFactory.cpp
View File

@ -47,8 +47,7 @@ void ObjectFactory::produce(){
} }
/* TMTC Reception via UDP socket */ /* TMTC Reception via UDP socket */
auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR, auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR);
objects::TM_STORE, objects::TC_STORE);
tmtcBridge->setMaxNumberOfPacketsStored(20); tmtcBridge->setMaxNumberOfPacketsStored(20);
new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE); new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);

3
bsp_linux/core/ObjectFactory.cpp
View File

@ -48,8 +48,7 @@ void ObjectFactory::produce() {
} }
/* TMTC Reception via UDP socket */ /* TMTC Reception via UDP socket */
auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR, auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR);
objects::TM_STORE, objects::TC_STORE);
tmtcBridge->setMaxNumberOfPacketsStored(20); tmtcBridge->setMaxNumberOfPacketsStored(20);
new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE); new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
#endif /* OBSW_ADD_CORE_COMPONENTS == 1 */ #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */

26
cmake/PreProjectConfig.cmake
View File

@ -110,19 +110,19 @@ elseif(${OS_FSFW} STREQUAL linux AND TGT_BSP)
"$ENV{RASPBERRY_VERSION}" "$ENV{RASPBERRY_VERSION}"
) )
endif() endif()
if(LINUX_CROSS_COMPILE) if(LINUX_CROSS_COMPILE)
set(CMAKE_TOOLCHAIN_FILE set(CMAKE_TOOLCHAIN_FILE
"${CMAKE_SCRIPT_PATH}/RPiCrossCompileConfig.cmake" "${CMAKE_SCRIPT_PATH}/RPiCrossCompileConfig.cmake"
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()
elseif(${TGT_BSP} MATCHES "arm/beagleboneblack") elseif(${TGT_BSP} MATCHES "arm/beagleboneblack")
if(LINUX_CROSS_COMPILE) if(LINUX_CROSS_COMPILE)
set(CMAKE_TOOLCHAIN_FILE set(CMAKE_TOOLCHAIN_FILE
"${CMAKE_SCRIPT_PATH}/BBBCrossCompileConfig.cmake" "${CMAKE_SCRIPT_PATH}/BBBCrossCompileConfig.cmake"
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()
else() else()
message(WARNING "Target BSP (TGT_BSP) ${TGT_BSP} unknown!") message(WARNING "Target BSP (TGT_BSP) ${TGT_BSP} unknown!")
endif() endif()

2
fsfw

@ -1 +1 @@
Subproject commit 08b9e92d25bc78b68d7a101a2451c17def7c8d3b Subproject commit c1d30aad13753591b57db9e549333a596b606947

2
tmtc/tmtccmd

@ -1 +1 @@
Subproject commit 474ccbcaad7cedeb252c560c979dd7bf0d3f5ef3 Subproject commit f80d00ea63b9be872fd3422866ab50d686fddf01