diff --git a/mission/controller/PowerController.cpp b/mission/controller/PowerController.cpp index b1b94d61..7b7db9e8 100644 --- a/mission/controller/PowerController.cpp +++ b/mission/controller/PowerController.cpp @@ -54,7 +54,7 @@ ReturnValue_t PowerController::getParameter(uint8_t domainId, uint8_t parameterI coulombCounterVoltageUpperThreshold = oldCoulombCounterVoltageUpperThreshold; return result; } - // parameterWrapper->set(coulombCounterVoltageUpperThreshold); + parameterWrapper->set(coulombCounterVoltageUpperThreshold); break; } case 0x3: @@ -235,11 +235,6 @@ void PowerController::calculateStateOfCharge() { } void PowerController::watchStateOfCharge() { - if (test < 100) { - test++; - } else if (test == 100) { - // pwrCtrlCoreHk.coulombCounterCharge.value = 0.7; - } if (pwrCtrlCoreHk.coulombCounterCharge.isValid()) { if (pwrCtrlCoreHk.coulombCounterCharge.value < payloadOpLimitOn) { PoolReadGuard pg(&enablePl); diff --git a/mission/controller/PowerController.h b/mission/controller/PowerController.h index e57a7858..1f27616d 100644 --- a/mission/controller/PowerController.h +++ b/mission/controller/PowerController.h @@ -24,8 +24,6 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM uint16_t startAtIndex) override; private: - int test = 0; - bool enableHkSets = false; ParameterHelper parameterHelper; @@ -58,7 +56,7 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM float batteryInternalResistance = 70.0 / 2.0 / 1000.0; // [Ohm] float batteryMaximumCapacity = 2.6 * 2; // [Ah] float coulombCounterVoltageUpperThreshold = 16.2; // [V] - double maxAllowedTimeDiff = 0.5; // [s] + double maxAllowedTimeDiff = 1.5; // [s] float payloadOpLimitOn = 0.90; // [%] float payloadOpLimitLow = 0.75; // [%] float higherModesLimit = 0.6; // [%]