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

amended includes. removed links to HasParametersIF
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Marius Eggert 2022-09-20 15:06:05 +02:00
parent 7885205a07
commit 5ebdc9e767
12 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
class AcsParameters:public HasParametersIF{ class AcsParameters/*:public HasParametersIF*/{
public: public:
AcsParameters(); AcsParameters();

14
mission/controller/acs/ActuatorCmd.cpp
View File

@ -6,14 +6,14 @@
*/ */
#include "ActuatorCmd.h" #include <ActuatorCmd.h>
#include <math.h> #include <cmath>
#include <acs/util/MathOperations.h> #include <acs/util/MathOperations.h>
#include <fsfw/src/fsfw/globalfunctions/constants.h> #include <fsfw/globalfunctions/constants.h>
#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h> #include <fsfw/globalfunctions/math/VectorOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h> #include <fsfw/globalfunctions/math/MatrixOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h> #include <fsfw/globalfunctions/math/QuaternionOperations.h>
#include <acs/util/CholeskyDecomposition.h> #include <util/CholeskyDecomposition.h>
ActuatorCmd::ActuatorCmd(AcsParameters *acsParameters_) { ActuatorCmd::ActuatorCmd(AcsParameters *acsParameters_) {
acsParameters = *acsParameters_; acsParameters = *acsParameters_;

10
mission/controller/acs/ActuatorCmd.h
View File

@ -9,11 +9,11 @@
#define ACTUATORCMD_H_ #define ACTUATORCMD_H_
#include "AcsParameters.h" #include <AcsParameters.h>
#include "SensorProcessing.h" #include <SensorProcessing.h>
#include <acs/MultiplicativeKalmanFilter.h> #include <MultiplicativeKalmanFilter.h>
#include <acs/SensorValues.h> #include <SensorValues.h>
#include <acs/OutputValues.h> #include <OutputValues.h>
class ActuatorCmd{ class ActuatorCmd{
public: public:

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

@ -12,7 +12,7 @@
#include <AcsParameters.h> #include <AcsParameters.h>
#include <SensorValues.h> #include <SensorValues.h>
#include <OutputValues.h> #include <OutputValues.h>
#include <time.h> #include <sys/time.h>
class Guidance { class Guidance {

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

@ -25,7 +25,7 @@
// Output should be transformed to [T] instead of [nT] // Output should be transformed to [T] instead of [nT]
// Updating Coefficients has to be implemented yet. Question, updating everyday ? // Updating Coefficients has to be implemented yet. Question, updating everyday ?
class Igrf13Model:public HasParametersIF{ class Igrf13Model/*:public HasParametersIF*/{
public: public:
Igrf13Model(); Igrf13Model();

10
mission/controller/acs/Navigation.h
View File

@ -9,11 +9,11 @@
#define NAVIGATION_H_ #define NAVIGATION_H_
#include "AcsParameters.h" #include <AcsParameters.h>
#include "SensorProcessing.h" #include <SensorProcessing.h>
#include <acs/MultiplicativeKalmanFilter.h> #include <MultiplicativeKalmanFilter.h>
#include <acs/SensorValues.h> #include <SensorValues.h>
#include <acs/OutputValues.h> #include <OutputValues.h>
class Navigation{ class Navigation{
public: public:

4
mission/controller/acs/Navitation.cpp
View File

@ -7,11 +7,11 @@
#include "Navigation.h" #include "Navigation.h"
#include <math.h> #include <math.h>
#include <acs/math/MathOperations.h> #include <acs/util/MathOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h> #include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h>
#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 <acs/math/CholeskyDecomposition.h> #include <acs/util/CholeskyDecomposition.h>
Navigation::Navigation(AcsParameters *acsParameters_): multiplicativeKalmanFilter(acsParameters_){ Navigation::Navigation(AcsParameters *acsParameters_): multiplicativeKalmanFilter(acsParameters_){
acsParameters = *acsParameters_; acsParameters = *acsParameters_;

10
mission/controller/acs/SensorProcessing.cpp
View File

@ -6,11 +6,11 @@
*/ */
#include "SensorProcessing.h" #include "SensorProcessing.h"
#include <fsfw/src/fsfw/globalfunctions/constants.h> #include <fsfw/globalfunctions/constants.h>
#include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h> #include <fsfw/globalfunctions/math/MatrixOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h> #include <fsfw/globalfunctions/math/QuaternionOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h> #include <fsfw/globalfunctions/math/VectorOperations.h>
#include <fsfw/src/fsfw/globalfunctions/timevalOperations.h> #include <fsfw/globalfunctions/timevalOperations.h>
#include <util/MathOperations.h> #include <util/MathOperations.h>
#include <Igrf13Model.h> #include <Igrf13Model.h>
#include <math.h> #include <math.h>

14
mission/controller/acs/SensorProcessing.h
View File

@ -6,12 +6,12 @@
#define SENSORPROCESSING_H_ #define SENSORPROCESSING_H_
#include <stdint.h> //uint8_t #include <stdint.h> //uint8_t
#include <time.h> /*purpose, timeval ?*/ #include <sys/time.h> /*purpose, timeval ?*/
#include "acs/config/classIds.h" #include <config/classIds.h>
#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/src/fsfw/returnvalues/returnvalue.h>
#include "AcsParameters.h" #include <AcsParameters.h>
#include <acs/SensorValues.h> #include <SensorValues.h>
#include <acs/OutputValues.h> #include <OutputValues.h>
/*Planned: /*Planned:
* - Fusion of Sensor Measurements - * - Fusion of Sensor Measurements -
@ -25,7 +25,7 @@
* magField * magField
* SunDirEst*/ * SunDirEst*/
class SensorProcessing: public HasReturnvaluesIF{ class SensorProcessing{
public: public:
void reset(); void reset();

12
mission/controller/acs/control/Detumble.cpp
View File

@ -7,14 +7,14 @@
*/ */
#include "Detumble.h" #include <Detumble.h>
#include <fsfw/src/fsfw/globalfunctions/constants.h> #include <fsfw/globalfunctions/constants.h>
#include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h> #include <fsfw/globalfunctions/math/MatrixOperations.h>
#include <acs/util/MathOperations.h> #include <acs/util/MathOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h> #include <fsfw/globalfunctions/math/QuaternionOperations.h>
#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h> #include <fsfw/globalfunctions/math/VectorOperations.h>
#include <math.h> #include <math.h>
#include <fsfw/src/fsfw/globalfunctions/sign.h> #include <fsfw/globalfunctions/sign.h>
Detumble::Detumble(AcsParameters *acsParameters_){ Detumble::Detumble(AcsParameters *acsParameters_){

10
mission/controller/acs/control/Detumble.h
View File

@ -13,11 +13,11 @@
#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 <fsfw/returnvalues/returnvalue.h>
#include <time.h> #include <sys/time.h>
class Detumble : public HasReturnvaluesIF { class Detumble{
public: public:
Detumble(AcsParameters *acsParameters_); Detumble(AcsParameters *acsParameters_);
@ -42,5 +42,5 @@ private:
AcsParameters::MagnetorquesParameter* magnetorquesParameter; AcsParameters::MagnetorquesParameter* magnetorquesParameter;
}; };
#endif /* ACS_CONTROL_DETUMBLE_H_ */ #endif ACS_CONTROL_DETUMBLE_H_

1
mission/controller/acs/util/MathOperations.h
View File

@ -9,6 +9,7 @@
#define MATH_MATHOPERATIONS_H_ #define MATH_MATHOPERATIONS_H_
#include <math.h> #include <math.h>
#include <sys/time.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <fsfw/src/fsfw/globalfunctions/constants.h> #include <fsfw/src/fsfw/globalfunctions/constants.h>