ACS Ptg Ctrl Fixes #643

Merged
muellerr merged 35 commits from acs-ptg-ctrl-fixes-2 into v3.0.0-dev 2023-06-07 11:49:10 +02:00
Owner
No description provided.
meggert added this to the v3.0.0 milestone 2023-05-23 15:37:48 +02:00
meggert added 17 commits 2023-05-23 15:37:50 +02:00
meggert added 1 commit 2023-05-26 09:57:28 +02:00
fixed error angle being calculated but not returned
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
de18ebfbe0
muellerr changed target branch from v2.1.0-dev to v3.0.0-dev 2023-05-31 10:33:58 +02:00
meggert added 1 commit 2023-06-01 09:11:48 +02:00
Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2
Some checks failed
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
ffe419e1ab
meggert added 2 commits 2023-06-01 09:36:50 +02:00
frmt
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
3750f1ac57
meggert added 1 commit 2023-06-01 16:05:03 +02:00
fixed RW scale for angular momentum calculation
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
c6664c5cbf
meggert added 1 commit 2023-06-01 17:11:53 +02:00
another RW speed scaling fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
0fe7b256ec
meggert added 1 commit 2023-06-02 09:36:10 +02:00
fixed more abs
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
4aca7a91e3
meggert added 1 commit 2023-06-02 11:02:30 +02:00
this shouldnt be needed
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
f8d9925785
meggert added 1 commit 2023-06-02 13:29:05 +02:00
fixed calculation of rotational rate for ptgCtrl which also is used for idle now
Some checks failed
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
bd15d7b0e2
meggert added 1 commit 2023-06-02 13:29:29 +02:00
frmt
Some checks failed
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
487b6bf690
meggert added 1 commit 2023-06-02 14:22:25 +02:00
fixed nullspace rwSpd range
Some checks failed
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
c64ea7f7e6
meggert added 1 commit 2023-06-02 17:38:06 +02:00
who needs comments anyways
Some checks failed
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
099eb488ae
meggert added 1 commit 2023-06-02 17:41:30 +02:00
small fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
a58f51ee91
meggert added 1 commit 2023-06-02 17:45:12 +02:00
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
6915f0e003
meggert changed title from WIP: ACS Ptg Ctrl Fixes to ACS Ptg Ctrl Fixes 2023-06-02 18:00:12 +02:00
meggert requested review from muellerr 2023-06-02 18:00:22 +02:00
muellerr added 1 commit 2023-06-06 11:13:42 +02:00
Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
7d1b99c3f4
muellerr reviewed 2023-06-06 11:20:02 +02:00
@ -379,3 +379,3 @@
break;
case 0x5:
parameterWrapper->setVector(idleModeControllerParameters.desatMomentumRef);
parameterWrapper->set(idleModeControllerParameters.nullspaceSpeed);
Owner

This looks like something which can break the MIB. Can it? If it does, I'd still be okay with this for v3.0.0 if the current MIB is not able to manipulate the parameter anyway.

This looks like something which can break the MIB. Can it? If it does, I'd still be okay with this for v3.0.0 if the current MIB is not able to manipulate the parameter anyway.
Owner

after discussion: The operator manually specifies the parameter ID, so a release into v3.0.0 is okay.

after discussion: The operator manually specifies the parameter ID, so a release into v3.0.0 is okay.
muellerr reviewed 2023-06-06 11:22:30 +02:00
@ -34,0 +25,4 @@
const double sampleTime, const double inertiaWheel,
const int32_t maxRwSpeed, const double *rwTorque,
int32_t *rwCmdSpeed) {
// concentrate RW speed values (in 0.1 [RPM]) in vector
Owner

gather or group would probably be a better word here

gather or group would probably be a better word here
Author
Owner

fixed

fixed
muellerr reviewed 2023-06-06 11:25:52 +02:00
@ -531,10 +518,6 @@ ReturnValue_t Guidance::getDistributionMatrixRw(ACS::SensorValues *sensorValues,
std::memcpy(rwPseudoInv, acsParameters->rwMatrices.without4, 12 * sizeof(double));
return returnvalue::OK;
} else {
// @note: This one takes the normal pseudoInverse of all four raction wheels valid.
Owner

Comment not necessary anymore: This can not happen anymore?

Comment not necessary anymore: This can not happen anymore?
Author
Owner

This could happen, which is why a rtval::FAILED is returned. This will then instantly return performPointingCtrl(), i. e. the controller will not calculate anything or command anything. Therefore, the discussion in this comment is purely academic and not needed.
Also, I would hope the RW FDIR catches this before it gets to here, as a fallback to safe is needed. We could also use the triggered event to set the RW Ass to faulty, if we wanted to.

This could happen, which is why a rtval::FAILED is returned. This will then instantly return performPointingCtrl(), i. e. the controller will not calculate anything or command anything. Therefore, the discussion in this comment is purely academic and not needed. Also, I would hope the RW FDIR catches this before it gets to here, as a fallback to safe is needed. We could also use the triggered event to set the RW Ass to faulty, if we wanted to.
meggert added 2 commits 2023-06-07 09:21:27 +02:00
muellerr added 1 commit 2023-06-07 11:48:01 +02:00
Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
376c359d6e
muellerr approved these changes 2023-06-07 11:49:02 +02:00
muellerr merged commit de35764ede into v3.0.0-dev 2023-06-07 11:49:10 +02:00
muellerr deleted branch acs-ptg-ctrl-fixes-2 2023-06-07 11:49:11 +02:00
Sign in to join this conversation.
No description provided.