From 6ca1dda807f16c03d4887528f3fbfabd014c2a6b Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 5 Feb 2024 09:39:35 +0100 Subject: [PATCH] fix my ocd --- mission/controller/AcsController.cpp | 2 +- mission/controller/acs/Guidance.cpp | 2 +- mission/controller/acs/Guidance.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index 67596fc9..f5f246c2 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -420,7 +420,7 @@ void AcsController::performPointingCtrl() { switch (mode) { case acs::PTG_IDLE: - guidance.targetQuatPtgIdle(timeDelta, timeAbsolute, susDataProcessed.sunIjkModel.value, + guidance.targetQuatPtgIdle(timeAbsolute, timeDelta, susDataProcessed.sunIjkModel.value, gpsDataProcessed.gpsPosition.value, targetQuat, targetSatRotRate); guidance.comparePtg(quatBI, rotRateB, targetQuat, targetSatRotRate, errorQuat, errorSatRotRate, errorAngle); diff --git a/mission/controller/acs/Guidance.cpp b/mission/controller/acs/Guidance.cpp index e4e9ccab..3641e41e 100644 --- a/mission/controller/acs/Guidance.cpp +++ b/mission/controller/acs/Guidance.cpp @@ -4,7 +4,7 @@ Guidance::Guidance(AcsParameters *acsParameters_) { acsParameters = acsParameter Guidance::~Guidance() {} -void Guidance::targetQuatPtgIdle(const double timeDelta, timeval timeAbsolute, +void Guidance::targetQuatPtgIdle(timeval timeAbsolute, const double timeDelta, const double sunDirI[3], const double posSatF[4], double targetQuat[4], double targetSatRotRate[3]) { // positive z-Axis of EIVE in direction of sun diff --git a/mission/controller/acs/Guidance.h b/mission/controller/acs/Guidance.h index 973c0bd3..9835b762 100644 --- a/mission/controller/acs/Guidance.h +++ b/mission/controller/acs/Guidance.h @@ -25,7 +25,7 @@ class Guidance { ReturnValue_t solarArrayDeploymentComplete(); void resetValues(); - void targetQuatPtgIdle(const double timeDelta, timeval timeAbsolute, const double sunDirI[3], + void targetQuatPtgIdle(timeval timeAbsolute, const double timeDelta, const double sunDirI[3], const double posSatF[4], double targetQuat[4], double targetSatRotRate[3]); void targetQuatPtgTarget(timeval timeAbsolute, const double timeDelta, double posSatF[3], double velSatE[3], double quatIX[4], double targetSatRotRate[3]);