Merge branch 'main' into prep_v7.2.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good

This commit is contained in:
Robin Müller 2023-10-30 10:32:12 +01:00
commit 37853f8fe2
2 changed files with 8 additions and 7 deletions

View File

@ -61,6 +61,7 @@ will consitute of a breaking change warranting a new major release:
- SUS FDIR should now trigger less events. The finish event is now only triggered once the - SUS FDIR should now trigger less events. The finish event is now only triggered once the
SUS has been working properly for a minute again. It will then display the number of periods SUS has been working properly for a minute again. It will then display the number of periods
during which the SUS was not working as well as the maximum amount of invalid messages. during which the SUS was not working as well as the maximum amount of invalid messages.
- Updated battery internal resistance to new value
# [v7.1.0] 2023-10-11 # [v7.1.0] 2023-10-11

View File

@ -53,7 +53,7 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM
ReturnValue_t calculateCoulombCounterChargeUpperThreshold(); ReturnValue_t calculateCoulombCounterChargeUpperThreshold();
// Parameters // Parameters
float batteryInternalResistance = 70.0 / 2.0 / 1000.0; // [Ohm] float batteryInternalResistance = 0.06798200367; // [Ohm]
float batteryMaximumCapacity = 2.6 * 2; // [Ah] float batteryMaximumCapacity = 2.6 * 2; // [Ah]
float coulombCounterVoltageUpperThreshold = 16.2; // [V] float coulombCounterVoltageUpperThreshold = 16.2; // [V]
double maxAllowedTimeDiff = 1.5; // [s] double maxAllowedTimeDiff = 1.5; // [s]