From ed2c7a2ec1dbeadddece2fe73896a681ad669c0e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 May 2021 16:53:06 +0200 Subject: [PATCH] q7s compiling --- CMakeLists.txt | 3 ++- bsp_q7s/CMakeLists.txt | 1 - bsp_q7s/ObjectFactory.cpp | 26 ++++++++++--------- bsp_q7s/devices/CMakeLists.txt | 4 --- cmake/scripts/Q7S/create_cmake_debug_cfg.sh | 4 ++- cmake/scripts/Q7S/create_cmake_release_cfg.sh | 4 ++- .../Q7S/create_cmake_relwithdeb_cfg.sh | 4 ++- etl | 1 - .../pollingSequenceFactory.cpp | 6 ++--- linux/devices/SusHandler.cpp | 2 +- 10 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 bsp_q7s/devices/CMakeLists.txt delete mode 160000 etl diff --git a/CMakeLists.txt b/CMakeLists.txt index ec57a867..c799f927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,9 +94,10 @@ if(TGT_BSP) else() # Required by FSFW library set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig") - set(FSFW_ADDITIONAL_INC_PATH "${COMMON_PATH}/config") endif() +# Set common config path for FSFW +set(FSFW_ADDITIONAL_INC_PATH "${COMMON_PATH}/config") # Set for lwgps library set(LWGPS_CONFIG_PATH "${COMMON_PATH}/config") diff --git a/bsp_q7s/CMakeLists.txt b/bsp_q7s/CMakeLists.txt index e567628e..f741a46b 100644 --- a/bsp_q7s/CMakeLists.txt +++ b/bsp_q7s/CMakeLists.txt @@ -6,7 +6,6 @@ target_sources(${TARGET_NAME} PUBLIC add_subdirectory(boardconfig) add_subdirectory(comIF) -add_subdirectory(devices) add_subdirectory(boardtest) add_subdirectory(gpio) diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp index 297f8167..22418bc5 100644 --- a/bsp_q7s/ObjectFactory.cpp +++ b/bsp_q7s/ObjectFactory.cpp @@ -1,16 +1,18 @@ #include "ObjectFactory.h" -#include -#include -#include -#include -#include -#include -#include +#include "OBSWConfig.h" +#include "tmtc/apid.h" +#include "devices/addresses.h" +#include "devices/gpioIds.h" +#include "tmtc/pusIds.h" +#include "devices/powerSwitcherList.h" +#include "devices/spi.h" -#include -#include #include +#include +#include +#include + #include #include #include @@ -26,7 +28,7 @@ #include #include #include -#include + #include #include @@ -42,6 +44,7 @@ #include #include + #include #include #include @@ -554,8 +557,7 @@ void ObjectFactory::produce(){ #endif /* TE0720 == 0 */ - new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR, objects::TM_STORE, - objects::TC_STORE); + new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR); new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE); #if TE0720 == 1 && TEST_LIBGPIOD == 1 diff --git a/bsp_q7s/devices/CMakeLists.txt b/bsp_q7s/devices/CMakeLists.txt deleted file mode 100644 index 9e6fb793..00000000 --- a/bsp_q7s/devices/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -target_sources(${TARGET_NAME} PRIVATE - HeaterHandler.cpp - SolarArrayDeploymentHandler.cpp -) diff --git a/cmake/scripts/Q7S/create_cmake_debug_cfg.sh b/cmake/scripts/Q7S/create_cmake_debug_cfg.sh index 7f6753ac..4875c59a 100755 --- a/cmake/scripts/Q7S/create_cmake_debug_cfg.sh +++ b/cmake/scripts/Q7S/create_cmake_debug_cfg.sh @@ -16,6 +16,7 @@ fi os_fsfw="linux" tgt_bsp="arm/q7s" +build_dir="build-Debug-Q7S" build_generator="" if [ "${OS}" = "Windows_NT" ]; then build_generator="MinGW Makefiles" @@ -24,4 +25,5 @@ else build_generator="Unix Makefiles" fi -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" +python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ + -l"${build_dir}" diff --git a/cmake/scripts/Q7S/create_cmake_release_cfg.sh b/cmake/scripts/Q7S/create_cmake_release_cfg.sh index 6048a1c6..0e2c543c 100755 --- a/cmake/scripts/Q7S/create_cmake_release_cfg.sh +++ b/cmake/scripts/Q7S/create_cmake_release_cfg.sh @@ -16,6 +16,7 @@ fi os_fsfw="linux" tgt_bsp="arm/q7s" +build_dir="build-Release-Q7S" build_generator="" if [ "${OS}" = "Windows_NT" ]; then build_generator="MinGW Makefiles" @@ -24,4 +25,5 @@ else build_generator="Unix Makefiles" fi -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" +python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \ + -l"${build_dir}" diff --git a/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh index 346067cd..121f2d7e 100755 --- a/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh +++ b/cmake/scripts/Q7S/create_cmake_relwithdeb_cfg.sh @@ -16,6 +16,7 @@ fi os_fsfw="linux" tgt_bsp="arm/q7s" +build_dir="build-Release-Q7S" build_generator="" if [ "${OS}" = "Windows_NT" ]; then build_generator="MinGW Makefiles" @@ -24,4 +25,5 @@ else build_generator="Unix Makefiles" fi -python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -t "${tgt_bsp}" +python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -t "${tgt_bsp}" \ + -l"${build_dir}" diff --git a/etl b/etl deleted file mode 160000 index ae06e641..00000000 --- a/etl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217 diff --git a/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp index 1199ae2c..578b0c44 100644 --- a/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp +++ b/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp @@ -1,12 +1,12 @@ #include "pollingSequenceFactory.h" -#include +#include "linux/devices/SusHandler.h" +#include "OBSWConfig.h" + #include #include #include #include #include -#include -#include ReturnValue_t pst::pollingSequenceInitDefault(FixedTimeslotTaskIF *thisSequence) diff --git a/linux/devices/SusHandler.cpp b/linux/devices/SusHandler.cpp index c658eb67..c31160c4 100644 --- a/linux/devices/SusHandler.cpp +++ b/linux/devices/SusHandler.cpp @@ -1,5 +1,5 @@ +#include "SusHandler.h" #include "OBSWConfig.h" -#include #include #include