diff --git a/CHANGELOG.md b/CHANGELOG.md index 85d63062..8202cea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,12 @@ will consitute of a breaking change warranting a new major release: # [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 ## Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index c9dfa157..5b8eb93e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 7) set(OBSW_VERSION_MINOR 5) -set(OBSW_VERSION_REVISION 4) +set(OBSW_VERSION_REVISION 5) # set(CMAKE_VERBOSE TRUE) diff --git a/mission/controller/acs/Guidance.cpp b/mission/controller/acs/Guidance.cpp index 0be636ad..10d1393c 100644 --- a/mission/controller/acs/Guidance.cpp +++ b/mission/controller/acs/Guidance.cpp @@ -418,7 +418,9 @@ void Guidance::comparePtg(double currentQuat[4], double currentSatRotRate[3], do double targetSatRotRate[3], double refQuat[4], double refSatRotRate[3], double errorQuat[4], double errorSatRotRate[3], double &errorAngle) { // 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 QuaternionOperations::multiply(refQuat, errorQuat, errorQuat); // Keep scalar part of quaternion positive