eive/eive-obsw
eive
/
eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests 1 Releases 117 Wiki Activity

quat is always valid even if it shouldn't be
EIVE/eive-obsw/pipeline/head Build started... Details

This commit is contained in:
Marius Eggert 2023-12-18 09:33:46 +01:00
parent e51dd33d82
commit 9089569b93
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mission/controller/AcsController.cpp
View File

@ -380,8 +380,10 @@ void AcsController::performDetumble() {
}
void AcsController::performPointingCtrl() {
bool strValid = (sensorValues.strSet.caliQw.isValid() and sensorValues.strSet.caliQx.isValid() and
sensorValues.strSet.caliQy.isValid() and sensorValues.strSet.caliQz.isValid());
bool strValid =
((sensorValues.strSet.caliQw.isValid() and sensorValues.strSet.caliQx.isValid() and
sensorValues.strSet.caliQy.isValid() and sensorValues.strSet.caliQz.isValid()) and
(sensorValues.strSet.isTrustWorthy.isValid() and sensorValues.strSet.isTrustWorthy.value));
uint8_t useMekf = false;
switch (mode) {
case acs::PTG_IDLE:

6
mission/controller/acs/FusedRotationEstimation.cpp
View File

@ -73,8 +73,10 @@ void FusedRotationEstimation::estimateFusedRotationRate(
void FusedRotationEstimation::estimateFusedRotationRateStr(
ACS::SensorValues *sensorValues, const double timeDelta,
acsctrl::FusedRotRateSourcesData *fusedRotRateSourcesData) {
if (not(sensorValues->strSet.caliQw.isValid() and sensorValues->strSet.caliQx.isValid() and
sensorValues->strSet.caliQy.isValid() and sensorValues->strSet.caliQz.isValid())) {
if (not((sensorValues->strSet.caliQw.isValid() and sensorValues->strSet.caliQx.isValid() and
sensorValues->strSet.caliQy.isValid() and sensorValues->strSet.caliQz.isValid()) and
(sensorValues->strSet.isTrustWorthy.isValid() and
sensorValues->strSet.isTrustWorthy.value))) {
{
PoolReadGuard pg(fusedRotRateSourcesData);
if (pg.getReadResult() == returnvalue::OK) {