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

Revert ACS Safe Mode Controller to FLP Design #466

Merged
muellerr merged 64 commits from acs-flp-safe into develop 2023-04-14 20:26:20 +02:00
Conversation 1 Commits 64 Files Changed 31 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9861772c38 - Show all commits

2
mission/controller/acs/control/SafeCtrl.cpp
View File

@ -124,7 +124,7 @@ void SafeCtrl::calculateRotationalRateTorque(const double *sunDirB, const double
// calculate torque for orthogonal rotational rate
double orthoFactor[3][3] = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
MatrixOperations<double>::multiplyScalar(*inertiaMatrix, gainOrtho, *orthoFactor, 3, 3);
MatrixOperations<double>::multiply(*orthoFactor, satRotRateOrthogonalB, cmdAlign, 3, 3, 1);
MatrixOperations<double>::multiply(*orthoFactor, satRotRateOrthogonalB, cmdOrtho, 3, 3, 1);
}
void SafeCtrl::calculateAngleErrorTorque(const double *sunDirB, const double *sunDirRefB,