From a248c2ee4089d8d0edcdd17fc6b56a01bdb7e38a Mon Sep 17 00:00:00 2001
From: Davide Mor <davide.mor@skywarder.eu>
Date: Sun, 18 Aug 2024 15:55:22 +0200
Subject: [PATCH] [MEA] Added estimatedForce reporting
---
src/shared/algorithms/MEA/MEA.cpp | 1 +
src/shared/algorithms/MEA/MEA.h | 2 +-
src/shared/algorithms/MEA/MEAData.h | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/shared/algorithms/MEA/MEA.cpp b/src/shared/algorithms/MEA/MEA.cpp
index 399ee03ee..8e1fcf931 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 56467767a..0fa99d9d4 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 6164a8b7a..7358e242a 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";
}
};
--
GitLab