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

ACS Ctrl Bug Bash #439

Merged
muellerr merged 42 commits from acs-bug-bash into develop 2023-03-10 19:21:19 +01:00
Conversation 1 Commits 42 Files Changed 23 +3303 -6643
183 changed files with 3303 additions and 6643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 309358f447 - Show all commits

5
CHANGELOG.md
View File

@ -22,7 +22,10 @@ will consitute of a breaking change warranting a new major release:
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/400 PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/400
- Several `AcsController` components had their own implementation of `AcsParameters`. This resulted - Several `AcsController` components had their own implementation of `AcsParameters`. This resulted
in those parameters not being updated, while the actual ones were updated. All instances of in those parameters not being updated, while the actual ones were updated. All instances of
`AcsParameters` not belonging to `AcsController` are removed now. `AcsParameters` not belonging to `AcsController` are eiter removed or replaced by pointer
instances.
- Instead of updating the `gsTargetModeControllerParameters`, the `targetModeControllerParameters`
were updated.
# [v1.32.0] # [v1.32.0]

34
mission/controller/acs/AcsParameters.cpp
View File

@ -445,52 +445,46 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
case (0xB): // GsTargetModeControllerParameters case (0xB): // GsTargetModeControllerParameters
switch (parameterId) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(targetModeControllerParameters.zeta); parameterWrapper->set(gsTargetModeControllerParameters.zeta);
break; break;
case 0x1: case 0x1:
parameterWrapper->set(targetModeControllerParameters.om); parameterWrapper->set(gsTargetModeControllerParameters.om);
break; break;
case 0x2: case 0x2:
parameterWrapper->set(targetModeControllerParameters.omMax); parameterWrapper->set(gsTargetModeControllerParameters.omMax);
break; break;
case 0x3: case 0x3:
parameterWrapper->set(targetModeControllerParameters.qiMin); parameterWrapper->set(gsTargetModeControllerParameters.qiMin);
break; break;
case 0x4: case 0x4:
parameterWrapper->set(targetModeControllerParameters.gainNullspace); parameterWrapper->set(gsTargetModeControllerParameters.gainNullspace);
break; break;
case 0x5: case 0x5:
parameterWrapper->setVector(targetModeControllerParameters.desatMomentumRef); parameterWrapper->setVector(gsTargetModeControllerParameters.desatMomentumRef);
break; break;
case 0x6: case 0x6:
parameterWrapper->set(targetModeControllerParameters.deSatGainFactor); parameterWrapper->set(gsTargetModeControllerParameters.deSatGainFactor);
break; break;
case 0x7: case 0x7:
parameterWrapper->set(targetModeControllerParameters.desatOn); parameterWrapper->set(gsTargetModeControllerParameters.desatOn);
break; break;
case 0x8: case 0x8:
parameterWrapper->set(targetModeControllerParameters.enableAntiStiction); parameterWrapper->set(gsTargetModeControllerParameters.enableAntiStiction);
break; break;
case 0x9: case 0x9:
parameterWrapper->setVector(targetModeControllerParameters.refDirection); parameterWrapper->setVector(gsTargetModeControllerParameters.refDirection);
break; break;
case 0xA: case 0xA:
parameterWrapper->setVector(targetModeControllerParameters.refRotRate); parameterWrapper->set(gsTargetModeControllerParameters.timeElapsedMax);
break; break;
case 0xB: case 0xB:
parameterWrapper->setVector(targetModeControllerParameters.quatRef); parameterWrapper->set(gsTargetModeControllerParameters.latitudeTgt);
break; break;
case 0xC: case 0xC:
parameterWrapper->set(targetModeControllerParameters.timeElapsedMax); parameterWrapper->set(gsTargetModeControllerParameters.longitudeTgt);
break; break;
case 0xD: case 0xD:
parameterWrapper->set(targetModeControllerParameters.latitudeTgt); parameterWrapper->set(gsTargetModeControllerParameters.altitudeTgt);
break;
case 0xE:
parameterWrapper->set(targetModeControllerParameters.longitudeTgt);
break;
case 0xF:
parameterWrapper->set(targetModeControllerParameters.altitudeTgt);
break; break;
default: default:
return INVALID_IDENTIFIER_ID; return INVALID_IDENTIFIER_ID;