From 2af6e85f8713cb02ae89bebecf52fd2483ef1ba0 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sun, 23 Mar 2025 12:35:40 +0100 Subject: [PATCH 1/2] send hk report back to sender instead of default destination --- src/fsfw/housekeeping/PeriodicHkHelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsfw/housekeeping/PeriodicHkHelper.cpp b/src/fsfw/housekeeping/PeriodicHkHelper.cpp index bb8472ad..04f91f6a 100644 --- a/src/fsfw/housekeeping/PeriodicHkHelper.cpp +++ b/src/fsfw/housekeeping/PeriodicHkHelper.cpp @@ -9,7 +9,6 @@ #include "fsfw/housekeeping/HousekeepingSnapshot.h" #include "fsfw/ipc/QueueFactory.h" #include "fsfw/objectmanager/ObjectManager.h" -#include "fsfw/timemanager/CCSDSTime.h" using namespace hk; @@ -84,6 +83,7 @@ ReturnValue_t PeriodicHelper::performHkOperation() { ReturnValue_t PeriodicHelper::handleHousekeepingMessage(CommandMessage* message) { Command_t command = message->getCommand(); + MessageQueueId_t sender = message->getSender(); dp::sid_t sid = HousekeepingMessage::getStructureId(message); ReturnValue_t result = returnvalue::OK; switch (command) { @@ -113,7 +113,7 @@ ReturnValue_t PeriodicHelper::handleHousekeepingMessage(CommandMessage* message) } case (HousekeepingMessage::GENERATE_ONE_PARAMETER_REPORT): { - return generateHousekeepingPacket(HousekeepingMessage::getStructureId(message)); + return generateHousekeepingPacket(HousekeepingMessage::getStructureId(message), sender); } default: -- 2.43.0 From 3afd0c8d3cf7dd820baf2449da293af50de532bd Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Tue, 1 Apr 2025 17:25:02 +0200 Subject: [PATCH 2/2] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 195507a8..cc006de4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Changed +- send HK one-parameter-report back to sender instead of default hk queue - Complete overhaul of HK subsystem. Replaced local data pool manager by periodic HK helper. The shared pool and the periodic HK generation are now distinct concepts. - The local HK manager was replaced by a periodic HK helper which has reduced responsibilities. -- 2.43.0