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 +8 -3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9472faf899 - Show all commits

11
mission/controller/PowerController.cpp
View File

@ -98,6 +98,11 @@ void PowerController::performControlOperation() {
calculateStateOfCharge(); calculateStateOfCharge();
if (mode == MODE_NORMAL) { if (mode == MODE_NORMAL) {
watchStateOfCharge(); watchStateOfCharge();
} else {
PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) {
enablePl.setValidity(false, true);
}
} }
} }
break; break;
@ -229,13 +234,13 @@ void PowerController::watchStateOfCharge() {
PoolReadGuard pg(&enablePl); PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
enablePl.plUseAllowed.value = false; enablePl.plUseAllowed.value = false;
enablePl.plUseAllowed.setValid(true); enablePl.setValidity(true, true);
} }
} else { } else {
PoolReadGuard pg(&enablePl); PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
enablePl.plUseAllowed.value = true; enablePl.plUseAllowed.value = true;
enablePl.plUseAllowed.setValid(true); enablePl.setValidity(true, true);
} }
} }
if (not pwrLvlLowFlag and pwrCtrlCoreHk.coulombCounterCharge.value < payloadOpLimitLow) { if (not pwrLvlLowFlag and pwrCtrlCoreHk.coulombCounterCharge.value < payloadOpLimitLow) {
@ -254,7 +259,7 @@ void PowerController::watchStateOfCharge() {
PoolReadGuard pg(&enablePl); PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
enablePl.plUseAllowed.value = false; enablePl.plUseAllowed.value = false;
enablePl.plUseAllowed.setValid(true); enablePl.setValidity(true, true);
} }
} }
} }