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

Fix for Current Calculation in PWR Ctrl #880

Merged
meggert merged 2 commits from fix-soc into main 2024-03-21 09:14:55 +01:00
Conversation 0 Commits 2 Files Changed 2 +5 -1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:
# [unreleased] # [unreleased]
## Fixed
- Fixed wrong sign in calculation of total current within the `PWR Controller`.
# [v7.7.3] 2024-03-18 # [v7.7.3] 2024-03-18
- Bumped `eive-fsfw` - Bumped `eive-fsfw`

2
mission/controller/PowerController.cpp
View File

@ -182,7 +182,7 @@ void PowerController::calculateStateOfCharge() {
} }
// calculate total battery current // calculate total battery current
iBat = p60CoreHk.batteryCurrent.value + bpxBatteryHk.dischargeCurrent.value; iBat = p60CoreHk.batteryCurrent.value - bpxBatteryHk.dischargeCurrent.value;
result = calculateOpenCircuitVoltageCharge(); result = calculateOpenCircuitVoltageCharge();
if (result != returnvalue::OK) { if (result != returnvalue::OK) {