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

SoC Calculator #754

Merged
muellerr merged 74 commits from soc-calculator into main 2023-10-11 10:50:48 +02:00
Conversation 1 Commits 74 Files Changed 52 -15
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09951edbba - Show all commits

12
mission/controller/PowerController.cpp
View File

@ -250,18 +250,6 @@ ReturnValue_t PowerController::updateEpsData() {
PoolReadGuard pgP60(&p60CoreHk); PoolReadGuard pgP60(&p60CoreHk);
results.push_back(pgP60.getReadResult()); results.push_back(pgP60.getReadResult());
} }
{
PoolReadGuard pgPdu1(&pdu1CoreHk);
results.push_back(pgPdu1.getReadResult());
}
{
PoolReadGuard pgPdu2(&pdu2CoreHk);
results.push_back(pgPdu2.getReadResult());
}
{
PoolReadGuard pgAcu(&acuCoreHk);
results.push_back(pgAcu.getReadResult());
}
for (const auto &result : results) { for (const auto &result : results) {
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;

3
mission/controller/PowerController.h
View File

@ -111,9 +111,6 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM
// HK Datasets for Calculation // HK Datasets for Calculation
BpxBatteryHk bpxBatteryHk = BpxBatteryHk(objects::BPX_BATT_HANDLER); BpxBatteryHk bpxBatteryHk = BpxBatteryHk(objects::BPX_BATT_HANDLER);
P60Dock::CoreHkSet p60CoreHk = P60Dock::CoreHkSet(objects::P60DOCK_HANDLER); P60Dock::CoreHkSet p60CoreHk = P60Dock::CoreHkSet(objects::P60DOCK_HANDLER);
PDU1::Pdu1CoreHk pdu1CoreHk = PDU1::Pdu1CoreHk(objects::PDU1_HANDLER);
PDU2::Pdu2CoreHk pdu2CoreHk = PDU2::Pdu2CoreHk(objects::PDU2_HANDLER);
ACU::CoreHk acuCoreHk = ACU::CoreHk(objects::ACU_HANDLER);
// Output Dataset // Output Dataset
pwrctrl::CoreHk pwrCtrlCoreHk; pwrctrl::CoreHk pwrCtrlCoreHk;
}; };