eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

PTG Something #856

Merged
meggert merged 9 commits from fix-your-rfs into main 2024-02-05 10:08:03 +01:00
Conversation 0 Commits 9 Files Changed 4 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ca1dda807 - Show all commits

2
mission/controller/AcsController.cpp
View File

@ -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);

2
mission/controller/acs/Guidance.cpp
View File

@ -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

2
mission/controller/acs/Guidance.h
View File

@ -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]);