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

Small bugfix for Power CTRL set handling #804

Merged
meggert merged 3 commits from power-ctrl-custom-tranisition into main 2023-10-16 16:38:59 +02:00
Conversation 1 Commits 3 Files Changed 2 +6 -13
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0cafedda7 - Show all commits

18
mission/controller/PowerController.cpp
View File

@ -100,15 +100,16 @@ void PowerController::performControlOperation() {
return;
}
case InternalState::READY: {
if (mode != MODE_NORMAL) {
PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) {
enablePl.setValidity(false, true);
}
}
if (mode != MODE_OFF) {
calculateStateOfCharge();
if (mode == MODE_NORMAL) {
watchStateOfCharge();
} else {
PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) {
enablePl.setValidity(false, true);
}
}
}
break;
@ -370,10 +371,3 @@ ReturnValue_t PowerController::calculateCoulombCounterChargeUpperThreshold() {
lookUpTableOcv[0][lookUpTableIdx + 1]);
return returnvalue::OK;
}
void PowerController::startTransition(Mode_t mode, Submode_t submode) {
if (mode == MODE_OFF) {
enablePl.setValidity(false, true);
}
ControllerBase::startTransition(mode, submode);
}

1
mission/controller/PowerController.h
View File

@ -22,7 +22,6 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM
ReturnValue_t getParameter(uint8_t domainId, uint8_t parameterId,
ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues,
uint16_t startAtIndex) override;
void startTransition(Mode_t mode, Submode_t submode) override;
private:
bool enableHkSets = false;