From 4d6489764046e3edd76aebe5ab255b80a9adea2d Mon Sep 17 00:00:00 2001
From: Martin Zietz <zietz@irs.uni-stuttgart.de>
Date: Tue, 16 Feb 2021 17:02:03 +0100
Subject: [PATCH] read acu hk table complete

---
 etl                            | 2 +-
 fsfw                           | 2 +-
 fsfwconfig/OBSWConfig.h        | 2 +-
 mission/devices/ACUHandler.cpp | 9 ++++++++-
 tmtc                           | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/etl b/etl
index ae06e641..1ac3b77e 160000
--- a/etl
+++ b/etl
@@ -1 +1 @@
-Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217
+Subproject commit 1ac3b77ef40aa783024d15185ee8ff41ae04a73e
diff --git a/fsfw b/fsfw
index 7d0916a4..e994d81e 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 7d0916a44e18c87b00998448333023186b3d85b1
+Subproject commit e994d81e1862fade52b090311b3978fb59061966
diff --git a/fsfwconfig/OBSWConfig.h b/fsfwconfig/OBSWConfig.h
index 8c768a35..1d845c06 100644
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@@ -18,7 +18,7 @@
 #define P60DOCK_DEBUG   0
 #define PDU1_DEBUG  0
 #define PDU2_DEBUG  0
-#define ACU_DEBUG  0
+#define ACU_DEBUG  1
 
 #include "OBSWVersion.h"
 
diff --git a/mission/devices/ACUHandler.cpp b/mission/devices/ACUHandler.cpp
index 286bcbc7..3d5d82e8 100644
--- a/mission/devices/ACUHandler.cpp
+++ b/mission/devices/ACUHandler.cpp
@@ -1,4 +1,5 @@
 #include "ACUHandler.h"
+#include "OBSWConfig.h"
 
 ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
         GomspaceDeviceHandler(objectId, comIF, comCookie, ACU::MAX_CONFIGTABLE_ADDRESS,
@@ -28,6 +29,10 @@ void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pack
     sif::info << "ACU: Temperature 1: " << temperatureC_1 << " °C" << std::endl;
     sif::info << "ACU: Temperature 2: " << temperatureC_2 << " °C" << std::endl;
     sif::info << "ACU: Temperature 3: " << temperatureC_3 << " °C" << std::endl;
+	sif::info << "ACU: Ground Watchdog Timer Count: "
+			<< acuHkTableDataset.wdtCntGnd.value << std::endl;
+	sif::info << "ACU: Ground watchdog timer, seconds left before reboot: "
+			<< acuHkTableDataset.wdtGndLeft.value << std::endl;
     acuHkTableDataset.commit();
 #endif
 }
@@ -132,7 +137,9 @@ void ACUHandler::parseHkTableReply(const uint8_t *packet) {
     acuHkTableDataset.resetCause = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
     dataOffset += 4;
     acuHkTableDataset.mpptTime = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-    dataOffset += 4;
+    /* +12 because here starts the second csp packet */
+    dataOffset += 2 + 12;
+
     acuHkTableDataset.mpptPeriod = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
     dataOffset += 4;
 
diff --git a/tmtc b/tmtc
index 110ec964..1d5fe4eb 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 110ec9644a520af9c6f4cb7f2b5d47f3d34ba256
+Subproject commit 1d5fe4ebc7165c2a4979c5f9be9cfa0324e366fb