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

Merge branch 'main' into improve-dev-fdir
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
Details

Browse Source
This commit is contained in:
Robin Müller 2024-04-10 11:30:15 +02:00
commit addfadddb6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -26,6 +26,12 @@ will consitute of a breaking change warranting a new major release:
- Reverted lower OP limit of `PLOC` to -10°C. - Reverted lower OP limit of `PLOC` to -10°C.
- All pointing laws are now allowed to use the `MEKF` per default. - All pointing laws are now allowed to use the `MEKF` per default.
- Changed limits in `PWR Controller`.
- PUS time service: Now dumps the time before and after relative timeshift or setting absolute time
## Added
- PUS timeservice relative timeshift.
# [v7.7.4] 2024-03-21 # [v7.7.4] 2024-03-21
@ -33,16 +39,11 @@ will consitute of a breaking change warranting a new major release:
- Rotational rate limit for the GS target pointing is now seperated from controller limit. It - Rotational rate limit for the GS target pointing is now seperated from controller limit. It
is also reduced to 0.75°/s now. is also reduced to 0.75°/s now.
- PUS time service: Now dumps the time before and after relative timeshift or setting absolute time
## Fixed ## Fixed
- Fixed wrong sign in calculation of total current within the `PWR Controller`. - Fixed wrong sign in calculation of total current within the `PWR Controller`.
## Added
- PUS timeservice relative timeshift.
# [v7.7.3] 2024-03-18 # [v7.7.3] 2024-03-18
- Bumped `eive-fsfw` - Bumped `eive-fsfw`

6
mission/controller/PowerController.h
View File

@ -57,9 +57,9 @@ class PowerController : public ExtendedControllerBase, public ReceivesParameterM
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]
float payloadOpLimitOn = 0.90; // [%] float payloadOpLimitOn = 0.80; // [%]
float payloadOpLimitLow = 0.75; // [%] float payloadOpLimitLow = 0.65; // [%]
float higherModesLimit = 0.6; // [%] float higherModesLimit = 0.60; // [%]
// OCV Look-up-Table {[Ah],[V]} // OCV Look-up-Table {[Ah],[V]}
static constexpr uint8_t LOOK_UP_TABLE_MAX_IDX = 99; static constexpr uint8_t LOOK_UP_TABLE_MAX_IDX = 99;