From 8ae6fe0be5fa7f14526b16be922760738a9e4615 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 23 May 2022 12:39:10 +0200 Subject: [PATCH] moved HK defs --- .../devices/devicedefinitions/GomspaceDefinitions.h | 10 +++++----- tmtc | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h index 0c7cc2d7..4faf5299 100644 --- a/mission/devices/devicedefinitions/GomspaceDefinitions.h +++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h @@ -607,6 +607,11 @@ class AuxHk : public StaticLocalDataSet<12> { lp_var_t resetCause = lp_var_t(sid.objectId, P60System::pool::ACU_RESET_CAUSE, this); + lp_var_t wdtCntGnd = + lp_var_t(sid.objectId, P60System::pool::ACU_WDT_CNT_GND, this); + lp_var_t wdtGndLeft = + lp_var_t(sid.objectId, P60System::pool::ACU_WDT_GND_LEFT, this); + /** * There are 8 devices on the PDU. FRAM, ADCs, temperature sensor etc. Each device is * identified by an ID. Refer also to gs-man-nanopower-p60-pdu-200-1.pdf on pages 17 and 18. @@ -616,11 +621,6 @@ class AuxHk : public StaticLocalDataSet<12> { /** The status of each device. 0 = None, 1 = Ok, 2 = Error, 3 = Not found */ lp_vec_t devicesStatus = lp_vec_t(sid.objectId, P60System::pool::ACU_DEVICES_STATUS, this); - - lp_var_t wdtCntGnd = - lp_var_t(sid.objectId, P60System::pool::ACU_WDT_CNT_GND, this); - lp_var_t wdtGndLeft = - lp_var_t(sid.objectId, P60System::pool::ACU_WDT_GND_LEFT, this); }; } // namespace ACU diff --git a/tmtc b/tmtc index c01f1d01..580b3818 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit c01f1d01916160888cf745ee3db6a2c46d795408 +Subproject commit 580b3818489a87f9ea1b31754c7b0285c2bb6a10