merge aftermath
This commit is contained in:
parent
37673a2782
commit
ba0e07b5c6
@ -122,8 +122,8 @@ ReturnValue_t SafeCtrl::safeNoMekf(timeval now, double *susDirB, bool susDirBVal
|
||||
VectorOperations<double>::subtract(estSatRate, satRateRef, diffRate, 3);
|
||||
|
||||
// Torque Align calculation
|
||||
double kRateNoMekf = acsParameters->safeModeControllerParameters->k_rate_no_mekf;
|
||||
double kAlignNoMekf = acsParameters->safeModeControllerParameters->k_align_no_mekf;
|
||||
double kRateNoMekf = acsParameters->safeModeControllerParameters.k_rate_no_mekf;
|
||||
double kAlignNoMekf = acsParameters->safeModeControllerParameters.k_align_no_mekf;
|
||||
|
||||
double cosAngleAlignErr = VectorOperations<double>::dot(sunDirRef, susDirB);
|
||||
double crossSusSunRef[3] = {0, 0, 0};
|
||||
|
Loading…
Reference in New Issue
Block a user