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

domainId now points to structs. sunVectorSafeLeop added

Browse Source
This commit is contained in:
Marius Eggert 2023-01-12 11:47:56 +01:00
parent 25867e76b1
commit 66e2d782b2
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
mission/controller/acs/AcsParameters.cpp
View File

@ -11,16 +11,15 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
ParameterWrapper* parameterWrapper, ParameterWrapper* parameterWrapper,
const ParameterWrapper* newValues, const ParameterWrapper* newValues,
uint16_t startAtIndex) { uint16_t startAtIndex) {
// if (domainId == parameterModuleId) { switch (domainId) {
switch (parameterId >> 8) {
case 0x0: // direct members case 0x0: // direct members
switch (parameterId & 0xFF) { switch (parameterId) {
default: default:
return INVALID_IDENTIFIER_ID; return INVALID_IDENTIFIER_ID;
} }
break; break;
case 0x1: // OnBoardParams case 0x1: // OnBoardParams
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(onBoardParams.sampleTime); parameterWrapper->set(onBoardParams.sampleTime);
break; break;
@ -29,7 +28,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case 0x2: // InertiaEIVE case 0x2: // InertiaEIVE
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(inertiaEIVE.inertiaMatrix); parameterWrapper->set(inertiaEIVE.inertiaMatrix);
break; break;
@ -50,7 +49,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case 0x3: // MgmHandlingParameters case 0x3: // MgmHandlingParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(mgmHandlingParameters.mgm0orientationMatrix); parameterWrapper->set(mgmHandlingParameters.mgm0orientationMatrix);
break; break;
@ -110,7 +109,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case 0x4: // SusHandlingParameters case 0x4: // SusHandlingParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(susHandlingParameters.sus0orientationMatrix); parameterWrapper->set(susHandlingParameters.sus0orientationMatrix);
break; break;
@ -224,7 +223,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0x5): // GyrHandlingParameters case (0x5): // GyrHandlingParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(gyrHandlingParameters.gyr0orientationMatrix); parameterWrapper->set(gyrHandlingParameters.gyr0orientationMatrix);
break; break;
@ -251,7 +250,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0x6): // RwHandlingParameters case (0x6): // RwHandlingParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(rwHandlingParameters.inertiaWheel); parameterWrapper->set(rwHandlingParameters.inertiaWheel);
break; break;
@ -272,7 +271,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0x7): // RwMatrices case (0x7): // RwMatrices
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(rwMatrices.alignmentMatrix); parameterWrapper->set(rwMatrices.alignmentMatrix);
break; break;
@ -299,7 +298,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0x8): // SafeModeControllerParameters case (0x8): // SafeModeControllerParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(safeModeControllerParameters.k_rate_mekf); parameterWrapper->set(safeModeControllerParameters.k_rate_mekf);
break; break;
@ -316,9 +315,12 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
parameterWrapper->set(safeModeControllerParameters.sunMagAngleMin); parameterWrapper->set(safeModeControllerParameters.sunMagAngleMin);
break; break;
case 0x5: case 0x5:
parameterWrapper->set(safeModeControllerParameters.sunTargetDir); parameterWrapper->set(safeModeControllerParameters.sunTargetDirLeop);
break; break;
case 0x6: case 0x6:
parameterWrapper->set(safeModeControllerParameters.sunTargetDir);
break;
case 0x7:
parameterWrapper->set(safeModeControllerParameters.satRateRef); parameterWrapper->set(safeModeControllerParameters.satRateRef);
break; break;
default: default:
@ -326,7 +328,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0x9): // PointingModeControllerParameters case (0x9): // PointingModeControllerParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(targetModeControllerParameters.refDirection); parameterWrapper->set(targetModeControllerParameters.refDirection);
break; break;
@ -392,7 +394,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0xA): // StrParameters case (0xA): // StrParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(strParameters.exclusionAngle); parameterWrapper->set(strParameters.exclusionAngle);
break; break;
@ -404,7 +406,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0xB): // GpsParameters case (0xB): // GpsParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(gpsParameters.timeDiffVelocityMax); parameterWrapper->set(gpsParameters.timeDiffVelocityMax);
break; break;
@ -413,7 +415,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0xC): // PtgTargetParameters case (0xC): // PtgTargetParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(ptgTargetParameters.latitudeTgt); parameterWrapper->set(ptgTargetParameters.latitudeTgt);
break; break;
@ -428,7 +430,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0xD): // SunModelParameters case (0xD): // SunModelParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(sunModelParameters.domega); parameterWrapper->set(sunModelParameters.domega);
break; break;
@ -458,7 +460,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0xE): // KalmanFilterParameters case (0xE): // KalmanFilterParameters
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(kalmanFilterParameters.sensorNoiseSTR); parameterWrapper->set(kalmanFilterParameters.sensorNoiseSTR);
break; break;
@ -482,7 +484,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0xF): // MagnetorquesParameter case (0xF): // MagnetorquesParameter
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(magnetorquesParameter.mtq0orientationMatrix); parameterWrapper->set(magnetorquesParameter.mtq0orientationMatrix);
break; break;
@ -506,7 +508,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
case (0x10): // DetumbleParameter case (0x10): // DetumbleParameter
switch (parameterId & 0xFF) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(detumbleParameter.detumblecounter); parameterWrapper->set(detumbleParameter.detumblecounter);
break; break;
@ -524,10 +526,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
} }
break; break;
default: default:
return INVALID_IDENTIFIER_ID; return INVALID_DOMAIN_ID;
} }
return returnvalue::OK; return returnvalue::OK;
// } else {
// return INVALID_DOMAIN_ID;
// }
} }

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

@ -810,7 +810,9 @@ class AcsParameters : public HasParametersIF {
double sunMagAngleMin = 5 * M_PI / 180; double sunMagAngleMin = 5 * M_PI / 180;
double sunTargetDirLeop[3] = {0, .5, .5};
double sunTargetDir[3] = {0, 0, 1}; double sunTargetDir[3] = {0, 0, 1};
double satRateRef[3] = {0, 0, 0}; double satRateRef[3] = {0, 0, 0};
} safeModeControllerParameters; } safeModeControllerParameters;