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

removed HasReturnValuesIF
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Marius Eggert 2022-09-26 10:39:57 +02:00
parent 2ede1ed27c
commit 96bbde7bbc
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mission/controller/acs/MultiplicativeKalmanFilter.cpp
View File

@ -10,7 +10,6 @@
#include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h> #include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h> #include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h> #include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h>
#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
#include "MultiplicativeKalmanFilter.h" #include "MultiplicativeKalmanFilter.h"
#include <acs/util/CholeskyDecomposition.h> #include <acs/util/CholeskyDecomposition.h>
#include <acs/util/MathOperations.h> #include <acs/util/MathOperations.h>
@ -300,7 +299,7 @@ ReturnValue_t MultiplicativeKalmanFilter::mekfEst(
else{ else{
sensorsAvail = 8; //no measurements sensorsAvail = 8; //no measurements
validMekf = false; validMekf = false;
return RETURN_FAILED; return returnvalue::FAILED;
} }
// If we are here, MEKF will perform // If we are here, MEKF will perform
@ -1201,5 +1200,5 @@ ReturnValue_t MultiplicativeKalmanFilter::mekfEst(
// Check for new data in measurement -> SensorProcessing ? // Check for new data in measurement -> SensorProcessing ?
return RETURN_OK; return returnvalue::OK;
} }

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

@ -21,7 +21,7 @@
#include "AcsParameters.h" #include "AcsParameters.h"
class MultiplicativeKalmanFilter : public HasReturnvaluesIF { class MultiplicativeKalmanFilter{
public: public:
/* @brief: Constructor /* @brief: Constructor
* @param: acsParameters_ Pointer to object which defines the ACS configuration parameters * @param: acsParameters_ Pointer to object which defines the ACS configuration parameters

5
mission/controller/acs/control/PtgCtrl.h
View File

@ -19,11 +19,10 @@
#include <acs/SensorValues.h> #include <acs/SensorValues.h>
#include <acs/OutputValues.h> #include <acs/OutputValues.h>
#include <acs/AcsParameters.h> #include <acs/AcsParameters.h>
#include "acs/config/classIds.h" #include <acs/config/classIds.h>
#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
#include <time.h> #include <time.h>
class PtgCtrl : public HasReturnvaluesIF { class PtgCtrl{
public: public:
/* @brief: Constructor /* @brief: Constructor

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

@ -17,7 +17,7 @@
#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
#include <time.h> #include <time.h>
class SafeCtrl : public HasReturnvaluesIF { class SafeCtrl{
public: public: