From 676b94b139286a773b5f36ede9f24511051816d3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 16 Aug 2022 11:56:17 +0200 Subject: [PATCH] map dataset to sid --- common/config/commonObjects.h | 2 +- mission/controller/AcsController.cpp | 7 ++++++- tmtc | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h index 4a4594f4..e0efbce7 100644 --- a/common/config/commonObjects.h +++ b/common/config/commonObjects.h @@ -18,7 +18,7 @@ enum commonObjects : uint32_t { /* 0x43 ('C') for Controllers */ THERMAL_CONTROLLER = 0x43400001, - ACS_CONTROLLER = 0x43100002, + ACS_CONTROLLER = 0x43000002, CORE_CONTROLLER = 0x43000003, /* 0x44 ('D') for device handlers */ diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index 46db49ce..e323903f 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -48,7 +48,12 @@ ReturnValue_t AcsController::initializeLocalDataPool(localpool::DataPool &localD return HasReturnvaluesIF::RETURN_OK; } -LocalPoolDataSetBase *AcsController::getDataSetHandle(sid_t sid) { return nullptr; } +LocalPoolDataSetBase *AcsController::getDataSetHandle(sid_t sid) { + if (sid == mgmData.getSid()) { + return &mgmData; + } + return nullptr; +} ReturnValue_t AcsController::checkModeCommand(Mode_t mode, Submode_t submode, uint32_t *msToReachTheMode) { diff --git a/tmtc b/tmtc index 2165f376..9de4cabc 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 2165f376fbb8624a44e87b4395d544de663a2d04 +Subproject commit 9de4cabcd9db8ddb9e88203b4ad9c5eaf612a112