From a26b0c38ac2631804fac8b27eb11f749748b12dd Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 Jul 2023 10:31:02 +0200 Subject: [PATCH 1/3] small tweak to allow immediate HK generation --- src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp index da3b6b8d..ec34330a 100644 --- a/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp +++ b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp @@ -34,4 +34,6 @@ void PeriodicHousekeepingHelper::changeCollectionInterval(float newIntervalSecon } collectionInterval = newIntervalSeconds; hkGenerationCd.setTimeout(intervalMs); + // We want an immediate HK packet at the start, so time out the generation CD immediately. + hkGenerationCd.timeOut(); } -- 2.43.0 From aac74fae3889cc1f5184ef81d65fd7e4c56b8caf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 Jul 2023 10:34:19 +0200 Subject: [PATCH 2/3] shared cmake file --- .idea/cmake.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .idea/cmake.xml diff --git a/.idea/cmake.xml b/.idea/cmake.xml new file mode 100644 index 00000000..b0a4921a --- /dev/null +++ b/.idea/cmake.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file -- 2.43.0 From 62ace649a758aa19d510e95c3c68bb50660d299e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 Jul 2023 10:35:35 +0200 Subject: [PATCH 3/3] fix unittest --- unittests/CatchFactory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unittests/CatchFactory.cpp b/unittests/CatchFactory.cpp index 37c62f94..589e6887 100644 --- a/unittests/CatchFactory.cpp +++ b/unittests/CatchFactory.cpp @@ -32,7 +32,7 @@ void Factory::produceFrameworkObjects(void* args) { setStaticFrameworkObjectIds(); new EventManager(objects::EVENT_MANAGER, 120); new HealthTable(objects::HEALTH_TABLE); - new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER); + new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER, 20, false, 1.0); { PoolManager::LocalPoolConfig poolCfg = {{100, 16}, {50, 32}, {25, 64}, {15, 128}, {5, 1024}}; -- 2.43.0