eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

read acu hk table complete

Browse Source
This commit is contained in:
Martin Zietz 2021-02-16 17:02:03 +01:00
parent 95ab220f6e
commit 4d64897640
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etl

@ -1 +1 @@
Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217 Subproject commit 1ac3b77ef40aa783024d15185ee8ff41ae04a73e

2
fsfw

@ -1 +1 @@
Subproject commit 7d0916a44e18c87b00998448333023186b3d85b1 Subproject commit e994d81e1862fade52b090311b3978fb59061966

2
fsfwconfig/OBSWConfig.h
View File

@ -18,7 +18,7 @@
#define P60DOCK_DEBUG 0 #define P60DOCK_DEBUG 0
#define PDU1_DEBUG 0 #define PDU1_DEBUG 0
#define PDU2_DEBUG 0 #define PDU2_DEBUG 0
#define ACU_DEBUG 0 #define ACU_DEBUG 1
#include "OBSWVersion.h" #include "OBSWVersion.h"

9
mission/devices/ACUHandler.cpp
View File

@ -1,4 +1,5 @@
#include "ACUHandler.h" #include "ACUHandler.h"
#include "OBSWConfig.h"
ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) : ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
GomspaceDeviceHandler(objectId, comIF, comCookie, ACU::MAX_CONFIGTABLE_ADDRESS, 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 1: " << temperatureC_1 << " °C" << std::endl;
sif::info << "ACU: Temperature 2: " << temperatureC_2 << " °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: 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(); acuHkTableDataset.commit();
#endif #endif
} }
@ -132,7 +137,9 @@ void ACUHandler::parseHkTableReply(const uint8_t *packet) {
acuHkTableDataset.resetCause = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1); acuHkTableDataset.resetCause = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
dataOffset += 4; dataOffset += 4;
acuHkTableDataset.mpptTime = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1); 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); acuHkTableDataset.mpptPeriod = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
dataOffset += 4; dataOffset += 4;

2
tmtc

@ -1 +1 @@
Subproject commit 110ec9644a520af9c6f4cb7f2b5d47f3d34ba256 Subproject commit 1d5fe4ebc7165c2a4979c5f9be9cfa0324e366fb