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

v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
Conversation 0 Commits 592 Files Changed 218 +11 -22
6 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a14ca283cc - Show all commits

1
linux/devices/GPSHyperionLinuxController.cpp
View File

@ -3,7 +3,6 @@
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "fsfw/datapool/PoolReadGuard.h" #include "fsfw/datapool/PoolReadGuard.h"
#include "fsfw/timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include "linux/utility/utility.h" #include "linux/utility/utility.h"
#include "mission/utility/compileTime.h" #include "mission/utility/compileTime.h"

14
mission/devices/GomspaceDeviceHandler.cpp
View File

@ -366,9 +366,7 @@ ReturnValue_t GomspaceDeviceHandler::initializePduPool(
localDataPoolMap.emplace(P60System::pool::PDU_VCC, new PoolEntry<int16_t>({0})); localDataPoolMap.emplace(P60System::pool::PDU_VCC, new PoolEntry<int16_t>({0}));
localDataPoolMap.emplace(P60System::pool::PDU_VBAT, new PoolEntry<int16_t>({0})); localDataPoolMap.emplace(P60System::pool::PDU_VBAT, new PoolEntry<int16_t>({0}));
localDataPoolMap.emplace(P60System::pool::PDU_TEMPERATURE, new PoolEntry<int16_t>({0})); localDataPoolMap.emplace(P60System::pool::PDU_TEMPERATURE, new PoolEntry<int16_t>({0}));
localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN_1, new PoolEntry<uint8_t>({0})); localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN, new PoolEntry<uint8_t>(3));
localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN_2, new PoolEntry<uint8_t>({0}));
localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN_3, new PoolEntry<uint8_t>({0}));
localDataPoolMap.emplace(P60System::pool::PDU_OUT_ENABLE, localDataPoolMap.emplace(P60System::pool::PDU_OUT_ENABLE,
new PoolEntry<uint8_t>(initOutEnb.data(), initOutEnb.size())); new PoolEntry<uint8_t>(initOutEnb.data(), initOutEnb.size()));
@ -476,12 +474,10 @@ ReturnValue_t GomspaceDeviceHandler::parsePduHkTable(PDU::PduCoreHk& coreHk, PDU
coreHk.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1); coreHk.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
dataOffset += 4; dataOffset += 4;
auxHk.converterEnable1 = *(packet + dataOffset); for (uint8_t idx = 0; idx < 3; idx++) {
dataOffset += 3; auxHk.converterEnable[idx] = packet[dataOffset];
auxHk.converterEnable2 = *(packet + dataOffset); dataOffset += 3;
dataOffset += 3; }
auxHk.converterEnable3 = *(packet + dataOffset);
dataOffset += 3;
for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) { for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
coreHk.outputEnables[idx] = packet[dataOffset]; coreHk.outputEnables[idx] = packet[dataOffset];

2
mission/devices/PDU1Handler.cpp
View File

@ -85,7 +85,7 @@ void PDU1Handler::parseHkTableReply(const uint8_t *packet) {
ReturnValue_t PDU1Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap, ReturnValue_t PDU1Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
LocalDataPoolManager &poolManager) { LocalDataPoolManager &poolManager) {
initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU1); initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU1);
poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, false); poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, true);
poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false); poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }

2
mission/devices/PDU2Handler.cpp
View File

@ -48,7 +48,7 @@ void PDU2Handler::parseHkTableReply(const uint8_t *packet) {
ReturnValue_t PDU2Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap, ReturnValue_t PDU2Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
LocalDataPoolManager &poolManager) { LocalDataPoolManager &poolManager) {
initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU2); initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU2);
poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, false); poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, true);
poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false); poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }

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

@ -107,9 +107,7 @@ enum Ids : lp_id_t {
PDU_VCC, PDU_VCC,
PDU_VBAT, PDU_VBAT,
PDU_TEMPERATURE, PDU_TEMPERATURE,
PDU_CONV_EN_1, PDU_CONV_EN,
PDU_CONV_EN_2,
PDU_CONV_EN_3,
PDU_OUT_ENABLE, PDU_OUT_ENABLE,
PDU_BOOTCAUSE, PDU_BOOTCAUSE,
PDU_BOOTCNT, PDU_BOOTCNT,
@ -430,12 +428,8 @@ class PduAuxHk : public StaticLocalDataSet<36> {
lp_var_t<int16_t> vbat = lp_var_t<int16_t>(sid.objectId, P60System::pool::PDU_VBAT, this); lp_var_t<int16_t> vbat = lp_var_t<int16_t>(sid.objectId, P60System::pool::PDU_VBAT, this);
/** Output converter enable status */ /** Output converter enable status */
lp_var_t<uint8_t> converterEnable1 = lp_vec_t<uint8_t, 3> converterEnable =
lp_var_t<uint8_t>(sid.objectId, P60System::pool::PDU_CONV_EN_1, this); lp_vec_t<uint8_t, 3>(sid.objectId, P60System::pool::PDU_CONV_EN, this);
lp_var_t<uint8_t> converterEnable2 =
lp_var_t<uint8_t>(sid.objectId, P60System::pool::PDU_CONV_EN_2, this);
lp_var_t<uint8_t> converterEnable3 =
lp_var_t<uint8_t>(sid.objectId, P60System::pool::PDU_CONV_EN_3, this);
lp_var_t<uint32_t> bootcause = lp_var_t<uint32_t> bootcause =
lp_var_t<uint32_t>(sid.objectId, P60System::pool::PDU_BOOTCAUSE, this); lp_var_t<uint32_t>(sid.objectId, P60System::pool::PDU_BOOTCAUSE, this);

2
tmtc

@ -1 +1 @@
Subproject commit c995ca2ddac4b352bce34071366a8cee7724973a Subproject commit ecb973c37fe43954d0be1f19b0735b3546d2ef1b