diff --git a/src/Motor/HIL/HIL.cpp b/src/Motor/HIL/HIL.cpp index 4f5f6ded024e30901093f6d300c3f6bc811bac4e..2338864659c3d062acd596b78e9ff9adf8acc029 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 14051e4528417bad2beada7bcfcb63fd08ad21a9..2728875d16fc8f7ba74e6ed8929dbfe090761f3b 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); } };