From e7dc9cddfd17b033ac733319110dbc59cf00701b Mon Sep 17 00:00:00 2001 From: meggert Date: Fri, 2 Feb 2024 14:33:50 +0100 Subject: [PATCH] nadir target lul --- mission/controller/AcsController.cpp | 5 ++--- mission/controller/acs/Guidance.cpp | 5 ++--- mission/controller/acs/Guidance.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index 0c85560c..99d28d8b 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -483,9 +483,8 @@ void AcsController::performPointingCtrl() { break; case acs::PTG_NADIR: - guidance.targetQuatPtgNadirTarget(timeAbsolute, timeDelta, gpsDataProcessed.gpsPosition.value, - gpsDataProcessed.gpsVelocity.value, targetQuat, - targetSatRotRate); + guidance.targetQuatPtgNadir(timeAbsolute, timeDelta, gpsDataProcessed.gpsPosition.value, + gpsDataProcessed.gpsVelocity.value, targetQuat, targetSatRotRate); guidance.comparePtg(quatBI, rotRateB, targetQuat, targetSatRotRate, acsParameters.nadirModeControllerParameters.quatRef, acsParameters.nadirModeControllerParameters.refRotRate, errorQuat, diff --git a/mission/controller/acs/Guidance.cpp b/mission/controller/acs/Guidance.cpp index 7413265b..46d98599 100644 --- a/mission/controller/acs/Guidance.cpp +++ b/mission/controller/acs/Guidance.cpp @@ -141,9 +141,8 @@ void Guidance::targetQuatPtgGs(timeval timeAbsolute, const double timeDelta, dou targetRotationRate(timeDelta, targetQuat, targetSatRotRate); } -void Guidance::targetQuatPtgNadirTarget(timeval timeAbsolute, const double timeDelta, - double posSatE[3], double velSatE[3], double targetQuat[4], - double refSatRate[3]) { +void Guidance::targetQuatPtgNadir(timeval timeAbsolute, const double timeDelta, double posSatE[3], + double velSatE[3], double targetQuat[4], double refSatRate[3]) { //------------------------------------------------------------------------------------- // Calculation of target quaternion for Nadir pointing //------------------------------------------------------------------------------------- diff --git a/mission/controller/acs/Guidance.h b/mission/controller/acs/Guidance.h index 5afcf7b8..15e88cdc 100644 --- a/mission/controller/acs/Guidance.h +++ b/mission/controller/acs/Guidance.h @@ -31,8 +31,8 @@ class Guidance { double velSatE[3], double quatIX[4], double targetSatRotRate[3]); void targetQuatPtgGs(timeval timeAbsolute, const double timeDelta, double posSatF[3], double sunDirI[3], double quatIX[4], double targetSatRotRate[3]); - void targetQuatPtgNadirTarget(timeval timeAbsolute, const double timeDelta, double posSatF[3], - double velSatF[3], double targetQuat[4], double refSatRate[3]); + void targetQuatPtgNadir(timeval timeAbsolute, const double timeDelta, double posSatF[3], + double velSatF[3], double targetQuat[4], double refSatRate[3]); void targetRotationRate(const double timeDelta, double quatInertialTarget[4], double *targetSatRotRate);