From f07b905df54dd138a3cb654b48f5803d40bab82f Mon Sep 17 00:00:00 2001 From: Marius Eggert Date: Fri, 18 Nov 2022 10:49:38 +0100 Subject: [PATCH] corrected output direction of sunVectors --- mission/controller/acs/SusConverter.cpp | 10 +++++----- mission/controller/acs/SusConverter.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mission/controller/acs/SusConverter.cpp b/mission/controller/acs/SusConverter.cpp index 26804f12..1dc3a2e2 100644 --- a/mission/controller/acs/SusConverter.cpp +++ b/mission/controller/acs/SusConverter.cpp @@ -107,17 +107,17 @@ void SusConverter::calibration(const float coeffAlpha[9][10], const float coeffB float* SusConverter::calculateSunVector() { // Calculate the normalized Sun Vector - sunVectorBodyFrame[0] = (tan(alphaBetaCalibrated[0] * (M_PI / 180)) / + sunVectorSensorFrame[0] = -(tan(alphaBetaCalibrated[0] * (M_PI / 180)) / (sqrt((powf(tan(alphaBetaCalibrated[0] * (M_PI / 180)), 2)) + powf(tan((alphaBetaCalibrated[1] * (M_PI / 180))), 2) + (1)))); - sunVectorBodyFrame[1] = (tan(alphaBetaCalibrated[1] * (M_PI / 180)) / + sunVectorSensorFrame[1] = -(tan(alphaBetaCalibrated[1] * (M_PI / 180)) / (sqrt(powf((tan(alphaBetaCalibrated[0] * (M_PI / 180))), 2) + powf(tan((alphaBetaCalibrated[1] * (M_PI / 180))), 2) + (1)))); - sunVectorBodyFrame[2] = - (-1 / (sqrt(powf((tan(alphaBetaCalibrated[0] * (M_PI / 180))), 2) + + sunVectorSensorFrame[2] = + -(-1 / (sqrt(powf((tan(alphaBetaCalibrated[0] * (M_PI / 180))), 2) + powf((tan(alphaBetaCalibrated[1] * (M_PI / 180))), 2) + (1)))); - return sunVectorBodyFrame; + return sunVectorSensorFrame; } float* SusConverter::getSunVectorSensorFrame(const uint16_t susChannel[6], diff --git a/mission/controller/acs/SusConverter.h b/mission/controller/acs/SusConverter.h index 01143a39..10079e90 100644 --- a/mission/controller/acs/SusConverter.h +++ b/mission/controller/acs/SusConverter.h @@ -31,7 +31,7 @@ class SusConverter { // float coeffAlpha[9][10]; // float coeffBeta[9][10]; float alphaBetaCalibrated[2]; //[°] - float sunVectorBodyFrame[3]; //[-] + float sunVectorSensorFrame[3]; //[-] bool validFlag[12] = {returnvalue::OK, returnvalue::OK, returnvalue::OK, returnvalue::OK, returnvalue::OK, returnvalue::OK, returnvalue::OK, returnvalue::OK,