From 63b275acbda1b7b0606bfc29f0c87cea5712934c Mon Sep 17 00:00:00 2001
From: Fabrizio Monti <fabrizio.monti@skywarder.eu>
Date: Mon, 24 Mar 2025 22:45:47 +0100
Subject: [PATCH] [ENGINE] Updated HIL with Orion servo valves.
---
src/Motor/HIL/HIL.cpp | 5 ++++-
src/Motor/HIL/HILData.h | 24 +++++++++++++++++-------
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/Motor/HIL/HIL.cpp b/src/Motor/HIL/HIL.cpp
index 4f5f6ded0..233886465 100644
--- a/src/Motor/HIL/HIL.cpp
+++ b/src/Motor/HIL/HIL.cpp
@@ -134,7 +134,10 @@ ActuatorData MotorHIL::updateActuatorData()
ActuatorsStateHIL actuatorsStateHIL{
(actuators->getServoPosition(MAIN_VALVE)),
- (actuators->getServoPosition(VENTING_VALVE))};
+ (actuators->getServoPosition(OX_VENTING_VALVE)),
+ (actuators->getServoPosition(NITROGEN_VALVE)),
+ (actuators->getServoPosition(N2_QUENCHING_VALVE)),
+ };
// Returning the feedback for the simulator
return ActuatorData{actuatorsStateHIL};
diff --git a/src/Motor/HIL/HILData.h b/src/Motor/HIL/HILData.h
index 14051e452..2728875d1 100644
--- a/src/Motor/HIL/HILData.h
+++ b/src/Motor/HIL/HILData.h
@@ -46,17 +46,24 @@ enum class MotorFlightPhases
struct ActuatorsStateHIL
{
- float mainValvePercentage = 0;
- float ventingValvePercentage = 0;
+ float mainValvePercentage = 0;
+ float oxVentingValvePercentage = 0;
+ float nitrogenValvePercentage = 0;
+ float n2QuenchingValvePercentage = 0;
ActuatorsStateHIL()
- : mainValvePercentage(0.0f), ventingValvePercentage(0.0f)
+ : mainValvePercentage(0.0f), oxVentingValvePercentage(0.0f),
+ nitrogenValvePercentage(0.0f), n2QuenchingValvePercentage(0.0f)
{
}
- ActuatorsStateHIL(float mainValvePercentage, float ventingValvePercentage)
+ ActuatorsStateHIL(float mainValvePercentage, float oxVentingValvePercentage,
+ float nitrogenValvePercentage,
+ float n2QuenchingValvePercentage)
: mainValvePercentage(mainValvePercentage),
- ventingValvePercentage(ventingValvePercentage)
+ oxVentingValvePercentage(oxVentingValvePercentage),
+ nitrogenValvePercentage(nitrogenValvePercentage),
+ n2QuenchingValvePercentage(n2QuenchingValvePercentage)
{
}
@@ -64,8 +71,11 @@ struct ActuatorsStateHIL
{
printf(
"mainValve: %f perc\n"
- "venting: %f perc\n",
- mainValvePercentage * 100, ventingValvePercentage * 100);
+ "oxVenting: %f perc\n"
+ "nitrogen: %f perc\n"
+ "n2Quenching: %f perc\n",
+ mainValvePercentage * 100, oxVentingValvePercentage * 100,
+ nitrogenValvePercentage * 100, n2QuenchingValvePercentage * 100);
}
};
--
GitLab