From 76b162113f0f88430bd1b1c87c0a92baad84ae45 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 23 Dec 2022 12:50:10 +0100 Subject: [PATCH 01/14] add normal to on trnasition --- mission/devices/PayloadPcduHandler.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index 7b4353e4..f4aba7ef 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -69,6 +69,16 @@ void PayloadPcduHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) { if (getMode() == _MODE_TO_NORMAL) { stateMachineToNormal(modeFrom, subModeFrom); return; + } else if (getMode() == _MODE_TO_ON and modeFrom == MODE_NORMAL) { + gpioIF->pullLow(gpioIds::PLPCDU_ENB_HPA); + gpioIF->pullLow(gpioIds::PLPCDU_ENB_MPA); + gpioIF->pullLow(gpioIds::PLPCDU_ENB_TX); + gpioIF->pullLow(gpioIds::PLPCDU_ENB_X8); + gpioIF->pullLow(gpioIds::PLPCDU_ENB_DRO); + gpioIF->pullLow(gpioIds::PLPCDU_ENB_TX); + gpioIF->pullLow(gpioIds::PLPCDU_ENB_VBAT0); + gpioIF->pullLow(gpioIds::PLPCDU_ENB_VBAT1); + state = States::POWER_CHANNELS_ON; } DeviceHandlerBase::doTransition(modeFrom, subModeFrom); } @@ -144,6 +154,10 @@ ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_ } }; + // sif::debug << "DIFF MASK: " << (int)diffMask << std::endl; + + // No handling for the SSRs: If those are pulled low, the ADC is off + // and normal mode does not really make sense anyway switchHandler(DRO_ON, gpioIds::PLPCDU_ENB_DRO, "DRO"); switchHandler(X8_ON, gpioIds::PLPCDU_ENB_X8, "X8"); switchHandler(TX_ON, gpioIds::PLPCDU_ENB_TX, "TX"); From d51904de2d4991034b26e2a5913b07d568b29b57 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Mon, 9 Jan 2023 11:57:48 +0100 Subject: [PATCH 02/14] disabled damaged PL PCDU1 TMP1075 --- bsp_q7s/core/ObjectFactory.cpp | 5 +++-- linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp | 3 +++ mission/controller/ThermalController.cpp | 6 +++++- mission/controller/ThermalController.h | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 85157e66..5a0c6367 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -123,11 +123,12 @@ void Factory::setStaticFrameworkObjectIds() { void ObjectFactory::setStatics() { Factory::setStaticFrameworkObjectIds(); } void ObjectFactory::createTmpComponents() { - std::array, 5> tmpDevIds = {{ + std::vector> tmpDevIds = {{ {objects::TMP1075_HANDLER_TCS_0, addresses::TMP1075_TCS_0}, {objects::TMP1075_HANDLER_TCS_1, addresses::TMP1075_TCS_1}, {objects::TMP1075_HANDLER_PLPCDU_0, addresses::TMP1075_PLPCDU_0}, - {objects::TMP1075_HANDLER_PLPCDU_1, addresses::TMP1075_PLPCDU_1}, + // damaged + // {objects::TMP1075_HANDLER_PLPCDU_1, addresses::TMP1075_PLPCDU_1}, {objects::TMP1075_HANDLER_IF_BOARD, addresses::TMP1075_IF_BOARD}, }}; std::vector tmpDevCookies; diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp index f10043b5..5dd87e0b 100644 --- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp +++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp @@ -455,6 +455,8 @@ ReturnValue_t pst::pstI2c(FixedTimeslotTaskIF *thisSequence) { thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.4, DeviceHandlerIF::SEND_READ); thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.4, DeviceHandlerIF::GET_READ); + // damaged + /* thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_1, length * 0.4, DeviceHandlerIF::PERFORM_OPERATION); thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_1, length * 0.4, @@ -464,6 +466,7 @@ ReturnValue_t pst::pstI2c(FixedTimeslotTaskIF *thisSequence) { thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_1, length * 0.4, DeviceHandlerIF::SEND_READ); thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_1, length * 0.4, DeviceHandlerIF::GET_READ); + */ thisSequence->addSlot(objects::TMP1075_HANDLER_IF_BOARD, length * 0.4, DeviceHandlerIF::PERFORM_OPERATION); thisSequence->addSlot(objects::TMP1075_HANDLER_IF_BOARD, length * 0.4, diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 45f26f8b..f0356f66 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -41,7 +41,8 @@ ThermalController::ThermalController(object_id_t objectId) tmp1075SetTcs0(objects::TMP1075_HANDLER_TCS_0), tmp1075SetTcs1(objects::TMP1075_HANDLER_TCS_1), tmp1075SetPlPcdu0(objects::TMP1075_HANDLER_PLPCDU_0), - tmp1075SetPlPcdu1(objects::TMP1075_HANDLER_PLPCDU_1), + // damaged + // tmp1075SetPlPcdu1(objects::TMP1075_HANDLER_PLPCDU_1), tmp1075SetIfBoard(objects::TMP1075_HANDLER_IF_BOARD), susSet0(objects::SUS_0_N_LOC_XFYFZM_PT_XF), susSet1(objects::SUS_1_N_LOC_XBYFZM_PT_XB), @@ -449,6 +450,8 @@ void ThermalController::copySensors() { } } } + // damaged + /* { PoolReadGuard pg(&tmp1075SetPlPcdu1, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT); if (pg.getReadResult() == returnvalue::OK) { @@ -459,6 +462,7 @@ void ThermalController::copySensors() { } } } + */ { PoolReadGuard pg(&tmp1075SetIfBoard, MutexIF::TimeoutType::WAITING, MUTEX_TIMEOUT); if (pg.getReadResult() == returnvalue::OK) { diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index 5071d811..5f4569c3 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -55,10 +55,12 @@ class ThermalController : public ExtendedControllerBase { MAX31865::Max31865Set max31865Set13; MAX31865::Max31865Set max31865Set14; MAX31865::Max31865Set max31865Set15; + TMP1075::Tmp1075Dataset tmp1075SetTcs0; TMP1075::Tmp1075Dataset tmp1075SetTcs1; TMP1075::Tmp1075Dataset tmp1075SetPlPcdu0; - TMP1075::Tmp1075Dataset tmp1075SetPlPcdu1; + // damaged + // TMP1075::Tmp1075Dataset tmp1075SetPlPcdu1; TMP1075::Tmp1075Dataset tmp1075SetIfBoard; // SUS From cce2da522967172ae052fb227c881d92cfd9149b Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Mon, 9 Jan 2023 13:29:59 +0100 Subject: [PATCH 03/14] yeah, its sequence counter ping-pong.. --- linux/devices/ploc/PlocMPSoCHandler.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp index 2ac58335..b1914111 100644 --- a/linux/devices/ploc/PlocMPSoCHandler.cpp +++ b/linux/devices/ploc/PlocMPSoCHandler.cpp @@ -347,6 +347,8 @@ ReturnValue_t PlocMPSoCHandler::scanForReply(const uint8_t* start, size_t remain triggerEvent(MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH, sequenceCount, recvSeqCnt); sequenceCount = recvSeqCnt; } + // This sequence count ping pong does not make any sense but it is how the MPSoC expects it. + sequenceCount++; return result; } From a704986d74d667fe37ef2244ef8561f3e0d405db Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 14:50:03 +0100 Subject: [PATCH 04/14] update README --- README.md | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 403189d6..19197bfa 100644 --- a/README.md +++ b/README.md @@ -290,7 +290,7 @@ helper scripts as well. 4. Run build command by double clicking the created target or by right clicking the project folder and selecting Build Project. -# Useful and Common Commands (Host) +# Useful and Common Commands ## Build generation @@ -319,14 +319,9 @@ cmake -DTGT_BSP=arm/q7s -DCMAKE_BUILD_TYPE=Release .. cmake --build . -j ``` -### Q7S Watchdog - -The watchdog will be built along side the primary OBSW binary. - -### Hosted +### Hosted OBSW You can also use the FSFW OSAL `host` to build on Windows or for generic OSes. -Note: Currently this is not supported. ```sh mkdir cmake-build-debug && cd cmake-build-debug @@ -334,6 +329,21 @@ cmake -DFSFW_OSAL=host -DCMAKE_BUILD_TYPE=Debug .. cmake --build . -j ``` +You can also use the `linux` OSAL: + +```sh +mkdir cmake-build-debug && cd cmake-build-debug +cmake -DFSFW_OSAL=linux -DCMAKE_BUILD_TYPE=Debug .. +cmake --build . -j +``` + +Please note that some additional Linux setup might be necessary. +You can find more information in the [Linux section of the FSFW example](https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-linux-mcu/src/branch/mueller/master/doc/README-linux.md#raising-message-queue-size-limit) + +### Q7S Watchdog + +The watchdog will be built along side the primary OBSW binary. + ### Unittests To build the unittests, the corresponding target must be specified in the build command. From fb37014b655901f276dec59bb225d2ade4d33901 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:19:15 +0100 Subject: [PATCH 05/14] make proprietary library --- CMakeLists.txt | 13 +++++-------- linux/CMakeLists.txt | 6 +++++- linux/devices/CMakeLists.txt | 6 +++++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d87c2695..92c239e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -402,13 +402,13 @@ endif() add_subdirectory(thirdparty) if(EIVE_ADD_LINUX_FILES) - add_subdirectory(${LIB_ARCSEC_PATH}) + # add_subdirectory(${LIB_ARCSEC_PATH}) add_subdirectory(${LINUX_PATH}) endif() add_subdirectory(${BSP_PATH}) -if(UNIX) - add_subdirectory(${LIB_GOMSPACE_PATH}) +if(UNIX AND TGT_BSP MATCHES "arm/q7s") + # add_subdirectory(${LIB_GOMSPACE_PATH}) endif() add_subdirectory(${COMMON_PATH}) @@ -489,7 +489,8 @@ target_link_libraries(${LIB_DUMMIES} PUBLIC ${LIB_FSFW_NAME} ${LIB_JSON_NAME}) target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_EIVE_MISSION} ${LIB_DUMMIES}) if(TGT_BSP MATCHES "arm/q7s") - target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_GPS} ${LIB_ARCSEC}) + target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_GPS} ${LIB_ARCSEC} + ${LIB_GOMSPACE_CLIENTS}) endif() target_link_libraries(${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} @@ -499,10 +500,6 @@ if(TGT_BSP MATCHES "arm/egse") target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC}) endif() -if(UNIX) - target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CLIENTS}) -endif() - if(EIVE_ADD_ETL_LIB) target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_ETL_TARGET}) endif() diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 7f6ea0bc..b500c823 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(csp) add_subdirectory(utility) add_subdirectory(callbacks) add_subdirectory(boardtest) @@ -9,4 +8,9 @@ if(EIVE_ADD_LINUX_FSFWCONFIG) add_subdirectory(fsfwconfig) endif() +# Dependency on proprietary library +if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(csp) +endif() + target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp scheduling.cpp) diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt index de0ea1da..a6a909d0 100644 --- a/linux/devices/CMakeLists.txt +++ b/linux/devices/CMakeLists.txt @@ -7,4 +7,8 @@ target_sources( ScexDleParser.cpp ScexHelper.cpp) add_subdirectory(ploc) -add_subdirectory(startracker) + +# Dependency on proprietary library +if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(startracker) +endif() From 5303139498c8fc2da109ace253c176233c0b95a6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:21:06 +0100 Subject: [PATCH 06/14] helper script to clone all necessary submodules --- clone_submodules_no_privlibs.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 clone_submodules_no_privlibs.sh diff --git a/clone_submodules_no_privlibs.sh b/clone_submodules_no_privlibs.sh new file mode 100755 index 00000000..78ac604b --- /dev/null +++ b/clone_submodules_no_privlibs.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +git submodule update --init fsfw thirdparty/rapidcsv thirdparty/lwgps From 4f01026883350cdc41b2338e5d6dcf4b34395a6c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:21:36 +0100 Subject: [PATCH 07/14] add json clone --- clone_submodules_no_privlibs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clone_submodules_no_privlibs.sh b/clone_submodules_no_privlibs.sh index 78ac604b..ae08a9ce 100755 --- a/clone_submodules_no_privlibs.sh +++ b/clone_submodules_no_privlibs.sh @@ -1,3 +1,3 @@ #!/bin/bash -git submodule update --init fsfw thirdparty/rapidcsv thirdparty/lwgps +git submodule update --init fsfw thirdparty/rapidcsv thirdparty/lwgps thirdparty/json From 217d1b63f2a11a535dc40f004de7d39fcb9e13fb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:44:29 +0100 Subject: [PATCH 08/14] some tweaks --- bsp_hosted/Dockerfile | 2 +- cmake/scripts/host/host-make-debug.sh | 4 ++++ cmake/scripts/host/host-make-release.sh | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bsp_hosted/Dockerfile b/bsp_hosted/Dockerfile index c55ccc67..4d897426 100644 --- a/bsp_hosted/Dockerfile +++ b/bsp_hosted/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex; \ rm -rf build-hosted; \ mkdir build-hosted; \ cd build-hosted; \ - cmake -DCMAKE_BUILD_TYPE=Release -DOS_FSFW=linux ..; + cmake -DCMAKE_BUILD_TYPE=Release -DOSAL_FSFW=host ..; ENTRYPOINT ["cmake", "--build", "build-hosted"] CMD ["-j"] diff --git a/cmake/scripts/host/host-make-debug.sh b/cmake/scripts/host/host-make-debug.sh index 412bf68f..a0acf80f 100755 --- a/cmake/scripts/host/host-make-debug.sh +++ b/cmake/scripts/host/host-make-debug.sh @@ -1,12 +1,14 @@ #!/bin/bash cfg_script_name="cmake-build-cfg.py" init_dir=$(pwd) +root_dir="" if [ -z "${EIVE_OBSW_ROOT}" ]; then counter=0 while [ ${counter} -lt 5 ] do cd .. if [ -f ${cfg_script_name} ];then + root_dir=$(realpath "../..") break fi counter=$((counter=counter + 1)) @@ -18,6 +20,7 @@ if [ -z "${EIVE_OBSW_ROOT}" ]; then fi else cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}" + root_dir=${EIVE_OBSW_ROOT} fi build_generator="make" @@ -35,3 +38,4 @@ set -x # Print command ${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}" # Use this if commands are added which should not be printed # set +x +cd ${root_dir}/${builddir} diff --git a/cmake/scripts/host/host-make-release.sh b/cmake/scripts/host/host-make-release.sh index d564c8aa..997d3294 100755 --- a/cmake/scripts/host/host-make-release.sh +++ b/cmake/scripts/host/host-make-release.sh @@ -7,6 +7,7 @@ if [ -z "${EIVE_OBSW_ROOT}" ]; then do cd .. if [ -f ${cfg_script_name} ];then + root_dir=$(realpath "../..") break fi counter=$((counter=counter + 1)) @@ -20,7 +21,7 @@ else cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}" fi -build_generator="Unix Makefiles" +build_generator="make" os_fsfw="host" builddir="cmake-build-release" if [ "${OS}" = "Windows_NT" ]; then @@ -35,3 +36,4 @@ set -x # Print command ${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}" # Use this if commands are added which should not be printed # set +x +cd ${root_dir}/${builddir} From 663fa0f4ac989a3295f5f4eaca04a07f1df47130 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:47:27 +0100 Subject: [PATCH 09/14] that should be better --- cmake/scripts/host/host-make-debug.sh | 2 +- cmake/scripts/host/host-make-release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/scripts/host/host-make-debug.sh b/cmake/scripts/host/host-make-debug.sh index a0acf80f..cb7a3fb5 100755 --- a/cmake/scripts/host/host-make-debug.sh +++ b/cmake/scripts/host/host-make-debug.sh @@ -37,5 +37,5 @@ echo "Running command (without the leading +):" set -x # Print command ${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}" # Use this if commands are added which should not be printed -# set +x +set +x cd ${root_dir}/${builddir} diff --git a/cmake/scripts/host/host-make-release.sh b/cmake/scripts/host/host-make-release.sh index 997d3294..5aee7618 100755 --- a/cmake/scripts/host/host-make-release.sh +++ b/cmake/scripts/host/host-make-release.sh @@ -35,5 +35,5 @@ echo "Running command (without the leading +):" set -x # Print command ${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}" # Use this if commands are added which should not be printed -# set +x +set +x cd ${root_dir}/${builddir} From 1d8549f81089d95c9b4209242923b884e494b836 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:55:01 +0100 Subject: [PATCH 10/14] this should work better --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92c239e7..9e88c804 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -402,15 +402,14 @@ endif() add_subdirectory(thirdparty) if(EIVE_ADD_LINUX_FILES) - # add_subdirectory(${LIB_ARCSEC_PATH}) + if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(${LIB_GOMSPACE_PATH}) + add_subdirectory(${LIB_ARCSEC_PATH}) + endif() add_subdirectory(${LINUX_PATH}) endif() add_subdirectory(${BSP_PATH}) -if(UNIX AND TGT_BSP MATCHES "arm/q7s") - # add_subdirectory(${LIB_GOMSPACE_PATH}) -endif() - add_subdirectory(${COMMON_PATH}) add_subdirectory(${DUMMY_PATH}) From 25e7872a6fa53bd0fc6f64d4f9f467cda47d9206 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:59:42 +0100 Subject: [PATCH 11/14] this is consistent --- ...e_submodules_no_privlibs.sh => clone-submodules-no-privlibs.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename clone_submodules_no_privlibs.sh => clone-submodules-no-privlibs.sh (100%) diff --git a/clone_submodules_no_privlibs.sh b/clone-submodules-no-privlibs.sh similarity index 100% rename from clone_submodules_no_privlibs.sh rename to clone-submodules-no-privlibs.sh From cb7608b4e6afc4dea97266b83f49d82fe74b9316 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 16:03:04 +0100 Subject: [PATCH 12/14] bumpchangelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21bdd758..ec47364f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ list yields a list of all related PRs for each release. ## Fixed - PLOC SUPV: Minor adaptions and important bugfix for UART manager +- Allow cloning and building the hosted OBSW version without proprietary libraries, + which also avoids the need to have a Gitea account. + PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/337 ## Added From 772fab2b7156cccb04b8848ae932163b10403a54 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 17:48:28 +0100 Subject: [PATCH 13/14] no PCDU for EM for now --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e88c804..3c770eb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,11 +71,13 @@ if(EIVE_Q7S_EM) 1 CACHE STRING "Q7S EM configuration") set(INIT_VAL 0) + set(OBSW_ADD_GOMSPACE_PCDU 0) else() set(OBSW_Q7S_EM 0 CACHE STRING "Q7S EM configuration") set(INIT_VAL 1) + set(OBSW_ADD_GOMSPACE_PCDU 1) endif() set(OBSW_ADD_MGT ${INIT_VAL} From 98ecbfba61170987222aed28596b524b8e76ec46 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 17:50:31 +0100 Subject: [PATCH 14/14] this is more correct --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c770eb3..093580d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,13 +71,11 @@ if(EIVE_Q7S_EM) 1 CACHE STRING "Q7S EM configuration") set(INIT_VAL 0) - set(OBSW_ADD_GOMSPACE_PCDU 0) else() set(OBSW_Q7S_EM 0 CACHE STRING "Q7S EM configuration") set(INIT_VAL 1) - set(OBSW_ADD_GOMSPACE_PCDU 1) endif() set(OBSW_ADD_MGT ${INIT_VAL} @@ -143,7 +141,7 @@ set(OBSW_ADD_TMP_DEVICES ${INIT_VAL} CACHE STRING "Add TMP devices") set(OBSW_ADD_GOMSPACE_PCDU - 1 + ${INIT_VAL} CACHE STRING "Add GomSpace PCDU modules") set(OBSW_ADD_RW ${INIT_VAL}