amended includes. removed links to HasParametersIF

2022-09-20 15:06:05 +02:00 · 2022-09-20 15:06:05 +02:00 · 5ebdc9e767
commit 5ebdc9e767
parent 7885205a07
12 changed files with 46 additions and 45 deletions
--- a/mission/controller/acs/AcsParameters.h
+++ b/mission/controller/acs/AcsParameters.h
@ -10,7 +10,7 @@

 typedef unsigned char uint8_t;

-class AcsParameters:public HasParametersIF{
+class AcsParameters/*:public HasParametersIF*/{
 public:

 	AcsParameters();
--- a/mission/controller/acs/ActuatorCmd.cpp
+++ b/mission/controller/acs/ActuatorCmd.cpp
@ -6,14 +6,14 @@
 */


-#include "ActuatorCmd.h"
-#include <math.h>
+#include <ActuatorCmd.h>
+#include <cmath>
 #include <acs/util/MathOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/constants.h>
-#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h>
-#include <acs/util/CholeskyDecomposition.h>
+#include <fsfw/globalfunctions/constants.h>
+#include <fsfw/globalfunctions/math/VectorOperations.h>
+#include <fsfw/globalfunctions/math/MatrixOperations.h>
+#include <fsfw/globalfunctions/math/QuaternionOperations.h>
+#include <util/CholeskyDecomposition.h>

 ActuatorCmd::ActuatorCmd(AcsParameters *acsParameters_) {
 	acsParameters = *acsParameters_;
--- a/mission/controller/acs/ActuatorCmd.h
+++ b/mission/controller/acs/ActuatorCmd.h
@ -9,11 +9,11 @@
 #define ACTUATORCMD_H_


-#include "AcsParameters.h"
-#include "SensorProcessing.h"
-#include <acs/MultiplicativeKalmanFilter.h>
-#include <acs/SensorValues.h>
-#include <acs/OutputValues.h>
+#include <AcsParameters.h>
+#include <SensorProcessing.h>
+#include <MultiplicativeKalmanFilter.h>
+#include <SensorValues.h>
+#include <OutputValues.h>

 class ActuatorCmd{
 public:
--- a/mission/controller/acs/Guidance.h
+++ b/mission/controller/acs/Guidance.h
@ -12,7 +12,7 @@
 #include <AcsParameters.h>
 #include <SensorValues.h>
 #include <OutputValues.h>
-#include <time.h>
+#include <sys/time.h>


 class Guidance {
--- a/mission/controller/acs/Igrf13Model.h
+++ b/mission/controller/acs/Igrf13Model.h
@ -25,7 +25,7 @@

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

 public:
 	Igrf13Model();
--- a/mission/controller/acs/Navigation.h
+++ b/mission/controller/acs/Navigation.h
@ -9,11 +9,11 @@
 #define NAVIGATION_H_


-#include "AcsParameters.h"
-#include "SensorProcessing.h"
-#include <acs/MultiplicativeKalmanFilter.h>
-#include <acs/SensorValues.h>
-#include <acs/OutputValues.h>
+#include <AcsParameters.h>
+#include <SensorProcessing.h>
+#include <MultiplicativeKalmanFilter.h>
+#include <SensorValues.h>
+#include <OutputValues.h>

 class Navigation{
 public:
--- a/mission/controller/acs/Navitation.cpp
+++ b/mission/controller/acs/Navitation.cpp
@ -7,11 +7,11 @@

 #include "Navigation.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/MatrixOperations.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_){
 	acsParameters = *acsParameters_;
--- a/mission/controller/acs/SensorProcessing.cpp
+++ b/mission/controller/acs/SensorProcessing.cpp
@ -6,11 +6,11 @@
 */

 #include "SensorProcessing.h"
-#include <fsfw/src/fsfw/globalfunctions/constants.h>
-#include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/timevalOperations.h>
+#include <fsfw/globalfunctions/constants.h>
+#include <fsfw/globalfunctions/math/MatrixOperations.h>
+#include <fsfw/globalfunctions/math/QuaternionOperations.h>
+#include <fsfw/globalfunctions/math/VectorOperations.h>
+#include <fsfw/globalfunctions/timevalOperations.h>
 #include <util/MathOperations.h>
 #include <Igrf13Model.h>
 #include <math.h>
--- a/mission/controller/acs/SensorProcessing.h
+++ b/mission/controller/acs/SensorProcessing.h
@ -6,12 +6,12 @@
 #define SENSORPROCESSING_H_

 #include <stdint.h> //uint8_t
-#include <time.h> /*purpose, timeval ?*/
-#include "acs/config/classIds.h"
-#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
-#include "AcsParameters.h"
-#include <acs/SensorValues.h>
-#include <acs/OutputValues.h>
+#include <sys/time.h> /*purpose, timeval ?*/
+#include <config/classIds.h>
+#include <fsfw/src/fsfw/returnvalues/returnvalue.h>
+#include <AcsParameters.h>
+#include <SensorValues.h>
+#include <OutputValues.h>

 /*Planned:
 * - Fusion of Sensor Measurements -
@ -25,7 +25,7 @@
 * magField
 * SunDirEst*/

-class SensorProcessing: public HasReturnvaluesIF{
+class SensorProcessing{
 public:

 	void reset();
--- a/mission/controller/acs/control/Detumble.cpp
+++ b/mission/controller/acs/control/Detumble.cpp
@ -7,14 +7,14 @@
 */


-#include "Detumble.h"
-#include <fsfw/src/fsfw/globalfunctions/constants.h>
-#include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h>
+#include <Detumble.h>
+#include <fsfw/globalfunctions/constants.h>
+#include <fsfw/globalfunctions/math/MatrixOperations.h>
 #include <acs/util/MathOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/math/QuaternionOperations.h>
-#include <fsfw/src/fsfw/globalfunctions/math/VectorOperations.h>
+#include <fsfw/globalfunctions/math/QuaternionOperations.h>
+#include <fsfw/globalfunctions/math/VectorOperations.h>
 #include <math.h>
-#include <fsfw/src/fsfw/globalfunctions/sign.h>
+#include <fsfw/globalfunctions/sign.h>


 Detumble::Detumble(AcsParameters *acsParameters_){
--- a/mission/controller/acs/control/Detumble.h
+++ b/mission/controller/acs/control/Detumble.h
@ -13,11 +13,11 @@
 #include <acs/SensorValues.h>
 #include <acs/OutputValues.h>
 #include <acs/AcsParameters.h>
-#include "acs/config/classIds.h"
-#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
-#include <time.h>
+#include <acs/config/classIds.h>
+#include <fsfw/returnvalues/returnvalue.h>
+#include <sys/time.h>

-class Detumble : public HasReturnvaluesIF {
+class Detumble{

 public:
 	Detumble(AcsParameters *acsParameters_);
@ -42,5 +42,5 @@ private:
 	AcsParameters::MagnetorquesParameter* magnetorquesParameter;
 };

-#endif /* ACS_CONTROL_DETUMBLE_H_ */
+#endif ACS_CONTROL_DETUMBLE_H_

--- a/mission/controller/acs/util/MathOperations.h
+++ b/mission/controller/acs/util/MathOperations.h
@ -9,6 +9,7 @@
 #define MATH_MATHOPERATIONS_H_

 #include <math.h>
+#include <sys/time.h>
 #include <stdint.h>
 #include <string.h>
 #include <fsfw/src/fsfw/globalfunctions/constants.h>