From 8502b7ad26fa77847b528d074ac9e17dc260d11d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 5 May 2021 19:43:03 +0200 Subject: [PATCH] submodule update, obj factory update, cmake form --- bsp_hosted/core/ObjectFactory.cpp | 3 +-- bsp_linux/core/ObjectFactory.cpp | 3 +-- cmake/PreProjectConfig.cmake | 26 +++++++++++++------------- fsfw | 2 +- tmtc/tmtccmd | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp index 573eb39..bf5839e 100644 --- a/bsp_hosted/core/ObjectFactory.cpp +++ b/bsp_hosted/core/ObjectFactory.cpp @@ -47,8 +47,7 @@ void ObjectFactory::produce(){ } /* TMTC Reception via UDP socket */ - auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR, - objects::TM_STORE, objects::TC_STORE); + auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR); tmtcBridge->setMaxNumberOfPacketsStored(20); new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE); diff --git a/bsp_linux/core/ObjectFactory.cpp b/bsp_linux/core/ObjectFactory.cpp index 7332997..be8514b 100644 --- a/bsp_linux/core/ObjectFactory.cpp +++ b/bsp_linux/core/ObjectFactory.cpp @@ -48,8 +48,7 @@ void ObjectFactory::produce() { } /* TMTC Reception via UDP socket */ - auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR, - objects::TM_STORE, objects::TC_STORE); + auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR); tmtcBridge->setMaxNumberOfPacketsStored(20); new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE); #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */ diff --git a/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake index 457b0d6..c42277b 100644 --- a/cmake/PreProjectConfig.cmake +++ b/cmake/PreProjectConfig.cmake @@ -110,19 +110,19 @@ elseif(${OS_FSFW} STREQUAL linux AND TGT_BSP) "$ENV{RASPBERRY_VERSION}" ) endif() - if(LINUX_CROSS_COMPILE) - set(CMAKE_TOOLCHAIN_FILE - "${CMAKE_SCRIPT_PATH}/RPiCrossCompileConfig.cmake" - PARENT_SCOPE - ) - endif() - elseif(${TGT_BSP} MATCHES "arm/beagleboneblack") - if(LINUX_CROSS_COMPILE) - set(CMAKE_TOOLCHAIN_FILE - "${CMAKE_SCRIPT_PATH}/BBBCrossCompileConfig.cmake" - PARENT_SCOPE - ) - endif() + if(LINUX_CROSS_COMPILE) + set(CMAKE_TOOLCHAIN_FILE + "${CMAKE_SCRIPT_PATH}/RPiCrossCompileConfig.cmake" + PARENT_SCOPE + ) + endif() + elseif(${TGT_BSP} MATCHES "arm/beagleboneblack") + if(LINUX_CROSS_COMPILE) + set(CMAKE_TOOLCHAIN_FILE + "${CMAKE_SCRIPT_PATH}/BBBCrossCompileConfig.cmake" + PARENT_SCOPE + ) + endif() else() message(WARNING "Target BSP (TGT_BSP) ${TGT_BSP} unknown!") endif() diff --git a/fsfw b/fsfw index 08b9e92..c1d30aa 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 08b9e92d25bc78b68d7a101a2451c17def7c8d3b +Subproject commit c1d30aad13753591b57db9e549333a596b606947 diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd index 474ccbc..f80d00e 160000 --- a/tmtc/tmtccmd +++ b/tmtc/tmtccmd @@ -1 +1 @@ -Subproject commit 474ccbcaad7cedeb252c560c979dd7bf0d3f5ef3 +Subproject commit f80d00ea63b9be872fd3422866ab50d686fddf01