Merge pull request 'Small bugfix for Power CTRL set handling' (#804) from power-ctrl-custom-tranisition into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #804 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
This commit is contained in:
commit
b0f047d76e
@ -16,6 +16,11 @@ will consitute of a breaking change warranting a new major release:
|
|||||||
|
|
||||||
# [unreleased]
|
# [unreleased]
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
|
||||||
|
- PL Enable set of the power controller is now set to invalid properly
|
||||||
|
if the power controller is not in normal mode.
|
||||||
|
|
||||||
# [v7.1.0] 2023-10-11
|
# [v7.1.0] 2023-10-11
|
||||||
|
|
||||||
- Bumped `eive-tmtc` to v5.8.0.
|
- Bumped `eive-tmtc` to v5.8.0.
|
||||||
|
@ -100,16 +100,17 @@ void PowerController::performControlOperation() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case InternalState::READY: {
|
case InternalState::READY: {
|
||||||
if (mode != MODE_OFF) {
|
if (mode != MODE_NORMAL) {
|
||||||
calculateStateOfCharge();
|
|
||||||
if (mode == MODE_NORMAL) {
|
|
||||||
watchStateOfCharge();
|
|
||||||
} else {
|
|
||||||
PoolReadGuard pg(&enablePl);
|
PoolReadGuard pg(&enablePl);
|
||||||
if (pg.getReadResult() == returnvalue::OK) {
|
if (pg.getReadResult() == returnvalue::OK) {
|
||||||
enablePl.setValidity(false, true);
|
enablePl.setValidity(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (mode != MODE_OFF) {
|
||||||
|
calculateStateOfCharge();
|
||||||
|
if (mode == MODE_NORMAL) {
|
||||||
|
watchStateOfCharge();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user