eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 4 Pull Requests 3 Releases 119 Wiki Activity

Split ACU HK #256

Merged
meierj merged 16 commits from mueller/split-acu-hk into develop 2022-05-25 15:23:19 +02:00
Conversation 0 Commits 16 Files Changed 9 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 660f0d2dcd - Show all commits

2
mission/devices/ACUHandler.cpp
View File

@ -95,7 +95,7 @@ ReturnValue_t ACUHandler::parseHkTableReply(const uint8_t *packet) {
dataOffset += 3;
}
for (size_t idx = 0; idx < 6; idx++) {
auxHk.dacRawChannelVal0[idx] = (packet[dataOffset] << 8) | packet[dataOffset + 1];
auxHk.dacRawChannelVals[idx] = (packet[dataOffset] << 8) | packet[dataOffset + 1];
dataOffset += 4;
}

2
mission/devices/devicedefinitions/GomspaceDefinitions.h
View File

@ -599,7 +599,7 @@ class AuxHk : public StaticLocalDataSet<12> {
lp_vec_t<uint8_t, 3> dacEnables =
lp_vec_t<uint8_t, 3>(sid.objectId, P60System::pool::ACU_DAC_ENABLES, this);
lp_vec_t<uint16_t, 6> dacRawChannelVal0 =
lp_vec_t<uint16_t, 6> dacRawChannelVals =
lp_vec_t<uint16_t, 6>(sid.objectId, P60System::pool::ACU_DAC_RAW_CHANNELS, this);
lp_var_t<uint32_t> bootCause =