Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
This commit is contained in:
commit
bda57d9bd1
@ -28,6 +28,8 @@ will consitute of a breaking change warranting a new major release:
|
|||||||
- `PDEC_CONFIG_CORRUPTED` event which is triggered when the PDEC configuration does not match the
|
- `PDEC_CONFIG_CORRUPTED` event which is triggered when the PDEC configuration does not match the
|
||||||
expected configuration. P1 will contain the readback of the first word and P2 will contain the
|
expected configuration. P1 will contain the readback of the first word and P2 will contain the
|
||||||
readback of the second word.
|
readback of the second word.
|
||||||
|
- Parameter to disable usage of MGM4, which is part of the MTQ and therefore cannot be
|
||||||
|
disabled without disabling the MTQ itself.
|
||||||
|
|
||||||
## Fixed
|
## Fixed
|
||||||
|
|
||||||
|
@ -113,6 +113,9 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
|
|||||||
case 0x13:
|
case 0x13:
|
||||||
parameterWrapper->set(mgmHandlingParameters.mgmDerivativeFilterWeight);
|
parameterWrapper->set(mgmHandlingParameters.mgmDerivativeFilterWeight);
|
||||||
break;
|
break;
|
||||||
|
case 0x14:
|
||||||
|
parameterWrapper->set(mgmHandlingParameters.useMgm4);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_IDENTIFIER_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
|
@ -80,6 +80,7 @@ class AcsParameters : public HasParametersIF {
|
|||||||
float mgm4variance[3] = {pow(1.7e-6, 2), pow(1.7e-6, 2), pow(1.7e-6, 2)};
|
float mgm4variance[3] = {pow(1.7e-6, 2), pow(1.7e-6, 2), pow(1.7e-6, 2)};
|
||||||
float mgmVectorFilterWeight = 0.85;
|
float mgmVectorFilterWeight = 0.85;
|
||||||
float mgmDerivativeFilterWeight = 0.85;
|
float mgmDerivativeFilterWeight = 0.85;
|
||||||
|
uint8_t useMgm4 = false;
|
||||||
} mgmHandlingParameters;
|
} mgmHandlingParameters;
|
||||||
|
|
||||||
struct SusHandlingParameters {
|
struct SusHandlingParameters {
|
||||||
|
@ -101,7 +101,7 @@ void SensorProcessing::processMgm(const float *mgm0Value, bool mgm0valid, const
|
|||||||
sensorFusionDenominator[i] += 1 / mgmParameters->mgm13variance[i];
|
sensorFusionDenominator[i] += 1 / mgmParameters->mgm13variance[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (mgm4valid) {
|
if (mgm4valid and mgmParameters->useMgm4) {
|
||||||
float mgm4ValueUT[3];
|
float mgm4ValueUT[3];
|
||||||
VectorOperations<float>::mulScalar(mgm4Value, 1e-3, mgm4ValueUT, 3); // nT to uT
|
VectorOperations<float>::mulScalar(mgm4Value, 1e-3, mgm4ValueUT, 3); // nT to uT
|
||||||
MatrixOperations<float>::multiply(mgmParameters->mgm4orientationMatrix[0], mgm4ValueUT,
|
MatrixOperations<float>::multiply(mgmParameters->mgm4orientationMatrix[0], mgm4ValueUT,
|
||||||
|
Loading…
Reference in New Issue
Block a user