diff --git a/src/shared/algorithms/MEA/MEA.cpp b/src/shared/algorithms/MEA/MEA.cpp index 399ee03ee6c06a36c2b8cd91e64af6f83215f895..8e1fcf93116ad7a569ce1336b9db82a5641b8b0d 100644 --- a/src/shared/algorithms/MEA/MEA.cpp +++ b/src/shared/algorithms/MEA/MEA.cpp @@ -190,4 +190,5 @@ void MEA::updateState() state.estimatedMass = x(2); state.estimatedPressure = baroH * x; state.estimatedApogee = apogee; + state.estimatedForce = force; } \ No newline at end of file diff --git a/src/shared/algorithms/MEA/MEA.h b/src/shared/algorithms/MEA/MEA.h index 56467767a1ca4bd22a51456129a62f42cdf42baf..0fa99d9d445d628ab2a9307056d20547d7ab35c6 100644 --- a/src/shared/algorithms/MEA/MEA.h +++ b/src/shared/algorithms/MEA/MEA.h @@ -59,7 +59,7 @@ public: Aeroutils::AerodynamicCoeff coeffs; //< Aerodynamic coefficients. float crossSection; //< Cross section of the rocket. - float ae; //< TODO: What is this? + float ae; //< Efflux area float p0; //< Pressure at nozzle exit }; diff --git a/src/shared/algorithms/MEA/MEAData.h b/src/shared/algorithms/MEA/MEAData.h index 6164a8b7a9c2c1a85f8b5828e2128d653a66ce23..7358e242ae28b0f04c39768a1aacd93d84efa1f9 100644 --- a/src/shared/algorithms/MEA/MEAData.h +++ b/src/shared/algorithms/MEA/MEAData.h @@ -35,20 +35,23 @@ struct MEAState float estimatedPressure; float estimatedMass; float estimatedApogee; + float estimatedForce; float x0; float x1; static std::string header() { - return "timestamp,estimatedPressure,estimatedMass,estimatedApogee,x0," + return "timestamp,estimatedPressure,estimatedMass,estimatedApogee," + "estimatedForce,x0," "x1\n"; } void print(std::ostream &os) const { os << timestamp << "," << estimatedPressure << "," << estimatedMass - << "," << estimatedApogee << "," << x0 << "," << x1 << "\n"; + << "," << estimatedApogee << "," << estimatedForce << "," << x0 + << "," << x1 << "\n"; } };