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

sus-vector-fix-new #689

Merged
muellerr merged 8 commits from sus-vector-fix-new into v3.1.1-reduced-to-bare-minimum 2023-06-19 17:40:30 +02:00
Conversation 0 Commits 8 Files Changed 8 +40 -15
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dcf01d822b - Show all commits

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

@ -212,20 +212,45 @@ void SensorProcessing::processSus(
sunIjkModel[2] = sin(eclipticLongitude) * sin(epsilon); sunIjkModel[2] = sin(eclipticLongitude) * sin(epsilon);
uint64_t susBrightness[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; uint64_t susBrightness[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
susBrightness[0] = susConverter.checkSunSensorData(sus0Value); if (sus0valid) {
susBrightness[1] = susConverter.checkSunSensorData(sus1Value); susBrightness[0] = susConverter.checkSunSensorData(sus0Value);
susBrightness[2] = susConverter.checkSunSensorData(sus2Value); }
susBrightness[3] = susConverter.checkSunSensorData(sus3Value); if (sus1valid) {
susBrightness[4] = susConverter.checkSunSensorData(sus4Value); susBrightness[1] = susConverter.checkSunSensorData(sus1Value);
susBrightness[5] = susConverter.checkSunSensorData(sus5Value); }
susBrightness[6] = susConverter.checkSunSensorData(sus6Value); if (sus2valid) {
susBrightness[7] = susConverter.checkSunSensorData(sus7Value); susBrightness[2] = susConverter.checkSunSensorData(sus2Value);
susBrightness[8] = susConverter.checkSunSensorData(sus8Value); }
susBrightness[9] = susConverter.checkSunSensorData(sus9Value); if (sus3valid) {
susBrightness[10] = susConverter.checkSunSensorData(sus10Value); susBrightness[3] = susConverter.checkSunSensorData(sus3Value);
susBrightness[11] = susConverter.checkSunSensorData(sus11Value); }
if (sus4valid) {
susBrightness[4] = susConverter.checkSunSensorData(sus4Value);
}
if (sus5valid) {
susBrightness[5] = susConverter.checkSunSensorData(sus5Value);
}
if (sus6valid) {
susBrightness[6] = susConverter.checkSunSensorData(sus6Value);
}
if (sus7valid) {
susBrightness[7] = susConverter.checkSunSensorData(sus7Value);
}
if (sus8valid) {
susBrightness[8] = susConverter.checkSunSensorData(sus8Value);
}
if (sus9valid) {
susBrightness[9] = susConverter.checkSunSensorData(sus9Value);
}
if (sus10valid) {
susBrightness[10] = susConverter.checkSunSensorData(sus10Value);
}
if (sus11valid) {
susBrightness[11] = susConverter.checkSunSensorData(sus11Value);
}
bool susValid[12] = {true, true, true, true, true, true, true, true, true, true, true, true}; bool susValid[12] = {sus0valid, sus1valid, sus2valid, sus3valid, sus4valid, sus5valid,
sus6valid, sus7valid, sus8valid, sus9valid, sus10valid, sus11valid};
bool allInvalid = bool allInvalid =
susConverter.checkValidity(susValid, susBrightness, susParameters->susBrightnessThreshold); susConverter.checkValidity(susValid, susBrightness, susParameters->susBrightnessThreshold);
@ -246,8 +271,8 @@ void SensorProcessing::processSus(
std::memcpy(susDataProcessed->sus9vec.value, zeroVec, 3 * sizeof(float)); std::memcpy(susDataProcessed->sus9vec.value, zeroVec, 3 * sizeof(float));
std::memcpy(susDataProcessed->sus10vec.value, zeroVec, 3 * sizeof(float)); std::memcpy(susDataProcessed->sus10vec.value, zeroVec, 3 * sizeof(float));
std::memcpy(susDataProcessed->sus11vec.value, zeroVec, 3 * sizeof(float)); std::memcpy(susDataProcessed->sus11vec.value, zeroVec, 3 * sizeof(float));
std::memcpy(susDataProcessed->susVecTot.value, zeroVec, 3 * sizeof(float)); std::memcpy(susDataProcessed->susVecTot.value, zeroVec, 3 * sizeof(double));
std::memcpy(susDataProcessed->susVecTotDerivative.value, zeroVec, 3 * sizeof(float)); std::memcpy(susDataProcessed->susVecTotDerivative.value, zeroVec, 3 * sizeof(double));
susDataProcessed->setValidity(false, true); susDataProcessed->setValidity(false, true);
std::memcpy(susDataProcessed->sunIjkModel.value, sunIjkModel, 3 * sizeof(double)); std::memcpy(susDataProcessed->sunIjkModel.value, sunIjkModel, 3 * sizeof(double));
susDataProcessed->sunIjkModel.setValid(true); susDataProcessed->sunIjkModel.setValid(true);