From c27416c0a7c8822a8b1e902ac84cd452203780b3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Jun 2021 10:00:20 +0200 Subject: [PATCH] periodic event --- bsp_hosted/core/ObjectFactory.cpp | 6 ++++- bsp_hosted/fsfwconfig/OBSWConfig.h.in | 2 ++ .../fsfwconfig/events/subsystemIdRanges.h | 2 +- ...e_cmake_debug_cfg.sh => make_debug_cfg.sh} | 0 ...e_relwithdeb_cfg.sh => make_reldef_cfg.sh} | 0 ...ake_release_cfg.sh => make_release_cfg.sh} | 0 ...ate_cmake_size_cfg.sh => make_size_cfg.sh} | 0 cmake/scripts/Linux/ninja_debug_cfg.sh | 26 +++++++++++++++++++ example_common | 2 +- 9 files changed, 35 insertions(+), 3 deletions(-) rename cmake/scripts/Linux/{create_cmake_debug_cfg.sh => make_debug_cfg.sh} (100%) rename cmake/scripts/Linux/{create_cmake_relwithdeb_cfg.sh => make_reldef_cfg.sh} (100%) rename cmake/scripts/Linux/{create_cmake_release_cfg.sh => make_release_cfg.sh} (100%) rename cmake/scripts/Linux/{create_cmake_size_cfg.sh => make_size_cfg.sh} (100%) create mode 100755 cmake/scripts/Linux/ninja_debug_cfg.sh diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp index 1d3da3c..8d39510 100644 --- a/bsp_hosted/core/ObjectFactory.cpp +++ b/bsp_hosted/core/ObjectFactory.cpp @@ -51,7 +51,11 @@ void ObjectFactory::produce(void* args) { #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */ - new TestTask(objects::TEST_TASK, false); + bool periodicEvent = false; +#if OBSW_TASK_PERIODIC_EVENT == 1 + periodicEvent = true; +#endif + new TestTask(objects::TEST_TASK, false, periodicEvent); ObjectFactory::produceGenericObjects(); } diff --git a/bsp_hosted/fsfwconfig/OBSWConfig.h.in b/bsp_hosted/fsfwconfig/OBSWConfig.h.in index d90a917..52db5b5 100644 --- a/bsp_hosted/fsfwconfig/OBSWConfig.h.in +++ b/bsp_hosted/fsfwconfig/OBSWConfig.h.in @@ -8,6 +8,8 @@ #include +#define OBSW_TASK_PERIODIC_EVENT 0 + #ifdef __cplusplus #include "events/subsystemIdRanges.h" diff --git a/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h b/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h index 809bc6f..c41aa68 100644 --- a/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h +++ b/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h @@ -1,7 +1,7 @@ #ifndef FSFWCONFIG_TMTC_SUBSYSTEMIDRANGES_H_ #define FSFWCONFIG_TMTC_SUBSYSTEMIDRANGES_H_ -#include +#include "commonSubsystemIds.h" namespace SUBSYSTEM_ID { enum subsystemId: uint8_t { diff --git a/cmake/scripts/Linux/create_cmake_debug_cfg.sh b/cmake/scripts/Linux/make_debug_cfg.sh similarity index 100% rename from cmake/scripts/Linux/create_cmake_debug_cfg.sh rename to cmake/scripts/Linux/make_debug_cfg.sh diff --git a/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Linux/make_reldef_cfg.sh similarity index 100% rename from cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh rename to cmake/scripts/Linux/make_reldef_cfg.sh diff --git a/cmake/scripts/Linux/create_cmake_release_cfg.sh b/cmake/scripts/Linux/make_release_cfg.sh similarity index 100% rename from cmake/scripts/Linux/create_cmake_release_cfg.sh rename to cmake/scripts/Linux/make_release_cfg.sh diff --git a/cmake/scripts/Linux/create_cmake_size_cfg.sh b/cmake/scripts/Linux/make_size_cfg.sh similarity index 100% rename from cmake/scripts/Linux/create_cmake_size_cfg.sh rename to cmake/scripts/Linux/make_size_cfg.sh diff --git a/cmake/scripts/Linux/ninja_debug_cfg.sh b/cmake/scripts/Linux/ninja_debug_cfg.sh new file mode 100755 index 0000000..e8bd483 --- /dev/null +++ b/cmake/scripts/Linux/ninja_debug_cfg.sh @@ -0,0 +1,26 @@ +#!/bin/sh +counter=0 +while [ ${counter} -lt 5 ] +do + cd .. + if [ -f "cmake_build_config.py" ];then + break + fi + counter=$((counter=counter + 1)) +done + +if [ "${counter}" -ge 5 ];then + echo "create_cmake_cfg.sh not found in upper directories!" + exit 1 +fi + +build_generator="Ninja" +os_fsfw="linux" +builddir="build-Debug" + +echo "Running command (without the leading +):" +set -x # Print command +python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" \ + -t "host/none" -l "${builddir}" +# Use this if commands are added which should not be printed +# set +x diff --git a/example_common b/example_common index edaccc0..112adcb 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit edaccc0dbdad5d1072aa890b532b5e177ad4e8b1 +Subproject commit 112adcbb64c55d1c951c98985f3250c24f6285fa