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

12
mission/controller/PowerController.cpp
View File

@ -1,4 +1,3 @@
#include <mission/controller/PowerController.h> #include <mission/controller/PowerController.h>
PowerController::PowerController(object_id_t objectId, bool enableHkSets) PowerController::PowerController(object_id_t objectId, bool enableHkSets)
@ -89,6 +88,9 @@ void PowerController::performControlOperation() {
// if (mode != MODE_OFF) { // if (mode != MODE_OFF) {
sif::debug << "oh shit, now i gotta do something" << std::endl; sif::debug << "oh shit, now i gotta do something" << std::endl;
calculateStateOfCharge(); calculateStateOfCharge();
if (mode == MODE_NORMAL) {
watchStateOfCharge();
}
// do something // do something
//} //}
break; break;
@ -204,9 +206,13 @@ void PowerController::calculateStateOfCharge() {
} }
} }
void PowerController::watchStateOfCharge() {
// ToDo: FDIR
}
ReturnValue_t PowerController::calculateOpenCircuitVoltageCharge() { ReturnValue_t PowerController::calculateOpenCircuitVoltageCharge() {
float vBatCorrected = p60CoreHk.batteryVoltage.value - iBat * batteryInternalResistance; float vBatCorrected = p60CoreHk.batteryVoltage.value - iBat * batteryInternalResistance;
uint8_t lookUpTableIdx = 99; uint8_t lookUpTableIdx = LOOK_UP_TABLE_MAX_IDX;
ReturnValue_t result = lookUpTableOcvIdxFinder(vBatCorrected, lookUpTableIdx); ReturnValue_t result = lookUpTableOcvIdxFinder(vBatCorrected, lookUpTableIdx);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
@ -289,7 +295,7 @@ ReturnValue_t PowerController::lookUpTableOcvIdxFinder(float voltage, uint8_t &i
} }
ReturnValue_t PowerController::calculateCoulombCounterChargeUpperThreshold() { ReturnValue_t PowerController::calculateCoulombCounterChargeUpperThreshold() {
uint8_t lookUpTableIdx = 99; uint8_t lookUpTableIdx = LOOK_UP_TABLE_MAX_IDX;
ReturnValue_t result = ReturnValue_t result =
lookUpTableOcvIdxFinder(coulombCounterVoltageUpperThreshold, lookUpTableIdx); lookUpTableOcvIdxFinder(coulombCounterVoltageUpperThreshold, lookUpTableIdx);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {

2
mission/controller/PowerController.h
View File

@ -43,6 +43,7 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM
void performControlOperation() override; void performControlOperation() override;
void calculateStateOfCharge(); void calculateStateOfCharge();
void watchStateOfCharge();
ReturnValue_t calculateOpenCircuitVoltageCharge(); ReturnValue_t calculateOpenCircuitVoltageCharge();
ReturnValue_t calculateCoulombCounterCharge(); ReturnValue_t calculateCoulombCounterCharge();
ReturnValue_t updateEpsData(); ReturnValue_t updateEpsData();
@ -58,6 +59,7 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM
double maxAllowedTimeDiff = 0.5; // [s] double maxAllowedTimeDiff = 0.5; // [s]
// OCV Look-up-Table // OCV Look-up-Table
static constexpr uint8_t LOOK_UP_TABLE_MAX_IDX = 99;
float lookUpTableOcv[2][100] = { float lookUpTableOcv[2][100] = {
{0.00000000e+00, 3.16227766e-04, 4.52809661e-04, 6.48382625e-04, 9.28425483e-04, {0.00000000e+00, 3.16227766e-04, 4.52809661e-04, 6.48382625e-04, 9.28425483e-04,
1.32942162e-03, 1.90361194e-03, 2.72580074e-03, 3.90310099e-03, 5.58888885e-03, 1.32942162e-03, 1.90361194e-03, 2.72580074e-03, 3.90310099e-03, 5.58888885e-03,