Skip to content
Snippets Groups Projects
Commit a843f55d authored by Matteo Pignataro's avatar Matteo Pignataro
Browse files

[Sensors] Fixed typo with sensor_id to sensor_name

[GSE] Added valve's states and arming switch state
parent fb4a467c
No related branches found
No related tags found
1 merge request!5Gemini message definitions update
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
</message> </message>
<message id="4" name="SENSOR_TM_REQUEST_TC"> <message id="4" name="SENSOR_TM_REQUEST_TC">
<description>TC containing a request for sensors telemetry</description> <description>TC containing a request for sensors telemetry</description>
<field name="sensor_id" type="uint8_t">A member of the SensorTMList enum</field> <field name="sensor_name" type="uint8_t">A member of the SensorTMList enum</field>
</message> </message>
<message id="5" name="SERVO_TM_REQUEST_TC"> <message id="5" name="SERVO_TM_REQUEST_TC">
<description>TC containing a request for servo telemetry</description> <description>TC containing a request for servo telemetry</description>
...@@ -296,6 +296,7 @@ ...@@ -296,6 +296,7 @@
<field name="release_pressure_btn" type="uint8_t">Release filling line pressure pressed</field> <field name="release_pressure_btn" type="uint8_t">Release filling line pressure pressed</field>
<field name="quick_connector_btn" type="uint8_t">Detach quick connector pressed</field> <field name="quick_connector_btn" type="uint8_t">Detach quick connector pressed</field>
<field name="start_tars_btn" type="uint8_t">Startup TARS pressed</field> <field name="start_tars_btn" type="uint8_t">Startup TARS pressed</field>
<field name="arm_switch" type="uint8_t">Arming switch state</field>
</message> </message>
<!-- FROM ROCKET TO GROUND: GENERIC --> <!-- FROM ROCKET TO GROUND: GENERIC -->
...@@ -668,6 +669,12 @@ ...@@ -668,6 +669,12 @@
<field name="loadcell_tank" type="float" units="kg">Rocket weight</field> <field name="loadcell_tank" type="float" units="kg">Rocket weight</field>
<field name="loadcell_COTS_tank" type="float" units="kg">External tank weight</field> <field name="loadcell_COTS_tank" type="float" units="kg">External tank weight</field>
<field name="filling_pressure" type="float" units="Pa">Refueling line pressure</field> <field name="filling_pressure" type="float" units="Pa">Refueling line pressure</field>
<field name="arming_state" type="uint8_t">1 If the rocket is armed</field>
<field name="filling_valve_state" type="uint8_t">1 If the filling valve is open</field>
<field name="venting_valve_state" type="uint8_t">1 If the venting valve is open</field>
<field name="release_vlave_state" type="uint8_t">1 If the release valve is open</field>
<field name="ignition_state" type="uint8_t">1 If the RIG is in ignition process</field>
<field name="tars_state" type="uint8_t">1 If the TARS algorithm is running</field>
</message> </message>
<message id="213" name="MOTOR_TM"> <message id="213" name="MOTOR_TM">
<description>Motor rocket telemetry</description> <description>Motor rocket telemetry</description>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment