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

further fixes for HasReturnValuesIF
EIVE/eive-obsw/pipeline/head This commit looks good Details

This commit is contained in:
Marius Eggert 2022-09-20 15:45:49 +02:00
parent 5ebdc9e767
commit b2484136b1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ void Guidance::targetQuatPtg(ACS::SensorValues* sensorValues, ACS::OutputValues
// TEST SECTION !
double dcmTEST[3][3] = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
MatrixOperations<double>::multiply(&acsParameters.magnetorquesParameter.mtq0orientationMatrix, dcmTEST, dcmTEST, 3, 3, 3);
//MatrixOperations<double>::multiply(&acsParameters.magnetorquesParameter.mtq0orientationMatrix, dcmTEST, dcmTEST, 3, 3, 3);
MatrixOperations<double>::multiply(*dcmDot, *dcmEJ, *dcmEJDot, 3, 3, 3);
MatrixOperations<double>::multiplyScalar(*dcmEJDot, omegaEarth, *dcmEJDot, 3, 3);

2
mission/controller/acs/SensorValues.cpp
View File

@ -28,7 +28,7 @@ ReturnValue_t SensorValues::update() {
// quatJB[3] = static_cast<double>(quaternion.value);
// quatJBValid = quaternion.isValid();
return RETURN_OK;
return returnvalue::OK;
}
}

4
mission/controller/acs/SensorValues.h
View File

@ -5,11 +5,11 @@
#ifndef SENSORVALUES_H_
#define SENSORVALUES_H_
#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
#include <fsfw/returnvalues/returnvalue.h>
namespace ACS {
class SensorValues: public HasReturnvaluesIF {
class SensorValues{
public:
SensorValues();
virtual ~SensorValues();

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

@ -43,7 +43,7 @@ ReturnValue_t Detumble::bDotLaw(const double *magRate, const bool *magRateValid,
double gain = detumbleCtrlParameters->gainD;
double factor = -gain / pow(VectorOperations<double>::norm(magField,3),2);
VectorOperations<double>::mulScalar(magRate, factor, magMom, 3);
return RETURN_OK;
return returnvalue::OK;
}
@ -60,6 +60,6 @@ ReturnValue_t Detumble::bangbangLaw(const double *magRate, const bool *magRateVa
}
return RETURN_OK;
return returnvalue::OK;
}