This commit is contained in:
parent
84ba6262a8
commit
e7dc9cddfd
@ -483,9 +483,8 @@ void AcsController::performPointingCtrl() {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case acs::PTG_NADIR:
|
case acs::PTG_NADIR:
|
||||||
guidance.targetQuatPtgNadirTarget(timeAbsolute, timeDelta, gpsDataProcessed.gpsPosition.value,
|
guidance.targetQuatPtgNadir(timeAbsolute, timeDelta, gpsDataProcessed.gpsPosition.value,
|
||||||
gpsDataProcessed.gpsVelocity.value, targetQuat,
|
gpsDataProcessed.gpsVelocity.value, targetQuat, targetSatRotRate);
|
||||||
targetSatRotRate);
|
|
||||||
guidance.comparePtg(quatBI, rotRateB, targetQuat, targetSatRotRate,
|
guidance.comparePtg(quatBI, rotRateB, targetQuat, targetSatRotRate,
|
||||||
acsParameters.nadirModeControllerParameters.quatRef,
|
acsParameters.nadirModeControllerParameters.quatRef,
|
||||||
acsParameters.nadirModeControllerParameters.refRotRate, errorQuat,
|
acsParameters.nadirModeControllerParameters.refRotRate, errorQuat,
|
||||||
|
@ -141,9 +141,8 @@ void Guidance::targetQuatPtgGs(timeval timeAbsolute, const double timeDelta, dou
|
|||||||
targetRotationRate(timeDelta, targetQuat, targetSatRotRate);
|
targetRotationRate(timeDelta, targetQuat, targetSatRotRate);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Guidance::targetQuatPtgNadirTarget(timeval timeAbsolute, const double timeDelta,
|
void Guidance::targetQuatPtgNadir(timeval timeAbsolute, const double timeDelta, double posSatE[3],
|
||||||
double posSatE[3], double velSatE[3], double targetQuat[4],
|
double velSatE[3], double targetQuat[4], double refSatRate[3]) {
|
||||||
double refSatRate[3]) {
|
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
// Calculation of target quaternion for Nadir pointing
|
// Calculation of target quaternion for Nadir pointing
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
|
@ -31,8 +31,8 @@ class Guidance {
|
|||||||
double velSatE[3], double quatIX[4], double targetSatRotRate[3]);
|
double velSatE[3], double quatIX[4], double targetSatRotRate[3]);
|
||||||
void targetQuatPtgGs(timeval timeAbsolute, const double timeDelta, double posSatF[3],
|
void targetQuatPtgGs(timeval timeAbsolute, const double timeDelta, double posSatF[3],
|
||||||
double sunDirI[3], double quatIX[4], double targetSatRotRate[3]);
|
double sunDirI[3], double quatIX[4], double targetSatRotRate[3]);
|
||||||
void targetQuatPtgNadirTarget(timeval timeAbsolute, const double timeDelta, double posSatF[3],
|
void targetQuatPtgNadir(timeval timeAbsolute, const double timeDelta, double posSatF[3],
|
||||||
double velSatF[3], double targetQuat[4], double refSatRate[3]);
|
double velSatF[3], double targetQuat[4], double refSatRate[3]);
|
||||||
|
|
||||||
void targetRotationRate(const double timeDelta, double quatInertialTarget[4],
|
void targetRotationRate(const double timeDelta, double quatInertialTarget[4],
|
||||||
double *targetSatRotRate);
|
double *targetSatRotRate);
|
||||||
|
Loading…
Reference in New Issue
Block a user