Merge pull request 'Target Quaternion Fix' (#847) from target-quaternion-fix into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #847 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
This commit is contained in:
commit
a71c12c9ce
@ -16,6 +16,12 @@ will consitute of a breaking change warranting a new major release:
|
|||||||
|
|
||||||
# [unreleased]
|
# [unreleased]
|
||||||
|
|
||||||
|
# [v7.5.5] 2024-01-22
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
|
||||||
|
- Calculation of error quaternion was done with inverse of the required target quaternion.
|
||||||
|
|
||||||
# [v7.5.4] 2024-01-16
|
# [v7.5.4] 2024-01-16
|
||||||
|
|
||||||
## Fixed
|
## Fixed
|
||||||
|
@ -418,7 +418,9 @@ void Guidance::comparePtg(double currentQuat[4], double currentSatRotRate[3], do
|
|||||||
double targetSatRotRate[3], double refQuat[4], double refSatRotRate[3],
|
double targetSatRotRate[3], double refQuat[4], double refSatRotRate[3],
|
||||||
double errorQuat[4], double errorSatRotRate[3], double &errorAngle) {
|
double errorQuat[4], double errorSatRotRate[3], double &errorAngle) {
|
||||||
// First calculate error quaternion between current and target orientation
|
// First calculate error quaternion between current and target orientation
|
||||||
QuaternionOperations::multiply(currentQuat, targetQuat, errorQuat);
|
double invTargetQuat[4] = {0, 0, 0, 0};
|
||||||
|
QuaternionOperations::inverse(targetQuat, invTargetQuat);
|
||||||
|
QuaternionOperations::multiply(currentQuat, invTargetQuat, errorQuat);
|
||||||
// Last calculate add rotation from reference quaternion
|
// Last calculate add rotation from reference quaternion
|
||||||
QuaternionOperations::multiply(refQuat, errorQuat, errorQuat);
|
QuaternionOperations::multiply(refQuat, errorQuat, errorQuat);
|
||||||
// Keep scalar part of quaternion positive
|
// Keep scalar part of quaternion positive
|
||||||
|
Loading…
Reference in New Issue
Block a user