diff --git a/mavlink_lib.py b/mavlink_lib.py
index 61053b0d87337b0fcdee822992ea1b85516451ea..1bc792396c4654a39307a20f0c6c43a4bf3b17c0 100644
--- a/mavlink_lib.py
+++ b/mavlink_lib.py
@@ -463,14 +463,14 @@ PARAFOIL_LEFT_SERVO = 3 # Servo of the left parafoil control rope
enums['ServosList'][3] = EnumEntry('PARAFOIL_LEFT_SERVO', '''Servo of the left parafoil control rope''')
PARAFOIL_RIGHT_SERVO = 4 # Servo of the right parafoil control rope
enums['ServosList'][4] = EnumEntry('PARAFOIL_RIGHT_SERVO', '''Servo of the right parafoil control rope''')
-N2O_FILLING_VALVE = 5 # Valve filling the N2O tank
-enums['ServosList'][5] = EnumEntry('N2O_FILLING_VALVE', '''Valve filling the N2O tank''')
-N2O_RELEASE_VALVE = 6 # Release valve to depressurize the N2O refueling line
-enums['ServosList'][6] = EnumEntry('N2O_RELEASE_VALVE', '''Release valve to depressurize the N2O refueling line''')
-N2O_DETACH_SERVO = 7 # Detach of the N2O refueling quick connector
-enums['ServosList'][7] = EnumEntry('N2O_DETACH_SERVO', '''Detach of the N2O refueling quick connector''')
-N2O_VENTING_VALVE = 8 # Venting from the N2O tank to air
-enums['ServosList'][8] = EnumEntry('N2O_VENTING_VALVE', '''Venting from the N2O tank to air''')
+OX_FILLING_VALVE = 5 # Valve filling the OX tank
+enums['ServosList'][5] = EnumEntry('OX_FILLING_VALVE', '''Valve filling the OX tank''')
+OX_RELEASE_VALVE = 6 # Release valve to depressurize the OX refueling line
+enums['ServosList'][6] = EnumEntry('OX_RELEASE_VALVE', '''Release valve to depressurize the OX refueling line''')
+OX_DETACH_SERVO = 7 # Detach of the OX refueling quick connector
+enums['ServosList'][7] = EnumEntry('OX_DETACH_SERVO', '''Detach of the OX refueling quick connector''')
+OX_VENTING_VALVE = 8 # Venting from the OX tank to air
+enums['ServosList'][8] = EnumEntry('OX_VENTING_VALVE', '''Venting from the OX tank to air''')
N2_FILLING_VALVE = 9 # Valve filling the N2 tank
enums['ServosList'][9] = EnumEntry('N2_FILLING_VALVE', '''Valve filling the N2 tank''')
N2_RELEASE_VALVE = 10 # Release valve to depressurize the N2 refueling line
@@ -479,8 +479,8 @@ N2_DETACH_SERVO = 11 # Detach of the N2 refueling quick connector
enums['ServosList'][11] = EnumEntry('N2_DETACH_SERVO', '''Detach of the N2 refueling quick connector''')
N2_QUENCHING_VALVE = 12 # Venting from the N2 tank to the combustion chamber
enums['ServosList'][12] = EnumEntry('N2_QUENCHING_VALVE', '''Venting from the N2 tank to the combustion chamber''')
-N2_3WAY_VAVLE = 13 # 3-way valve to select between the two N2 tanks
-enums['ServosList'][13] = EnumEntry('N2_3WAY_VAVLE', '''3-way valve to select between the two N2 tanks''')
+N2_3WAY_VALVE = 13 # 3-way valve to select between the two N2 tanks
+enums['ServosList'][13] = EnumEntry('N2_3WAY_VALVE', '''3-way valve to select between the two N2 tanks''')
MAIN_VALVE = 14 # Valve enabling N2O to flow to the combustion chamber
enums['ServosList'][14] = EnumEntry('MAIN_VALVE', '''Valve enabling N2O to flow to the combustion chamber''')
NITROGEN_VALVE = 15 # Valve enabling N2 to reach the pressure regulator and pressurize the
@@ -1266,47 +1266,48 @@ class MAVLink_set_valve_maximum_aperture_tc_message(MAVLink_message):
class MAVLink_conrig_state_tc_message(MAVLink_message):
'''
- Send the state of the conRIG.
+ The state of the ConRIG control panel
'''
id = MAVLINK_MSG_ID_CONRIG_STATE_TC
name = 'CONRIG_STATE_TC'
- fieldnames = ['n2o_filling_btn', 'n2o_release_btn', 'n2o_detach_btn', 'n2o_venting_btn', 'n2_filling_btn', 'n2_release_btn', 'n2_detach_btn', 'n2_quenching_btn', 'n2_3way_btn', 'tars_btn', 'nitrogen_btn', 'ignition_btn', 'arm_switch']
- ordered_fieldnames = ['n2o_filling_btn', 'n2o_release_btn', 'n2o_detach_btn', 'n2o_venting_btn', 'n2_filling_btn', 'n2_release_btn', 'n2_detach_btn', 'n2_quenching_btn', 'n2_3way_btn', 'tars_btn', 'nitrogen_btn', 'ignition_btn', 'arm_switch']
- fieldtypes = ['uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t']
+ fieldnames = ['ox_filling_btn', 'ox_release_btn', 'ox_detach_btn', 'ox_venting_btn', 'n2_filling_btn', 'n2_release_btn', 'n2_detach_btn', 'n2_quenching_btn', 'n2_3way_btn', 'tars3_btn', 'tars3m_btn', 'nitrogen_btn', 'ignition_btn', 'arm_switch']
+ ordered_fieldnames = ['ox_filling_btn', 'ox_release_btn', 'ox_detach_btn', 'ox_venting_btn', 'n2_filling_btn', 'n2_release_btn', 'n2_detach_btn', 'n2_quenching_btn', 'n2_3way_btn', 'tars3_btn', 'tars3m_btn', 'nitrogen_btn', 'ignition_btn', 'arm_switch']
+ fieldtypes = ['uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t']
fielddisplays_by_name = {}
fieldenums_by_name = {}
fieldunits_by_name = {}
- format = '<BBBBBBBBBBBBB'
- native_format = bytearray('<BBBBBBBBBBBBB', 'ascii')
- orders = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
- lengths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
- array_lengths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- crc_extra = 163
- unpacker = struct.Struct('<BBBBBBBBBBBBB')
+ format = '<BBBBBBBBBBBBBB'
+ native_format = bytearray('<BBBBBBBBBBBBBB', 'ascii')
+ orders = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+ lengths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+ array_lengths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+ crc_extra = 238
+ unpacker = struct.Struct('<BBBBBBBBBBBBBB')
instance_field = None
instance_offset = -1
- def __init__(self, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, ignition_btn, arm_switch):
+ def __init__(self, ox_filling_btn, ox_release_btn, ox_detach_btn, ox_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars3_btn, tars3m_btn, nitrogen_btn, ignition_btn, arm_switch):
MAVLink_message.__init__(self, MAVLink_conrig_state_tc_message.id, MAVLink_conrig_state_tc_message.name)
self._fieldnames = MAVLink_conrig_state_tc_message.fieldnames
self._instance_field = MAVLink_conrig_state_tc_message.instance_field
self._instance_offset = MAVLink_conrig_state_tc_message.instance_offset
- self.n2o_filling_btn = n2o_filling_btn
- self.n2o_release_btn = n2o_release_btn
- self.n2o_detach_btn = n2o_detach_btn
- self.n2o_venting_btn = n2o_venting_btn
+ self.ox_filling_btn = ox_filling_btn
+ self.ox_release_btn = ox_release_btn
+ self.ox_detach_btn = ox_detach_btn
+ self.ox_venting_btn = ox_venting_btn
self.n2_filling_btn = n2_filling_btn
self.n2_release_btn = n2_release_btn
self.n2_detach_btn = n2_detach_btn
self.n2_quenching_btn = n2_quenching_btn
self.n2_3way_btn = n2_3way_btn
- self.tars_btn = tars_btn
+ self.tars3_btn = tars3_btn
+ self.tars3m_btn = tars3m_btn
self.nitrogen_btn = nitrogen_btn
self.ignition_btn = ignition_btn
self.arm_switch = arm_switch
def pack(self, mav, force_mavlink1=False):
- return MAVLink_message.pack(self, mav, 163, struct.pack('<BBBBBBBBBBBBB', self.n2o_filling_btn, self.n2o_release_btn, self.n2o_detach_btn, self.n2o_venting_btn, self.n2_filling_btn, self.n2_release_btn, self.n2_detach_btn, self.n2_quenching_btn, self.n2_3way_btn, self.tars_btn, self.nitrogen_btn, self.ignition_btn, self.arm_switch), force_mavlink1=force_mavlink1)
+ return MAVLink_message.pack(self, mav, 238, struct.pack('<BBBBBBBBBBBBBB', self.ox_filling_btn, self.ox_release_btn, self.ox_detach_btn, self.ox_venting_btn, self.n2_filling_btn, self.n2_release_btn, self.n2_detach_btn, self.n2_quenching_btn, self.n2_3way_btn, self.tars3_btn, self.tars3m_btn, self.nitrogen_btn, self.ignition_btn, self.arm_switch), force_mavlink1=force_mavlink1)
class MAVLink_set_ignition_time_tc_message(MAVLink_message):
'''
@@ -2998,39 +2999,39 @@ class MAVLink_gse_tm_message(MAVLink_message):
'''
id = MAVLINK_MSG_ID_GSE_TM
name = 'GSE_TM'
- fieldnames = ['timestamp', 'rocket_mass', 'n2o_vessel_mass', 'n2o_filling_pressure', 'n2o_vessel_pressure', 'n2_filling_pressure', 'n2_vessel_1_pressure', 'n2_vessel_2_pressure', 'n2o_filling_valve_state', 'n2o_release_valve_state', 'n2o_detach_state', 'n2o_venting_valve_state', 'n2_filling_valve_state', 'n2_release_valve_state', 'n2_detach_state', 'n2_quenching_valve_state', 'n2_3way_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'ignition_state', 'gmm_state', 'tars_state', 'arming_state', 'cpu_load', 'free_heap', 'battery_voltage', 'current_consumption', 'umbilical_current_consumption', 'main_board_state', 'payload_board_state', 'motor_board_state', 'main_can_status', 'payload_can_status', 'motor_can_status', 'log_number', 'log_good']
- ordered_fieldnames = ['timestamp', 'rocket_mass', 'n2o_vessel_mass', 'n2o_filling_pressure', 'n2o_vessel_pressure', 'n2_filling_pressure', 'n2_vessel_1_pressure', 'n2_vessel_2_pressure', 'cpu_load', 'free_heap', 'battery_voltage', 'current_consumption', 'umbilical_current_consumption', 'log_good', 'log_number', 'n2o_filling_valve_state', 'n2o_release_valve_state', 'n2o_detach_state', 'n2o_venting_valve_state', 'n2_filling_valve_state', 'n2_release_valve_state', 'n2_detach_state', 'n2_quenching_valve_state', 'n2_3way_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'ignition_state', 'gmm_state', 'tars_state', 'arming_state', 'main_board_state', 'payload_board_state', 'motor_board_state', 'main_can_status', 'payload_can_status', 'motor_can_status']
- fieldtypes = ['uint64_t', 'float', 'float', 'float', 'float', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'float', 'uint32_t', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'int16_t', 'int32_t']
+ fieldnames = ['timestamp', 'rocket_mass', 'ox_vessel_mass', 'ox_filling_pressure', 'ox_vessel_pressure', 'n2_filling_pressure', 'n2_vessel_1_pressure', 'n2_vessel_2_pressure', 'ox_filling_valve_state', 'ox_release_valve_state', 'ox_detach_state', 'ox_venting_valve_state', 'n2_filling_valve_state', 'n2_release_valve_state', 'n2_detach_state', 'n2_quenching_valve_state', 'n2_3way_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'chamber_valve_state', 'gmm_state', 'tars3_state', 'tars3m_state', 'arming_state', 'cpu_load', 'free_heap', 'battery_voltage', 'current_consumption', 'umbilical_current_consumption', 'main_board_state', 'payload_board_state', 'motor_board_state', 'main_can_status', 'payload_can_status', 'motor_can_status', 'log_number', 'log_good']
+ ordered_fieldnames = ['timestamp', 'rocket_mass', 'ox_vessel_mass', 'ox_filling_pressure', 'ox_vessel_pressure', 'n2_filling_pressure', 'n2_vessel_1_pressure', 'n2_vessel_2_pressure', 'cpu_load', 'free_heap', 'battery_voltage', 'current_consumption', 'umbilical_current_consumption', 'log_good', 'log_number', 'ox_filling_valve_state', 'ox_release_valve_state', 'ox_detach_state', 'ox_venting_valve_state', 'n2_filling_valve_state', 'n2_release_valve_state', 'n2_detach_state', 'n2_quenching_valve_state', 'n2_3way_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'chamber_valve_state', 'gmm_state', 'tars3_state', 'tars3m_state', 'arming_state', 'main_board_state', 'payload_board_state', 'motor_board_state', 'main_can_status', 'payload_can_status', 'motor_can_status']
+ fieldtypes = ['uint64_t', 'float', 'float', 'float', 'float', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'float', 'uint32_t', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'int16_t', 'int32_t']
fielddisplays_by_name = {}
fieldenums_by_name = {}
- fieldunits_by_name = {"timestamp": "us", "rocket_mass": "kg", "n2o_vessel_mass": "kg", "n2o_filling_pressure": "Bar", "n2o_vessel_pressure": "Bar", "n2_filling_pressure": "Bar", "n2_vessel_1_pressure": "Bar", "n2_vessel_2_pressure": "Bar", "current_consumption": "A", "umbilical_current_consumption": "A"}
- format = '<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBB'
- native_format = bytearray('<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBB', 'ascii')
- orders = [0, 1, 2, 3, 4, 5, 6, 7, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 8, 9, 10, 11, 12, 30, 31, 32, 33, 34, 35, 14, 13]
- lengths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
- array_lengths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- crc_extra = 196
- unpacker = struct.Struct('<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBB')
+ fieldunits_by_name = {"timestamp": "us", "rocket_mass": "kg", "ox_vessel_mass": "kg", "ox_filling_pressure": "Bar", "ox_vessel_pressure": "Bar", "n2_filling_pressure": "Bar", "n2_vessel_1_pressure": "Bar", "n2_vessel_2_pressure": "Bar", "current_consumption": "A", "umbilical_current_consumption": "A"}
+ format = '<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB'
+ native_format = bytearray('<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB', 'ascii')
+ orders = [0, 1, 2, 3, 4, 5, 6, 7, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 8, 9, 10, 11, 12, 31, 32, 33, 34, 35, 36, 14, 13]
+ lengths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+ array_lengths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+ crc_extra = 26
+ unpacker = struct.Struct('<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB')
instance_field = None
instance_offset = -1
- def __init__(self, timestamp, rocket_mass, n2o_vessel_mass, n2o_filling_pressure, n2o_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, n2o_filling_valve_state, n2o_release_valve_state, n2o_detach_state, n2o_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, ignition_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good):
+ def __init__(self, timestamp, rocket_mass, ox_vessel_mass, ox_filling_pressure, ox_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, ox_filling_valve_state, ox_release_valve_state, ox_detach_state, ox_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, chamber_valve_state, gmm_state, tars3_state, tars3m_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good):
MAVLink_message.__init__(self, MAVLink_gse_tm_message.id, MAVLink_gse_tm_message.name)
self._fieldnames = MAVLink_gse_tm_message.fieldnames
self._instance_field = MAVLink_gse_tm_message.instance_field
self._instance_offset = MAVLink_gse_tm_message.instance_offset
self.timestamp = timestamp
self.rocket_mass = rocket_mass
- self.n2o_vessel_mass = n2o_vessel_mass
- self.n2o_filling_pressure = n2o_filling_pressure
- self.n2o_vessel_pressure = n2o_vessel_pressure
+ self.ox_vessel_mass = ox_vessel_mass
+ self.ox_filling_pressure = ox_filling_pressure
+ self.ox_vessel_pressure = ox_vessel_pressure
self.n2_filling_pressure = n2_filling_pressure
self.n2_vessel_1_pressure = n2_vessel_1_pressure
self.n2_vessel_2_pressure = n2_vessel_2_pressure
- self.n2o_filling_valve_state = n2o_filling_valve_state
- self.n2o_release_valve_state = n2o_release_valve_state
- self.n2o_detach_state = n2o_detach_state
- self.n2o_venting_valve_state = n2o_venting_valve_state
+ self.ox_filling_valve_state = ox_filling_valve_state
+ self.ox_release_valve_state = ox_release_valve_state
+ self.ox_detach_state = ox_detach_state
+ self.ox_venting_valve_state = ox_venting_valve_state
self.n2_filling_valve_state = n2_filling_valve_state
self.n2_release_valve_state = n2_release_valve_state
self.n2_detach_state = n2_detach_state
@@ -3038,9 +3039,10 @@ class MAVLink_gse_tm_message(MAVLink_message):
self.n2_3way_valve_state = n2_3way_valve_state
self.main_valve_state = main_valve_state
self.nitrogen_valve_state = nitrogen_valve_state
- self.ignition_state = ignition_state
+ self.chamber_valve_state = chamber_valve_state
self.gmm_state = gmm_state
- self.tars_state = tars_state
+ self.tars3_state = tars3_state
+ self.tars3m_state = tars3m_state
self.arming_state = arming_state
self.cpu_load = cpu_load
self.free_heap = free_heap
@@ -3057,7 +3059,7 @@ class MAVLink_gse_tm_message(MAVLink_message):
self.log_good = log_good
def pack(self, mav, force_mavlink1=False):
- return MAVLink_message.pack(self, mav, 196, struct.pack('<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBB', self.timestamp, self.rocket_mass, self.n2o_vessel_mass, self.n2o_filling_pressure, self.n2o_vessel_pressure, self.n2_filling_pressure, self.n2_vessel_1_pressure, self.n2_vessel_2_pressure, self.cpu_load, self.free_heap, self.battery_voltage, self.current_consumption, self.umbilical_current_consumption, self.log_good, self.log_number, self.n2o_filling_valve_state, self.n2o_release_valve_state, self.n2o_detach_state, self.n2o_venting_valve_state, self.n2_filling_valve_state, self.n2_release_valve_state, self.n2_detach_state, self.n2_quenching_valve_state, self.n2_3way_valve_state, self.main_valve_state, self.nitrogen_valve_state, self.ignition_state, self.gmm_state, self.tars_state, self.arming_state, self.main_board_state, self.payload_board_state, self.motor_board_state, self.main_can_status, self.payload_can_status, self.motor_can_status), force_mavlink1=force_mavlink1)
+ return MAVLink_message.pack(self, mav, 26, struct.pack('<QffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB', self.timestamp, self.rocket_mass, self.ox_vessel_mass, self.ox_filling_pressure, self.ox_vessel_pressure, self.n2_filling_pressure, self.n2_vessel_1_pressure, self.n2_vessel_2_pressure, self.cpu_load, self.free_heap, self.battery_voltage, self.current_consumption, self.umbilical_current_consumption, self.log_good, self.log_number, self.ox_filling_valve_state, self.ox_release_valve_state, self.ox_detach_state, self.ox_venting_valve_state, self.n2_filling_valve_state, self.n2_release_valve_state, self.n2_detach_state, self.n2_quenching_valve_state, self.n2_3way_valve_state, self.main_valve_state, self.nitrogen_valve_state, self.chamber_valve_state, self.gmm_state, self.tars3_state, self.tars3m_state, self.arming_state, self.main_board_state, self.payload_board_state, self.motor_board_state, self.main_can_status, self.payload_can_status, self.motor_can_status), force_mavlink1=force_mavlink1)
class MAVLink_motor_tm_message(MAVLink_message):
'''
@@ -3065,41 +3067,44 @@ class MAVLink_motor_tm_message(MAVLink_message):
'''
id = MAVLINK_MSG_ID_MOTOR_TM
name = 'MOTOR_TM'
- fieldnames = ['timestamp', 'top_tank_pressure', 'bottom_tank_pressure', 'combustion_chamber_pressure', 'tank_temperature', 'main_valve_state', 'venting_valve_state', 'battery_voltage', 'log_number', 'log_good', 'hil_state']
- ordered_fieldnames = ['timestamp', 'top_tank_pressure', 'bottom_tank_pressure', 'combustion_chamber_pressure', 'tank_temperature', 'battery_voltage', 'log_good', 'log_number', 'main_valve_state', 'venting_valve_state', 'hil_state']
- fieldtypes = ['uint64_t', 'float', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'float', 'int16_t', 'int32_t', 'uint8_t']
+ fieldnames = ['timestamp', 'ox_tank_top_pressure', 'ox_tank_bot_pressure', 'n2_tank_pressure', 'combustion_chamber_pressure', 'ox_tank_temperature', 'n2_quenching_valve_state', 'ox_venting_valve_state', 'nitrogen_valve_state', 'main_valve_state', 'battery_voltage', 'log_number', 'log_good', 'hil_state']
+ ordered_fieldnames = ['timestamp', 'ox_tank_top_pressure', 'ox_tank_bot_pressure', 'n2_tank_pressure', 'combustion_chamber_pressure', 'ox_tank_temperature', 'battery_voltage', 'log_good', 'log_number', 'n2_quenching_valve_state', 'ox_venting_valve_state', 'nitrogen_valve_state', 'main_valve_state', 'hil_state']
+ fieldtypes = ['uint64_t', 'float', 'float', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'float', 'int16_t', 'int32_t', 'uint8_t']
fielddisplays_by_name = {}
fieldenums_by_name = {}
- fieldunits_by_name = {"timestamp": "us", "top_tank_pressure": "Bar", "bottom_tank_pressure": "Bar", "combustion_chamber_pressure": "Bar", "battery_voltage": "V"}
- format = '<QfffffihBBB'
- native_format = bytearray('<QfffffihBBB', 'ascii')
- orders = [0, 1, 2, 3, 4, 8, 9, 5, 7, 6, 10]
- lengths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
- array_lengths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- crc_extra = 67
- unpacker = struct.Struct('<QfffffihBBB')
+ fieldunits_by_name = {"timestamp": "us", "ox_tank_top_pressure": "Bar", "ox_tank_bot_pressure": "Bar", "n2_tank_pressure": "Bar", "combustion_chamber_pressure": "Bar", "battery_voltage": "V"}
+ format = '<QffffffihBBBBB'
+ native_format = bytearray('<QffffffihBBBBB', 'ascii')
+ orders = [0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 6, 8, 7, 13]
+ lengths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+ array_lengths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+ crc_extra = 135
+ unpacker = struct.Struct('<QffffffihBBBBB')
instance_field = None
instance_offset = -1
- def __init__(self, timestamp, top_tank_pressure, bottom_tank_pressure, combustion_chamber_pressure, tank_temperature, main_valve_state, venting_valve_state, battery_voltage, log_number, log_good, hil_state):
+ def __init__(self, timestamp, ox_tank_top_pressure, ox_tank_bot_pressure, n2_tank_pressure, combustion_chamber_pressure, ox_tank_temperature, n2_quenching_valve_state, ox_venting_valve_state, nitrogen_valve_state, main_valve_state, battery_voltage, log_number, log_good, hil_state):
MAVLink_message.__init__(self, MAVLink_motor_tm_message.id, MAVLink_motor_tm_message.name)
self._fieldnames = MAVLink_motor_tm_message.fieldnames
self._instance_field = MAVLink_motor_tm_message.instance_field
self._instance_offset = MAVLink_motor_tm_message.instance_offset
self.timestamp = timestamp
- self.top_tank_pressure = top_tank_pressure
- self.bottom_tank_pressure = bottom_tank_pressure
+ self.ox_tank_top_pressure = ox_tank_top_pressure
+ self.ox_tank_bot_pressure = ox_tank_bot_pressure
+ self.n2_tank_pressure = n2_tank_pressure
self.combustion_chamber_pressure = combustion_chamber_pressure
- self.tank_temperature = tank_temperature
+ self.ox_tank_temperature = ox_tank_temperature
+ self.n2_quenching_valve_state = n2_quenching_valve_state
+ self.ox_venting_valve_state = ox_venting_valve_state
+ self.nitrogen_valve_state = nitrogen_valve_state
self.main_valve_state = main_valve_state
- self.venting_valve_state = venting_valve_state
self.battery_voltage = battery_voltage
self.log_number = log_number
self.log_good = log_good
self.hil_state = hil_state
def pack(self, mav, force_mavlink1=False):
- return MAVLink_message.pack(self, mav, 67, struct.pack('<QfffffihBBB', self.timestamp, self.top_tank_pressure, self.bottom_tank_pressure, self.combustion_chamber_pressure, self.tank_temperature, self.battery_voltage, self.log_good, self.log_number, self.main_valve_state, self.venting_valve_state, self.hil_state), force_mavlink1=force_mavlink1)
+ return MAVLink_message.pack(self, mav, 135, struct.pack('<QffffffihBBBBB', self.timestamp, self.ox_tank_top_pressure, self.ox_tank_bot_pressure, self.n2_tank_pressure, self.combustion_chamber_pressure, self.ox_tank_temperature, self.battery_voltage, self.log_good, self.log_number, self.n2_quenching_valve_state, self.ox_venting_valve_state, self.nitrogen_valve_state, self.main_valve_state, self.hil_state), force_mavlink1=force_mavlink1)
class MAVLink_calibration_tm_message(MAVLink_message):
'''
@@ -4043,47 +4048,49 @@ class MAVLink(object):
'''
return self.send(self.set_valve_maximum_aperture_tc_encode(servo_id, maximum_aperture), force_mavlink1=force_mavlink1)
- def conrig_state_tc_encode(self, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, ignition_btn, arm_switch):
+ def conrig_state_tc_encode(self, ox_filling_btn, ox_release_btn, ox_detach_btn, ox_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars3_btn, tars3m_btn, nitrogen_btn, ignition_btn, arm_switch):
'''
- Send the state of the conRIG.
+ The state of the ConRIG control panel
- n2o_filling_btn : N2O filling valve button state (type:uint8_t)
- n2o_release_btn : N2O release line pressure valve button state (type:uint8_t)
- n2o_detach_btn : N2O quick connector detach button state (type:uint8_t)
- n2o_venting_btn : N2O venting valve button state (type:uint8_t)
+ ox_filling_btn : OX filling valve button state (type:uint8_t)
+ ox_release_btn : OX release line pressure valve button state (type:uint8_t)
+ ox_detach_btn : OX quick connector detach button state (type:uint8_t)
+ ox_venting_btn : OX venting valve button state (type:uint8_t)
n2_filling_btn : N2 filling valve button state (type:uint8_t)
n2_release_btn : N2 release line pressure valve button state (type:uint8_t)
n2_detach_btn : N2 quick connector detach button state (type:uint8_t)
n2_quenching_btn : N2 quenching valve button state (type:uint8_t)
n2_3way_btn : N2 3-way valve button state (type:uint8_t)
- tars_btn : TARS algorithm button state (type:uint8_t)
+ tars3_btn : TARS 3 algorithm button state (type:uint8_t)
+ tars3m_btn : TARS 3M algorithm button state (type:uint8_t)
nitrogen_btn : Nitrogen valve button state (type:uint8_t)
ignition_btn : Ignition button state (type:uint8_t)
arm_switch : Arming switch state (type:uint8_t)
'''
- return MAVLink_conrig_state_tc_message(n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, ignition_btn, arm_switch)
+ return MAVLink_conrig_state_tc_message(ox_filling_btn, ox_release_btn, ox_detach_btn, ox_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars3_btn, tars3m_btn, nitrogen_btn, ignition_btn, arm_switch)
- def conrig_state_tc_send(self, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, ignition_btn, arm_switch, force_mavlink1=False):
+ def conrig_state_tc_send(self, ox_filling_btn, ox_release_btn, ox_detach_btn, ox_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars3_btn, tars3m_btn, nitrogen_btn, ignition_btn, arm_switch, force_mavlink1=False):
'''
- Send the state of the conRIG.
+ The state of the ConRIG control panel
- n2o_filling_btn : N2O filling valve button state (type:uint8_t)
- n2o_release_btn : N2O release line pressure valve button state (type:uint8_t)
- n2o_detach_btn : N2O quick connector detach button state (type:uint8_t)
- n2o_venting_btn : N2O venting valve button state (type:uint8_t)
+ ox_filling_btn : OX filling valve button state (type:uint8_t)
+ ox_release_btn : OX release line pressure valve button state (type:uint8_t)
+ ox_detach_btn : OX quick connector detach button state (type:uint8_t)
+ ox_venting_btn : OX venting valve button state (type:uint8_t)
n2_filling_btn : N2 filling valve button state (type:uint8_t)
n2_release_btn : N2 release line pressure valve button state (type:uint8_t)
n2_detach_btn : N2 quick connector detach button state (type:uint8_t)
n2_quenching_btn : N2 quenching valve button state (type:uint8_t)
n2_3way_btn : N2 3-way valve button state (type:uint8_t)
- tars_btn : TARS algorithm button state (type:uint8_t)
+ tars3_btn : TARS 3 algorithm button state (type:uint8_t)
+ tars3m_btn : TARS 3M algorithm button state (type:uint8_t)
nitrogen_btn : Nitrogen valve button state (type:uint8_t)
ignition_btn : Ignition button state (type:uint8_t)
arm_switch : Arming switch state (type:uint8_t)
'''
- return self.send(self.conrig_state_tc_encode(n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, ignition_btn, arm_switch), force_mavlink1=force_mavlink1)
+ return self.send(self.conrig_state_tc_encode(ox_filling_btn, ox_release_btn, ox_detach_btn, ox_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars3_btn, tars3m_btn, nitrogen_btn, ignition_btn, arm_switch), force_mavlink1=force_mavlink1)
def set_ignition_time_tc_encode(self, timing):
'''
@@ -5565,32 +5572,33 @@ class MAVLink(object):
'''
return self.send(self.payload_stats_tm_encode(timestamp, liftoff_ts, liftoff_max_acc_ts, liftoff_max_acc, max_speed_ts, max_speed, max_speed_altitude, max_mach_ts, max_mach, apogee_ts, apogee_lat, apogee_lon, apogee_alt, apogee_max_acc_ts, apogee_max_acc, wing_target_lat, wing_target_lon, wing_active_target_n, wing_active_target_e, wing_algorithm, dpl_ts, dpl_alt, dpl_max_acc_ts, dpl_max_acc, ref_lat, ref_lon, ref_alt, min_pressure, cpu_load, free_heap, nas_state, wnc_state, pin_launch, pin_nosecone, cutter_presence, log_number, log_good, main_board_state, motor_board_state, main_can_status, motor_can_status, rig_can_status, hil_state), force_mavlink1=force_mavlink1)
- def gse_tm_encode(self, timestamp, rocket_mass, n2o_vessel_mass, n2o_filling_pressure, n2o_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, n2o_filling_valve_state, n2o_release_valve_state, n2o_detach_state, n2o_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, ignition_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good):
+ def gse_tm_encode(self, timestamp, rocket_mass, ox_vessel_mass, ox_filling_pressure, ox_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, ox_filling_valve_state, ox_release_valve_state, ox_detach_state, ox_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, chamber_valve_state, gmm_state, tars3_state, tars3m_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good):
'''
Ground Segment Equipment telemetry
timestamp : Timestamp in microseconds [us] (type:uint64_t)
rocket_mass : Rocket mass loadcell measurement [kg] (type:float)
- n2o_vessel_mass : N2O vessel tank mass loadcell measurement [kg] (type:float)
- n2o_filling_pressure : N2O refueling line pressure [Bar] (type:float)
- n2o_vessel_pressure : N2O vessel tank pressure [Bar] (type:float)
+ ox_vessel_mass : OX vessel tank mass loadcell measurement [kg] (type:float)
+ ox_filling_pressure : OX refueling line pressure [Bar] (type:float)
+ ox_vessel_pressure : OX vessel tank pressure [Bar] (type:float)
n2_filling_pressure : N2 refueling line pressure [Bar] (type:float)
n2_vessel_1_pressure : N2 vessel 1 tank pressure [Bar] (type:float)
n2_vessel_2_pressure : N2 vessel 2 tank pressure [Bar] (type:float)
- n2o_filling_valve_state : N2O filling valve state (1: open, 0: close) (type:uint8_t)
- n2o_release_valve_state : N2O release line pressure valve state (1: open, 0: close) (type:uint8_t)
- n2o_detach_state : N2O quick connector detach state (1: open, 0: close) (type:uint8_t)
- n2o_venting_valve_state : N2O venting valve state (1: open, 0: close) (type:uint8_t)
+ ox_filling_valve_state : OX filling valve state (1: open, 0: close) (type:uint8_t)
+ ox_release_valve_state : OX release line pressure valve state (1: open, 0: close) (type:uint8_t)
+ ox_detach_state : OX quick connector detach state (1: open, 0: close) (type:uint8_t)
+ ox_venting_valve_state : OX venting valve state (1: open, 0: close) (type:uint8_t)
n2_filling_valve_state : N2 filling valve state (1: open, 0: close) (type:uint8_t)
n2_release_valve_state : N2 release line pressure valve state (1: open, 0: close) (type:uint8_t)
n2_detach_state : N2 quick connector detach state (1: open, 0: close) (type:uint8_t)
n2_quenching_valve_state : N2 quenching valve state (1: open, 0: close) (type:uint8_t)
n2_3way_valve_state : N2 3-way valve state (1: open, 0: close) (type:uint8_t)
- main_valve_state : Rocket main N2O valve state (1: open, 0: close) (type:uint8_t)
+ main_valve_state : Rocket main OX valve state (1: open, 0: close) (type:uint8_t)
nitrogen_valve_state : Rocket main N2 valve state (1: open, 0: close) (type:uint8_t)
- ignition_state : Ignition relay logical state (1: enabled, 0: disabled) (type:uint8_t)
+ chamber_valve_state : Chamber pressurization valve state (1: enabled, 0: disabled) (type:uint8_t)
gmm_state : State of the GroundModeManager (type:uint8_t)
- tars_state : State of TARS (type:uint8_t)
+ tars3_state : State of TARS 3 (type:uint8_t)
+ tars3m_state : State of TARS 3 Maintenance (type:uint8_t)
arming_state : Arming state (1: armed, 0: otherwise) (type:uint8_t)
cpu_load : CPU load in percentage (type:float)
free_heap : Amount of available heap memory (type:uint32_t)
@@ -5607,34 +5615,35 @@ class MAVLink(object):
log_good : 0 if log failed, 1 otherwise (type:int32_t)
'''
- return MAVLink_gse_tm_message(timestamp, rocket_mass, n2o_vessel_mass, n2o_filling_pressure, n2o_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, n2o_filling_valve_state, n2o_release_valve_state, n2o_detach_state, n2o_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, ignition_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good)
+ return MAVLink_gse_tm_message(timestamp, rocket_mass, ox_vessel_mass, ox_filling_pressure, ox_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, ox_filling_valve_state, ox_release_valve_state, ox_detach_state, ox_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, chamber_valve_state, gmm_state, tars3_state, tars3m_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good)
- def gse_tm_send(self, timestamp, rocket_mass, n2o_vessel_mass, n2o_filling_pressure, n2o_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, n2o_filling_valve_state, n2o_release_valve_state, n2o_detach_state, n2o_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, ignition_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good, force_mavlink1=False):
+ def gse_tm_send(self, timestamp, rocket_mass, ox_vessel_mass, ox_filling_pressure, ox_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, ox_filling_valve_state, ox_release_valve_state, ox_detach_state, ox_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, chamber_valve_state, gmm_state, tars3_state, tars3m_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good, force_mavlink1=False):
'''
Ground Segment Equipment telemetry
timestamp : Timestamp in microseconds [us] (type:uint64_t)
rocket_mass : Rocket mass loadcell measurement [kg] (type:float)
- n2o_vessel_mass : N2O vessel tank mass loadcell measurement [kg] (type:float)
- n2o_filling_pressure : N2O refueling line pressure [Bar] (type:float)
- n2o_vessel_pressure : N2O vessel tank pressure [Bar] (type:float)
+ ox_vessel_mass : OX vessel tank mass loadcell measurement [kg] (type:float)
+ ox_filling_pressure : OX refueling line pressure [Bar] (type:float)
+ ox_vessel_pressure : OX vessel tank pressure [Bar] (type:float)
n2_filling_pressure : N2 refueling line pressure [Bar] (type:float)
n2_vessel_1_pressure : N2 vessel 1 tank pressure [Bar] (type:float)
n2_vessel_2_pressure : N2 vessel 2 tank pressure [Bar] (type:float)
- n2o_filling_valve_state : N2O filling valve state (1: open, 0: close) (type:uint8_t)
- n2o_release_valve_state : N2O release line pressure valve state (1: open, 0: close) (type:uint8_t)
- n2o_detach_state : N2O quick connector detach state (1: open, 0: close) (type:uint8_t)
- n2o_venting_valve_state : N2O venting valve state (1: open, 0: close) (type:uint8_t)
+ ox_filling_valve_state : OX filling valve state (1: open, 0: close) (type:uint8_t)
+ ox_release_valve_state : OX release line pressure valve state (1: open, 0: close) (type:uint8_t)
+ ox_detach_state : OX quick connector detach state (1: open, 0: close) (type:uint8_t)
+ ox_venting_valve_state : OX venting valve state (1: open, 0: close) (type:uint8_t)
n2_filling_valve_state : N2 filling valve state (1: open, 0: close) (type:uint8_t)
n2_release_valve_state : N2 release line pressure valve state (1: open, 0: close) (type:uint8_t)
n2_detach_state : N2 quick connector detach state (1: open, 0: close) (type:uint8_t)
n2_quenching_valve_state : N2 quenching valve state (1: open, 0: close) (type:uint8_t)
n2_3way_valve_state : N2 3-way valve state (1: open, 0: close) (type:uint8_t)
- main_valve_state : Rocket main N2O valve state (1: open, 0: close) (type:uint8_t)
+ main_valve_state : Rocket main OX valve state (1: open, 0: close) (type:uint8_t)
nitrogen_valve_state : Rocket main N2 valve state (1: open, 0: close) (type:uint8_t)
- ignition_state : Ignition relay logical state (1: enabled, 0: disabled) (type:uint8_t)
+ chamber_valve_state : Chamber pressurization valve state (1: enabled, 0: disabled) (type:uint8_t)
gmm_state : State of the GroundModeManager (type:uint8_t)
- tars_state : State of TARS (type:uint8_t)
+ tars3_state : State of TARS 3 (type:uint8_t)
+ tars3m_state : State of TARS 3 Maintenance (type:uint8_t)
arming_state : Arming state (1: armed, 0: otherwise) (type:uint8_t)
cpu_load : CPU load in percentage (type:float)
free_heap : Amount of available heap memory (type:uint32_t)
@@ -5651,45 +5660,51 @@ class MAVLink(object):
log_good : 0 if log failed, 1 otherwise (type:int32_t)
'''
- return self.send(self.gse_tm_encode(timestamp, rocket_mass, n2o_vessel_mass, n2o_filling_pressure, n2o_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, n2o_filling_valve_state, n2o_release_valve_state, n2o_detach_state, n2o_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, ignition_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good), force_mavlink1=force_mavlink1)
+ return self.send(self.gse_tm_encode(timestamp, rocket_mass, ox_vessel_mass, ox_filling_pressure, ox_vessel_pressure, n2_filling_pressure, n2_vessel_1_pressure, n2_vessel_2_pressure, ox_filling_valve_state, ox_release_valve_state, ox_detach_state, ox_venting_valve_state, n2_filling_valve_state, n2_release_valve_state, n2_detach_state, n2_quenching_valve_state, n2_3way_valve_state, main_valve_state, nitrogen_valve_state, chamber_valve_state, gmm_state, tars3_state, tars3m_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good), force_mavlink1=force_mavlink1)
- def motor_tm_encode(self, timestamp, top_tank_pressure, bottom_tank_pressure, combustion_chamber_pressure, tank_temperature, main_valve_state, venting_valve_state, battery_voltage, log_number, log_good, hil_state):
+ def motor_tm_encode(self, timestamp, ox_tank_top_pressure, ox_tank_bot_pressure, n2_tank_pressure, combustion_chamber_pressure, ox_tank_temperature, n2_quenching_valve_state, ox_venting_valve_state, nitrogen_valve_state, main_valve_state, battery_voltage, log_number, log_good, hil_state):
'''
Motor rocket telemetry
timestamp : Timestamp in microseconds [us] (type:uint64_t)
- top_tank_pressure : Tank upper pressure [Bar] (type:float)
- bottom_tank_pressure : Tank bottom pressure [Bar] (type:float)
- combustion_chamber_pressure : Pressure inside the combustion chamber used for automatic shutdown [Bar] (type:float)
- tank_temperature : Tank temperature (type:float)
- main_valve_state : 1 If the main valve is open (type:uint8_t)
- venting_valve_state : 1 If the venting valve is open (type:uint8_t)
+ ox_tank_top_pressure : OX tank top pressure [Bar] (type:float)
+ ox_tank_bot_pressure : OX tank bottom pressure [Bar] (type:float)
+ n2_tank_pressure : N2 tank pressure [Bar] (type:float)
+ combustion_chamber_pressure : Pressure inside the combustion chamber [Bar] (type:float)
+ ox_tank_temperature : OX tank temperature (type:float)
+ n2_quenching_valve_state : N2 quenching valve state (1: open, 0: close) (type:uint8_t)
+ ox_venting_valve_state : OX venting valve state (1: open, 0: close) (type:uint8_t)
+ nitrogen_valve_state : Rocket main N2 valve state (1: open, 0: close) (type:uint8_t)
+ main_valve_state : Rocket main OX valve state (1: open, 0: close) (type:uint8_t)
battery_voltage : Battery voltage [V] (type:float)
log_number : Currently active log file, -1 if the logger is inactive (type:int16_t)
log_good : 0 if log failed, 1 otherwise (type:int32_t)
hil_state : 1 if the board is currently in HIL mode (type:uint8_t)
'''
- return MAVLink_motor_tm_message(timestamp, top_tank_pressure, bottom_tank_pressure, combustion_chamber_pressure, tank_temperature, main_valve_state, venting_valve_state, battery_voltage, log_number, log_good, hil_state)
+ return MAVLink_motor_tm_message(timestamp, ox_tank_top_pressure, ox_tank_bot_pressure, n2_tank_pressure, combustion_chamber_pressure, ox_tank_temperature, n2_quenching_valve_state, ox_venting_valve_state, nitrogen_valve_state, main_valve_state, battery_voltage, log_number, log_good, hil_state)
- def motor_tm_send(self, timestamp, top_tank_pressure, bottom_tank_pressure, combustion_chamber_pressure, tank_temperature, main_valve_state, venting_valve_state, battery_voltage, log_number, log_good, hil_state, force_mavlink1=False):
+ def motor_tm_send(self, timestamp, ox_tank_top_pressure, ox_tank_bot_pressure, n2_tank_pressure, combustion_chamber_pressure, ox_tank_temperature, n2_quenching_valve_state, ox_venting_valve_state, nitrogen_valve_state, main_valve_state, battery_voltage, log_number, log_good, hil_state, force_mavlink1=False):
'''
Motor rocket telemetry
timestamp : Timestamp in microseconds [us] (type:uint64_t)
- top_tank_pressure : Tank upper pressure [Bar] (type:float)
- bottom_tank_pressure : Tank bottom pressure [Bar] (type:float)
- combustion_chamber_pressure : Pressure inside the combustion chamber used for automatic shutdown [Bar] (type:float)
- tank_temperature : Tank temperature (type:float)
- main_valve_state : 1 If the main valve is open (type:uint8_t)
- venting_valve_state : 1 If the venting valve is open (type:uint8_t)
+ ox_tank_top_pressure : OX tank top pressure [Bar] (type:float)
+ ox_tank_bot_pressure : OX tank bottom pressure [Bar] (type:float)
+ n2_tank_pressure : N2 tank pressure [Bar] (type:float)
+ combustion_chamber_pressure : Pressure inside the combustion chamber [Bar] (type:float)
+ ox_tank_temperature : OX tank temperature (type:float)
+ n2_quenching_valve_state : N2 quenching valve state (1: open, 0: close) (type:uint8_t)
+ ox_venting_valve_state : OX venting valve state (1: open, 0: close) (type:uint8_t)
+ nitrogen_valve_state : Rocket main N2 valve state (1: open, 0: close) (type:uint8_t)
+ main_valve_state : Rocket main OX valve state (1: open, 0: close) (type:uint8_t)
battery_voltage : Battery voltage [V] (type:float)
log_number : Currently active log file, -1 if the logger is inactive (type:int16_t)
log_good : 0 if log failed, 1 otherwise (type:int32_t)
hil_state : 1 if the board is currently in HIL mode (type:uint8_t)
'''
- return self.send(self.motor_tm_encode(timestamp, top_tank_pressure, bottom_tank_pressure, combustion_chamber_pressure, tank_temperature, main_valve_state, venting_valve_state, battery_voltage, log_number, log_good, hil_state), force_mavlink1=force_mavlink1)
+ return self.send(self.motor_tm_encode(timestamp, ox_tank_top_pressure, ox_tank_bot_pressure, n2_tank_pressure, combustion_chamber_pressure, ox_tank_temperature, n2_quenching_valve_state, ox_venting_valve_state, nitrogen_valve_state, main_valve_state, battery_voltage, log_number, log_good, hil_state), force_mavlink1=force_mavlink1)
def calibration_tm_encode(self, timestamp, gyro_bias_x, gyro_bias_y, gyro_bias_z, mag_bias_x, mag_bias_y, mag_bias_z, mag_scale_x, mag_scale_y, mag_scale_z, static_press_1_bias, static_press_1_scale, static_press_2_bias, static_press_2_scale, dpl_bay_press_bias, dpl_bay_press_scale, dynamic_press_bias, dynamic_press_scale):
'''
diff --git a/mavlink_lib/orion/mavlink.h b/mavlink_lib/orion/mavlink.h
index d327c1159514743b3dbe1fe38d61ad6a9f1df771..a8750ba04904c04e43fb6714cf83cc3e3e6f0035 100644
--- a/mavlink_lib/orion/mavlink.h
+++ b/mavlink_lib/orion/mavlink.h
@@ -6,7 +6,7 @@
#ifndef MAVLINK_H
#define MAVLINK_H
-#define MAVLINK_PRIMARY_XML_HASH -4454992741057024693
+#define MAVLINK_PRIMARY_XML_HASH -8658508618732954074
#ifndef MAVLINK_STX
#define MAVLINK_STX 254
diff --git a/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h b/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h
index 6df4560524264e67635035f8c6d3a13ac5f2370f..16c32335dc7f995319589aee40c0540106bd4ac2 100644
--- a/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h
+++ b/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h
@@ -5,28 +5,29 @@
typedef struct __mavlink_conrig_state_tc_t {
- uint8_t n2o_filling_btn; /*< N2O filling valve button state*/
- uint8_t n2o_release_btn; /*< N2O release line pressure valve button state*/
- uint8_t n2o_detach_btn; /*< N2O quick connector detach button state*/
- uint8_t n2o_venting_btn; /*< N2O venting valve button state*/
+ uint8_t ox_filling_btn; /*< OX filling valve button state*/
+ uint8_t ox_release_btn; /*< OX release line pressure valve button state*/
+ uint8_t ox_detach_btn; /*< OX quick connector detach button state*/
+ uint8_t ox_venting_btn; /*< OX venting valve button state*/
uint8_t n2_filling_btn; /*< N2 filling valve button state*/
uint8_t n2_release_btn; /*< N2 release line pressure valve button state*/
uint8_t n2_detach_btn; /*< N2 quick connector detach button state*/
uint8_t n2_quenching_btn; /*< N2 quenching valve button state*/
uint8_t n2_3way_btn; /*< N2 3-way valve button state*/
- uint8_t tars_btn; /*< TARS algorithm button state*/
+ uint8_t tars3_btn; /*< TARS 3 algorithm button state*/
+ uint8_t tars3m_btn; /*< TARS 3M algorithm button state*/
uint8_t nitrogen_btn; /*< Nitrogen valve button state*/
uint8_t ignition_btn; /*< Ignition button state*/
uint8_t arm_switch; /*< Arming switch state*/
} mavlink_conrig_state_tc_t;
-#define MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN 13
-#define MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN 13
-#define MAVLINK_MSG_ID_32_LEN 13
-#define MAVLINK_MSG_ID_32_MIN_LEN 13
+#define MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN 14
+#define MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN 14
+#define MAVLINK_MSG_ID_32_LEN 14
+#define MAVLINK_MSG_ID_32_MIN_LEN 14
-#define MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC 163
-#define MAVLINK_MSG_ID_32_CRC 163
+#define MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC 238
+#define MAVLINK_MSG_ID_32_CRC 238
@@ -34,39 +35,41 @@ typedef struct __mavlink_conrig_state_tc_t {
#define MAVLINK_MESSAGE_INFO_CONRIG_STATE_TC { \
32, \
"CONRIG_STATE_TC", \
- 13, \
- { { "n2o_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_conrig_state_tc_t, n2o_filling_btn) }, \
- { "n2o_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, n2o_release_btn) }, \
- { "n2o_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, n2o_detach_btn) }, \
- { "n2o_venting_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, n2o_venting_btn) }, \
+ 14, \
+ { { "ox_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_conrig_state_tc_t, ox_filling_btn) }, \
+ { "ox_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, ox_release_btn) }, \
+ { "ox_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, ox_detach_btn) }, \
+ { "ox_venting_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, ox_venting_btn) }, \
{ "n2_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_conrig_state_tc_t, n2_filling_btn) }, \
{ "n2_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_conrig_state_tc_t, n2_release_btn) }, \
{ "n2_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_conrig_state_tc_t, n2_detach_btn) }, \
{ "n2_quenching_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_conrig_state_tc_t, n2_quenching_btn) }, \
{ "n2_3way_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_conrig_state_tc_t, n2_3way_btn) }, \
- { "tars_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_conrig_state_tc_t, tars_btn) }, \
- { "nitrogen_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_conrig_state_tc_t, nitrogen_btn) }, \
- { "ignition_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_conrig_state_tc_t, ignition_btn) }, \
- { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \
+ { "tars3_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_conrig_state_tc_t, tars3_btn) }, \
+ { "tars3m_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_conrig_state_tc_t, tars3m_btn) }, \
+ { "nitrogen_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_conrig_state_tc_t, nitrogen_btn) }, \
+ { "ignition_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_conrig_state_tc_t, ignition_btn) }, \
+ { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 13, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \
} \
}
#else
#define MAVLINK_MESSAGE_INFO_CONRIG_STATE_TC { \
"CONRIG_STATE_TC", \
- 13, \
- { { "n2o_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_conrig_state_tc_t, n2o_filling_btn) }, \
- { "n2o_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, n2o_release_btn) }, \
- { "n2o_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, n2o_detach_btn) }, \
- { "n2o_venting_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, n2o_venting_btn) }, \
+ 14, \
+ { { "ox_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_conrig_state_tc_t, ox_filling_btn) }, \
+ { "ox_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, ox_release_btn) }, \
+ { "ox_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, ox_detach_btn) }, \
+ { "ox_venting_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, ox_venting_btn) }, \
{ "n2_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_conrig_state_tc_t, n2_filling_btn) }, \
{ "n2_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_conrig_state_tc_t, n2_release_btn) }, \
{ "n2_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_conrig_state_tc_t, n2_detach_btn) }, \
{ "n2_quenching_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_conrig_state_tc_t, n2_quenching_btn) }, \
{ "n2_3way_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_conrig_state_tc_t, n2_3way_btn) }, \
- { "tars_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_conrig_state_tc_t, tars_btn) }, \
- { "nitrogen_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_conrig_state_tc_t, nitrogen_btn) }, \
- { "ignition_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_conrig_state_tc_t, ignition_btn) }, \
- { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \
+ { "tars3_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_conrig_state_tc_t, tars3_btn) }, \
+ { "tars3m_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_conrig_state_tc_t, tars3m_btn) }, \
+ { "nitrogen_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_conrig_state_tc_t, nitrogen_btn) }, \
+ { "ignition_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_conrig_state_tc_t, ignition_btn) }, \
+ { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 13, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \
} \
}
#endif
@@ -77,53 +80,56 @@ typedef struct __mavlink_conrig_state_tc_t {
* @param component_id ID of this component (e.g. 200 for IMU)
* @param msg The MAVLink message to compress the data into
*
- * @param n2o_filling_btn N2O filling valve button state
- * @param n2o_release_btn N2O release line pressure valve button state
- * @param n2o_detach_btn N2O quick connector detach button state
- * @param n2o_venting_btn N2O venting valve button state
+ * @param ox_filling_btn OX filling valve button state
+ * @param ox_release_btn OX release line pressure valve button state
+ * @param ox_detach_btn OX quick connector detach button state
+ * @param ox_venting_btn OX venting valve button state
* @param n2_filling_btn N2 filling valve button state
* @param n2_release_btn N2 release line pressure valve button state
* @param n2_detach_btn N2 quick connector detach button state
* @param n2_quenching_btn N2 quenching valve button state
* @param n2_3way_btn N2 3-way valve button state
- * @param tars_btn TARS algorithm button state
+ * @param tars3_btn TARS 3 algorithm button state
+ * @param tars3m_btn TARS 3M algorithm button state
* @param nitrogen_btn Nitrogen valve button state
* @param ignition_btn Ignition button state
* @param arm_switch Arming switch state
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_conrig_state_tc_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
- uint8_t n2o_filling_btn, uint8_t n2o_release_btn, uint8_t n2o_detach_btn, uint8_t n2o_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars_btn, uint8_t nitrogen_btn, uint8_t ignition_btn, uint8_t arm_switch)
+ uint8_t ox_filling_btn, uint8_t ox_release_btn, uint8_t ox_detach_btn, uint8_t ox_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars3_btn, uint8_t tars3m_btn, uint8_t nitrogen_btn, uint8_t ignition_btn, uint8_t arm_switch)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN];
- _mav_put_uint8_t(buf, 0, n2o_filling_btn);
- _mav_put_uint8_t(buf, 1, n2o_release_btn);
- _mav_put_uint8_t(buf, 2, n2o_detach_btn);
- _mav_put_uint8_t(buf, 3, n2o_venting_btn);
+ _mav_put_uint8_t(buf, 0, ox_filling_btn);
+ _mav_put_uint8_t(buf, 1, ox_release_btn);
+ _mav_put_uint8_t(buf, 2, ox_detach_btn);
+ _mav_put_uint8_t(buf, 3, ox_venting_btn);
_mav_put_uint8_t(buf, 4, n2_filling_btn);
_mav_put_uint8_t(buf, 5, n2_release_btn);
_mav_put_uint8_t(buf, 6, n2_detach_btn);
_mav_put_uint8_t(buf, 7, n2_quenching_btn);
_mav_put_uint8_t(buf, 8, n2_3way_btn);
- _mav_put_uint8_t(buf, 9, tars_btn);
- _mav_put_uint8_t(buf, 10, nitrogen_btn);
- _mav_put_uint8_t(buf, 11, ignition_btn);
- _mav_put_uint8_t(buf, 12, arm_switch);
+ _mav_put_uint8_t(buf, 9, tars3_btn);
+ _mav_put_uint8_t(buf, 10, tars3m_btn);
+ _mav_put_uint8_t(buf, 11, nitrogen_btn);
+ _mav_put_uint8_t(buf, 12, ignition_btn);
+ _mav_put_uint8_t(buf, 13, arm_switch);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN);
#else
mavlink_conrig_state_tc_t packet;
- packet.n2o_filling_btn = n2o_filling_btn;
- packet.n2o_release_btn = n2o_release_btn;
- packet.n2o_detach_btn = n2o_detach_btn;
- packet.n2o_venting_btn = n2o_venting_btn;
+ packet.ox_filling_btn = ox_filling_btn;
+ packet.ox_release_btn = ox_release_btn;
+ packet.ox_detach_btn = ox_detach_btn;
+ packet.ox_venting_btn = ox_venting_btn;
packet.n2_filling_btn = n2_filling_btn;
packet.n2_release_btn = n2_release_btn;
packet.n2_detach_btn = n2_detach_btn;
packet.n2_quenching_btn = n2_quenching_btn;
packet.n2_3way_btn = n2_3way_btn;
- packet.tars_btn = tars_btn;
+ packet.tars3_btn = tars3_btn;
+ packet.tars3m_btn = tars3m_btn;
packet.nitrogen_btn = nitrogen_btn;
packet.ignition_btn = ignition_btn;
packet.arm_switch = arm_switch;
@@ -141,16 +147,17 @@ static inline uint16_t mavlink_msg_conrig_state_tc_pack(uint8_t system_id, uint8
* @param component_id ID of this component (e.g. 200 for IMU)
* @param chan The MAVLink channel this message will be sent over
* @param msg The MAVLink message to compress the data into
- * @param n2o_filling_btn N2O filling valve button state
- * @param n2o_release_btn N2O release line pressure valve button state
- * @param n2o_detach_btn N2O quick connector detach button state
- * @param n2o_venting_btn N2O venting valve button state
+ * @param ox_filling_btn OX filling valve button state
+ * @param ox_release_btn OX release line pressure valve button state
+ * @param ox_detach_btn OX quick connector detach button state
+ * @param ox_venting_btn OX venting valve button state
* @param n2_filling_btn N2 filling valve button state
* @param n2_release_btn N2 release line pressure valve button state
* @param n2_detach_btn N2 quick connector detach button state
* @param n2_quenching_btn N2 quenching valve button state
* @param n2_3way_btn N2 3-way valve button state
- * @param tars_btn TARS algorithm button state
+ * @param tars3_btn TARS 3 algorithm button state
+ * @param tars3m_btn TARS 3M algorithm button state
* @param nitrogen_btn Nitrogen valve button state
* @param ignition_btn Ignition button state
* @param arm_switch Arming switch state
@@ -158,37 +165,39 @@ static inline uint16_t mavlink_msg_conrig_state_tc_pack(uint8_t system_id, uint8
*/
static inline uint16_t mavlink_msg_conrig_state_tc_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
- uint8_t n2o_filling_btn,uint8_t n2o_release_btn,uint8_t n2o_detach_btn,uint8_t n2o_venting_btn,uint8_t n2_filling_btn,uint8_t n2_release_btn,uint8_t n2_detach_btn,uint8_t n2_quenching_btn,uint8_t n2_3way_btn,uint8_t tars_btn,uint8_t nitrogen_btn,uint8_t ignition_btn,uint8_t arm_switch)
+ uint8_t ox_filling_btn,uint8_t ox_release_btn,uint8_t ox_detach_btn,uint8_t ox_venting_btn,uint8_t n2_filling_btn,uint8_t n2_release_btn,uint8_t n2_detach_btn,uint8_t n2_quenching_btn,uint8_t n2_3way_btn,uint8_t tars3_btn,uint8_t tars3m_btn,uint8_t nitrogen_btn,uint8_t ignition_btn,uint8_t arm_switch)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN];
- _mav_put_uint8_t(buf, 0, n2o_filling_btn);
- _mav_put_uint8_t(buf, 1, n2o_release_btn);
- _mav_put_uint8_t(buf, 2, n2o_detach_btn);
- _mav_put_uint8_t(buf, 3, n2o_venting_btn);
+ _mav_put_uint8_t(buf, 0, ox_filling_btn);
+ _mav_put_uint8_t(buf, 1, ox_release_btn);
+ _mav_put_uint8_t(buf, 2, ox_detach_btn);
+ _mav_put_uint8_t(buf, 3, ox_venting_btn);
_mav_put_uint8_t(buf, 4, n2_filling_btn);
_mav_put_uint8_t(buf, 5, n2_release_btn);
_mav_put_uint8_t(buf, 6, n2_detach_btn);
_mav_put_uint8_t(buf, 7, n2_quenching_btn);
_mav_put_uint8_t(buf, 8, n2_3way_btn);
- _mav_put_uint8_t(buf, 9, tars_btn);
- _mav_put_uint8_t(buf, 10, nitrogen_btn);
- _mav_put_uint8_t(buf, 11, ignition_btn);
- _mav_put_uint8_t(buf, 12, arm_switch);
+ _mav_put_uint8_t(buf, 9, tars3_btn);
+ _mav_put_uint8_t(buf, 10, tars3m_btn);
+ _mav_put_uint8_t(buf, 11, nitrogen_btn);
+ _mav_put_uint8_t(buf, 12, ignition_btn);
+ _mav_put_uint8_t(buf, 13, arm_switch);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN);
#else
mavlink_conrig_state_tc_t packet;
- packet.n2o_filling_btn = n2o_filling_btn;
- packet.n2o_release_btn = n2o_release_btn;
- packet.n2o_detach_btn = n2o_detach_btn;
- packet.n2o_venting_btn = n2o_venting_btn;
+ packet.ox_filling_btn = ox_filling_btn;
+ packet.ox_release_btn = ox_release_btn;
+ packet.ox_detach_btn = ox_detach_btn;
+ packet.ox_venting_btn = ox_venting_btn;
packet.n2_filling_btn = n2_filling_btn;
packet.n2_release_btn = n2_release_btn;
packet.n2_detach_btn = n2_detach_btn;
packet.n2_quenching_btn = n2_quenching_btn;
packet.n2_3way_btn = n2_3way_btn;
- packet.tars_btn = tars_btn;
+ packet.tars3_btn = tars3_btn;
+ packet.tars3m_btn = tars3m_btn;
packet.nitrogen_btn = nitrogen_btn;
packet.ignition_btn = ignition_btn;
packet.arm_switch = arm_switch;
@@ -210,7 +219,7 @@ static inline uint16_t mavlink_msg_conrig_state_tc_pack_chan(uint8_t system_id,
*/
static inline uint16_t mavlink_msg_conrig_state_tc_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_conrig_state_tc_t* conrig_state_tc)
{
- return mavlink_msg_conrig_state_tc_pack(system_id, component_id, msg, conrig_state_tc->n2o_filling_btn, conrig_state_tc->n2o_release_btn, conrig_state_tc->n2o_detach_btn, conrig_state_tc->n2o_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->ignition_btn, conrig_state_tc->arm_switch);
+ return mavlink_msg_conrig_state_tc_pack(system_id, component_id, msg, conrig_state_tc->ox_filling_btn, conrig_state_tc->ox_release_btn, conrig_state_tc->ox_detach_btn, conrig_state_tc->ox_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars3_btn, conrig_state_tc->tars3m_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->ignition_btn, conrig_state_tc->arm_switch);
}
/**
@@ -224,60 +233,63 @@ static inline uint16_t mavlink_msg_conrig_state_tc_encode(uint8_t system_id, uin
*/
static inline uint16_t mavlink_msg_conrig_state_tc_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_conrig_state_tc_t* conrig_state_tc)
{
- return mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, chan, msg, conrig_state_tc->n2o_filling_btn, conrig_state_tc->n2o_release_btn, conrig_state_tc->n2o_detach_btn, conrig_state_tc->n2o_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->ignition_btn, conrig_state_tc->arm_switch);
+ return mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, chan, msg, conrig_state_tc->ox_filling_btn, conrig_state_tc->ox_release_btn, conrig_state_tc->ox_detach_btn, conrig_state_tc->ox_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars3_btn, conrig_state_tc->tars3m_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->ignition_btn, conrig_state_tc->arm_switch);
}
/**
* @brief Send a conrig_state_tc message
* @param chan MAVLink channel to send the message
*
- * @param n2o_filling_btn N2O filling valve button state
- * @param n2o_release_btn N2O release line pressure valve button state
- * @param n2o_detach_btn N2O quick connector detach button state
- * @param n2o_venting_btn N2O venting valve button state
+ * @param ox_filling_btn OX filling valve button state
+ * @param ox_release_btn OX release line pressure valve button state
+ * @param ox_detach_btn OX quick connector detach button state
+ * @param ox_venting_btn OX venting valve button state
* @param n2_filling_btn N2 filling valve button state
* @param n2_release_btn N2 release line pressure valve button state
* @param n2_detach_btn N2 quick connector detach button state
* @param n2_quenching_btn N2 quenching valve button state
* @param n2_3way_btn N2 3-way valve button state
- * @param tars_btn TARS algorithm button state
+ * @param tars3_btn TARS 3 algorithm button state
+ * @param tars3m_btn TARS 3M algorithm button state
* @param nitrogen_btn Nitrogen valve button state
* @param ignition_btn Ignition button state
* @param arm_switch Arming switch state
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-static inline void mavlink_msg_conrig_state_tc_send(mavlink_channel_t chan, uint8_t n2o_filling_btn, uint8_t n2o_release_btn, uint8_t n2o_detach_btn, uint8_t n2o_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars_btn, uint8_t nitrogen_btn, uint8_t ignition_btn, uint8_t arm_switch)
+static inline void mavlink_msg_conrig_state_tc_send(mavlink_channel_t chan, uint8_t ox_filling_btn, uint8_t ox_release_btn, uint8_t ox_detach_btn, uint8_t ox_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars3_btn, uint8_t tars3m_btn, uint8_t nitrogen_btn, uint8_t ignition_btn, uint8_t arm_switch)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN];
- _mav_put_uint8_t(buf, 0, n2o_filling_btn);
- _mav_put_uint8_t(buf, 1, n2o_release_btn);
- _mav_put_uint8_t(buf, 2, n2o_detach_btn);
- _mav_put_uint8_t(buf, 3, n2o_venting_btn);
+ _mav_put_uint8_t(buf, 0, ox_filling_btn);
+ _mav_put_uint8_t(buf, 1, ox_release_btn);
+ _mav_put_uint8_t(buf, 2, ox_detach_btn);
+ _mav_put_uint8_t(buf, 3, ox_venting_btn);
_mav_put_uint8_t(buf, 4, n2_filling_btn);
_mav_put_uint8_t(buf, 5, n2_release_btn);
_mav_put_uint8_t(buf, 6, n2_detach_btn);
_mav_put_uint8_t(buf, 7, n2_quenching_btn);
_mav_put_uint8_t(buf, 8, n2_3way_btn);
- _mav_put_uint8_t(buf, 9, tars_btn);
- _mav_put_uint8_t(buf, 10, nitrogen_btn);
- _mav_put_uint8_t(buf, 11, ignition_btn);
- _mav_put_uint8_t(buf, 12, arm_switch);
+ _mav_put_uint8_t(buf, 9, tars3_btn);
+ _mav_put_uint8_t(buf, 10, tars3m_btn);
+ _mav_put_uint8_t(buf, 11, nitrogen_btn);
+ _mav_put_uint8_t(buf, 12, ignition_btn);
+ _mav_put_uint8_t(buf, 13, arm_switch);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC);
#else
mavlink_conrig_state_tc_t packet;
- packet.n2o_filling_btn = n2o_filling_btn;
- packet.n2o_release_btn = n2o_release_btn;
- packet.n2o_detach_btn = n2o_detach_btn;
- packet.n2o_venting_btn = n2o_venting_btn;
+ packet.ox_filling_btn = ox_filling_btn;
+ packet.ox_release_btn = ox_release_btn;
+ packet.ox_detach_btn = ox_detach_btn;
+ packet.ox_venting_btn = ox_venting_btn;
packet.n2_filling_btn = n2_filling_btn;
packet.n2_release_btn = n2_release_btn;
packet.n2_detach_btn = n2_detach_btn;
packet.n2_quenching_btn = n2_quenching_btn;
packet.n2_3way_btn = n2_3way_btn;
- packet.tars_btn = tars_btn;
+ packet.tars3_btn = tars3_btn;
+ packet.tars3m_btn = tars3m_btn;
packet.nitrogen_btn = nitrogen_btn;
packet.ignition_btn = ignition_btn;
packet.arm_switch = arm_switch;
@@ -294,7 +306,7 @@ static inline void mavlink_msg_conrig_state_tc_send(mavlink_channel_t chan, uint
static inline void mavlink_msg_conrig_state_tc_send_struct(mavlink_channel_t chan, const mavlink_conrig_state_tc_t* conrig_state_tc)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
- mavlink_msg_conrig_state_tc_send(chan, conrig_state_tc->n2o_filling_btn, conrig_state_tc->n2o_release_btn, conrig_state_tc->n2o_detach_btn, conrig_state_tc->n2o_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->ignition_btn, conrig_state_tc->arm_switch);
+ mavlink_msg_conrig_state_tc_send(chan, conrig_state_tc->ox_filling_btn, conrig_state_tc->ox_release_btn, conrig_state_tc->ox_detach_btn, conrig_state_tc->ox_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars3_btn, conrig_state_tc->tars3m_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->ignition_btn, conrig_state_tc->arm_switch);
#else
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, (const char *)conrig_state_tc, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC);
#endif
@@ -308,37 +320,39 @@ static inline void mavlink_msg_conrig_state_tc_send_struct(mavlink_channel_t cha
is usually the receive buffer for the channel, and allows a reply to an
incoming message with minimum stack space usage.
*/
-static inline void mavlink_msg_conrig_state_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t n2o_filling_btn, uint8_t n2o_release_btn, uint8_t n2o_detach_btn, uint8_t n2o_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars_btn, uint8_t nitrogen_btn, uint8_t ignition_btn, uint8_t arm_switch)
+static inline void mavlink_msg_conrig_state_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t ox_filling_btn, uint8_t ox_release_btn, uint8_t ox_detach_btn, uint8_t ox_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars3_btn, uint8_t tars3m_btn, uint8_t nitrogen_btn, uint8_t ignition_btn, uint8_t arm_switch)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
- _mav_put_uint8_t(buf, 0, n2o_filling_btn);
- _mav_put_uint8_t(buf, 1, n2o_release_btn);
- _mav_put_uint8_t(buf, 2, n2o_detach_btn);
- _mav_put_uint8_t(buf, 3, n2o_venting_btn);
+ _mav_put_uint8_t(buf, 0, ox_filling_btn);
+ _mav_put_uint8_t(buf, 1, ox_release_btn);
+ _mav_put_uint8_t(buf, 2, ox_detach_btn);
+ _mav_put_uint8_t(buf, 3, ox_venting_btn);
_mav_put_uint8_t(buf, 4, n2_filling_btn);
_mav_put_uint8_t(buf, 5, n2_release_btn);
_mav_put_uint8_t(buf, 6, n2_detach_btn);
_mav_put_uint8_t(buf, 7, n2_quenching_btn);
_mav_put_uint8_t(buf, 8, n2_3way_btn);
- _mav_put_uint8_t(buf, 9, tars_btn);
- _mav_put_uint8_t(buf, 10, nitrogen_btn);
- _mav_put_uint8_t(buf, 11, ignition_btn);
- _mav_put_uint8_t(buf, 12, arm_switch);
+ _mav_put_uint8_t(buf, 9, tars3_btn);
+ _mav_put_uint8_t(buf, 10, tars3m_btn);
+ _mav_put_uint8_t(buf, 11, nitrogen_btn);
+ _mav_put_uint8_t(buf, 12, ignition_btn);
+ _mav_put_uint8_t(buf, 13, arm_switch);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC);
#else
mavlink_conrig_state_tc_t *packet = (mavlink_conrig_state_tc_t *)msgbuf;
- packet->n2o_filling_btn = n2o_filling_btn;
- packet->n2o_release_btn = n2o_release_btn;
- packet->n2o_detach_btn = n2o_detach_btn;
- packet->n2o_venting_btn = n2o_venting_btn;
+ packet->ox_filling_btn = ox_filling_btn;
+ packet->ox_release_btn = ox_release_btn;
+ packet->ox_detach_btn = ox_detach_btn;
+ packet->ox_venting_btn = ox_venting_btn;
packet->n2_filling_btn = n2_filling_btn;
packet->n2_release_btn = n2_release_btn;
packet->n2_detach_btn = n2_detach_btn;
packet->n2_quenching_btn = n2_quenching_btn;
packet->n2_3way_btn = n2_3way_btn;
- packet->tars_btn = tars_btn;
+ packet->tars3_btn = tars3_btn;
+ packet->tars3m_btn = tars3m_btn;
packet->nitrogen_btn = nitrogen_btn;
packet->ignition_btn = ignition_btn;
packet->arm_switch = arm_switch;
@@ -354,41 +368,41 @@ static inline void mavlink_msg_conrig_state_tc_send_buf(mavlink_message_t *msgbu
/**
- * @brief Get field n2o_filling_btn from conrig_state_tc message
+ * @brief Get field ox_filling_btn from conrig_state_tc message
*
- * @return N2O filling valve button state
+ * @return OX filling valve button state
*/
-static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_filling_btn(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_conrig_state_tc_get_ox_filling_btn(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 0);
}
/**
- * @brief Get field n2o_release_btn from conrig_state_tc message
+ * @brief Get field ox_release_btn from conrig_state_tc message
*
- * @return N2O release line pressure valve button state
+ * @return OX release line pressure valve button state
*/
-static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_release_btn(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_conrig_state_tc_get_ox_release_btn(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 1);
}
/**
- * @brief Get field n2o_detach_btn from conrig_state_tc message
+ * @brief Get field ox_detach_btn from conrig_state_tc message
*
- * @return N2O quick connector detach button state
+ * @return OX quick connector detach button state
*/
-static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_detach_btn(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_conrig_state_tc_get_ox_detach_btn(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 2);
}
/**
- * @brief Get field n2o_venting_btn from conrig_state_tc message
+ * @brief Get field ox_venting_btn from conrig_state_tc message
*
- * @return N2O venting valve button state
+ * @return OX venting valve button state
*/
-static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_venting_btn(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_conrig_state_tc_get_ox_venting_btn(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 3);
}
@@ -444,15 +458,25 @@ static inline uint8_t mavlink_msg_conrig_state_tc_get_n2_3way_btn(const mavlink_
}
/**
- * @brief Get field tars_btn from conrig_state_tc message
+ * @brief Get field tars3_btn from conrig_state_tc message
*
- * @return TARS algorithm button state
+ * @return TARS 3 algorithm button state
*/
-static inline uint8_t mavlink_msg_conrig_state_tc_get_tars_btn(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_conrig_state_tc_get_tars3_btn(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 9);
}
+/**
+ * @brief Get field tars3m_btn from conrig_state_tc message
+ *
+ * @return TARS 3M algorithm button state
+ */
+static inline uint8_t mavlink_msg_conrig_state_tc_get_tars3m_btn(const mavlink_message_t* msg)
+{
+ return _MAV_RETURN_uint8_t(msg, 10);
+}
+
/**
* @brief Get field nitrogen_btn from conrig_state_tc message
*
@@ -460,7 +484,7 @@ static inline uint8_t mavlink_msg_conrig_state_tc_get_tars_btn(const mavlink_mes
*/
static inline uint8_t mavlink_msg_conrig_state_tc_get_nitrogen_btn(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 10);
+ return _MAV_RETURN_uint8_t(msg, 11);
}
/**
@@ -470,7 +494,7 @@ static inline uint8_t mavlink_msg_conrig_state_tc_get_nitrogen_btn(const mavlink
*/
static inline uint8_t mavlink_msg_conrig_state_tc_get_ignition_btn(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 11);
+ return _MAV_RETURN_uint8_t(msg, 12);
}
/**
@@ -480,7 +504,7 @@ static inline uint8_t mavlink_msg_conrig_state_tc_get_ignition_btn(const mavlink
*/
static inline uint8_t mavlink_msg_conrig_state_tc_get_arm_switch(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 12);
+ return _MAV_RETURN_uint8_t(msg, 13);
}
/**
@@ -492,16 +516,17 @@ static inline uint8_t mavlink_msg_conrig_state_tc_get_arm_switch(const mavlink_m
static inline void mavlink_msg_conrig_state_tc_decode(const mavlink_message_t* msg, mavlink_conrig_state_tc_t* conrig_state_tc)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
- conrig_state_tc->n2o_filling_btn = mavlink_msg_conrig_state_tc_get_n2o_filling_btn(msg);
- conrig_state_tc->n2o_release_btn = mavlink_msg_conrig_state_tc_get_n2o_release_btn(msg);
- conrig_state_tc->n2o_detach_btn = mavlink_msg_conrig_state_tc_get_n2o_detach_btn(msg);
- conrig_state_tc->n2o_venting_btn = mavlink_msg_conrig_state_tc_get_n2o_venting_btn(msg);
+ conrig_state_tc->ox_filling_btn = mavlink_msg_conrig_state_tc_get_ox_filling_btn(msg);
+ conrig_state_tc->ox_release_btn = mavlink_msg_conrig_state_tc_get_ox_release_btn(msg);
+ conrig_state_tc->ox_detach_btn = mavlink_msg_conrig_state_tc_get_ox_detach_btn(msg);
+ conrig_state_tc->ox_venting_btn = mavlink_msg_conrig_state_tc_get_ox_venting_btn(msg);
conrig_state_tc->n2_filling_btn = mavlink_msg_conrig_state_tc_get_n2_filling_btn(msg);
conrig_state_tc->n2_release_btn = mavlink_msg_conrig_state_tc_get_n2_release_btn(msg);
conrig_state_tc->n2_detach_btn = mavlink_msg_conrig_state_tc_get_n2_detach_btn(msg);
conrig_state_tc->n2_quenching_btn = mavlink_msg_conrig_state_tc_get_n2_quenching_btn(msg);
conrig_state_tc->n2_3way_btn = mavlink_msg_conrig_state_tc_get_n2_3way_btn(msg);
- conrig_state_tc->tars_btn = mavlink_msg_conrig_state_tc_get_tars_btn(msg);
+ conrig_state_tc->tars3_btn = mavlink_msg_conrig_state_tc_get_tars3_btn(msg);
+ conrig_state_tc->tars3m_btn = mavlink_msg_conrig_state_tc_get_tars3m_btn(msg);
conrig_state_tc->nitrogen_btn = mavlink_msg_conrig_state_tc_get_nitrogen_btn(msg);
conrig_state_tc->ignition_btn = mavlink_msg_conrig_state_tc_get_ignition_btn(msg);
conrig_state_tc->arm_switch = mavlink_msg_conrig_state_tc_get_arm_switch(msg);
diff --git a/mavlink_lib/orion/mavlink_msg_gse_tm.h b/mavlink_lib/orion/mavlink_msg_gse_tm.h
index 3a5b0bb2050375f94b97bcf2f89a123b7a6fe06e..20dda33844ec0d73ab2a670a15d2bbb905145d13 100644
--- a/mavlink_lib/orion/mavlink_msg_gse_tm.h
+++ b/mavlink_lib/orion/mavlink_msg_gse_tm.h
@@ -7,9 +7,9 @@
typedef struct __mavlink_gse_tm_t {
uint64_t timestamp; /*< [us] Timestamp in microseconds*/
float rocket_mass; /*< [kg] Rocket mass loadcell measurement*/
- float n2o_vessel_mass; /*< [kg] N2O vessel tank mass loadcell measurement*/
- float n2o_filling_pressure; /*< [Bar] N2O refueling line pressure*/
- float n2o_vessel_pressure; /*< [Bar] N2O vessel tank pressure*/
+ float ox_vessel_mass; /*< [kg] OX vessel tank mass loadcell measurement*/
+ float ox_filling_pressure; /*< [Bar] OX refueling line pressure*/
+ float ox_vessel_pressure; /*< [Bar] OX vessel tank pressure*/
float n2_filling_pressure; /*< [Bar] N2 refueling line pressure*/
float n2_vessel_1_pressure; /*< [Bar] N2 vessel 1 tank pressure*/
float n2_vessel_2_pressure; /*< [Bar] N2 vessel 2 tank pressure*/
@@ -20,20 +20,21 @@ typedef struct __mavlink_gse_tm_t {
float umbilical_current_consumption; /*< [A] Umbilical current*/
int32_t log_good; /*< 0 if log failed, 1 otherwise*/
int16_t log_number; /*< Currently active log file, -1 if the logger is inactive*/
- uint8_t n2o_filling_valve_state; /*< N2O filling valve state (1: open, 0: close)*/
- uint8_t n2o_release_valve_state; /*< N2O release line pressure valve state (1: open, 0: close)*/
- uint8_t n2o_detach_state; /*< N2O quick connector detach state (1: open, 0: close)*/
- uint8_t n2o_venting_valve_state; /*< N2O venting valve state (1: open, 0: close)*/
+ uint8_t ox_filling_valve_state; /*< OX filling valve state (1: open, 0: close)*/
+ uint8_t ox_release_valve_state; /*< OX release line pressure valve state (1: open, 0: close)*/
+ uint8_t ox_detach_state; /*< OX quick connector detach state (1: open, 0: close)*/
+ uint8_t ox_venting_valve_state; /*< OX venting valve state (1: open, 0: close)*/
uint8_t n2_filling_valve_state; /*< N2 filling valve state (1: open, 0: close)*/
uint8_t n2_release_valve_state; /*< N2 release line pressure valve state (1: open, 0: close)*/
uint8_t n2_detach_state; /*< N2 quick connector detach state (1: open, 0: close)*/
uint8_t n2_quenching_valve_state; /*< N2 quenching valve state (1: open, 0: close)*/
uint8_t n2_3way_valve_state; /*< N2 3-way valve state (1: open, 0: close)*/
- uint8_t main_valve_state; /*< Rocket main N2O valve state (1: open, 0: close)*/
+ uint8_t main_valve_state; /*< Rocket main OX valve state (1: open, 0: close)*/
uint8_t nitrogen_valve_state; /*< Rocket main N2 valve state (1: open, 0: close)*/
- uint8_t ignition_state; /*< Ignition relay logical state (1: enabled, 0: disabled)*/
+ uint8_t chamber_valve_state; /*< Chamber pressurization valve state (1: enabled, 0: disabled)*/
uint8_t gmm_state; /*< State of the GroundModeManager*/
- uint8_t tars_state; /*< State of TARS*/
+ uint8_t tars3_state; /*< State of TARS 3*/
+ uint8_t tars3m_state; /*< State of TARS 3 Maintenance*/
uint8_t arming_state; /*< Arming state (1: armed, 0: otherwise)*/
uint8_t main_board_state; /*< Main board FMM state*/
uint8_t payload_board_state; /*< Payload board FMM state*/
@@ -43,13 +44,13 @@ typedef struct __mavlink_gse_tm_t {
uint8_t motor_can_status; /*< Motor CAN status*/
} mavlink_gse_tm_t;
-#define MAVLINK_MSG_ID_GSE_TM_LEN 83
-#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 83
-#define MAVLINK_MSG_ID_212_LEN 83
-#define MAVLINK_MSG_ID_212_MIN_LEN 83
+#define MAVLINK_MSG_ID_GSE_TM_LEN 84
+#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 84
+#define MAVLINK_MSG_ID_212_LEN 84
+#define MAVLINK_MSG_ID_212_MIN_LEN 84
-#define MAVLINK_MSG_ID_GSE_TM_CRC 196
-#define MAVLINK_MSG_ID_212_CRC 196
+#define MAVLINK_MSG_ID_GSE_TM_CRC 26
+#define MAVLINK_MSG_ID_212_CRC 26
@@ -57,19 +58,19 @@ typedef struct __mavlink_gse_tm_t {
#define MAVLINK_MESSAGE_INFO_GSE_TM { \
212, \
"GSE_TM", \
- 36, \
+ 37, \
{ { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gse_tm_t, timestamp) }, \
{ "rocket_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_gse_tm_t, rocket_mass) }, \
- { "n2o_vessel_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, n2o_vessel_mass) }, \
- { "n2o_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, n2o_filling_pressure) }, \
- { "n2o_vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, n2o_vessel_pressure) }, \
+ { "ox_vessel_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, ox_vessel_mass) }, \
+ { "ox_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, ox_filling_pressure) }, \
+ { "ox_vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, ox_vessel_pressure) }, \
{ "n2_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, n2_filling_pressure) }, \
{ "n2_vessel_1_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, n2_vessel_1_pressure) }, \
{ "n2_vessel_2_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, n2_vessel_2_pressure) }, \
- { "n2o_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 62, offsetof(mavlink_gse_tm_t, n2o_filling_valve_state) }, \
- { "n2o_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 63, offsetof(mavlink_gse_tm_t, n2o_release_valve_state) }, \
- { "n2o_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 64, offsetof(mavlink_gse_tm_t, n2o_detach_state) }, \
- { "n2o_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 65, offsetof(mavlink_gse_tm_t, n2o_venting_valve_state) }, \
+ { "ox_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 62, offsetof(mavlink_gse_tm_t, ox_filling_valve_state) }, \
+ { "ox_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 63, offsetof(mavlink_gse_tm_t, ox_release_valve_state) }, \
+ { "ox_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 64, offsetof(mavlink_gse_tm_t, ox_detach_state) }, \
+ { "ox_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 65, offsetof(mavlink_gse_tm_t, ox_venting_valve_state) }, \
{ "n2_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 66, offsetof(mavlink_gse_tm_t, n2_filling_valve_state) }, \
{ "n2_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 67, offsetof(mavlink_gse_tm_t, n2_release_valve_state) }, \
{ "n2_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 68, offsetof(mavlink_gse_tm_t, n2_detach_state) }, \
@@ -77,21 +78,22 @@ typedef struct __mavlink_gse_tm_t {
{ "n2_3way_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 70, offsetof(mavlink_gse_tm_t, n2_3way_valve_state) }, \
{ "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 71, offsetof(mavlink_gse_tm_t, main_valve_state) }, \
{ "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 72, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \
- { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 73, offsetof(mavlink_gse_tm_t, ignition_state) }, \
+ { "chamber_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 73, offsetof(mavlink_gse_tm_t, chamber_valve_state) }, \
{ "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 74, offsetof(mavlink_gse_tm_t, gmm_state) }, \
- { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 75, offsetof(mavlink_gse_tm_t, tars_state) }, \
- { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 76, offsetof(mavlink_gse_tm_t, arming_state) }, \
+ { "tars3_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 75, offsetof(mavlink_gse_tm_t, tars3_state) }, \
+ { "tars3m_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 76, offsetof(mavlink_gse_tm_t, tars3m_state) }, \
+ { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 77, offsetof(mavlink_gse_tm_t, arming_state) }, \
{ "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gse_tm_t, cpu_load) }, \
{ "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 40, offsetof(mavlink_gse_tm_t, free_heap) }, \
{ "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_gse_tm_t, battery_voltage) }, \
{ "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_gse_tm_t, current_consumption) }, \
{ "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \
- { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 77, offsetof(mavlink_gse_tm_t, main_board_state) }, \
- { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 78, offsetof(mavlink_gse_tm_t, payload_board_state) }, \
- { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 79, offsetof(mavlink_gse_tm_t, motor_board_state) }, \
- { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 80, offsetof(mavlink_gse_tm_t, main_can_status) }, \
- { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 81, offsetof(mavlink_gse_tm_t, payload_can_status) }, \
- { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 82, offsetof(mavlink_gse_tm_t, motor_can_status) }, \
+ { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 78, offsetof(mavlink_gse_tm_t, main_board_state) }, \
+ { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 79, offsetof(mavlink_gse_tm_t, payload_board_state) }, \
+ { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 80, offsetof(mavlink_gse_tm_t, motor_board_state) }, \
+ { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 81, offsetof(mavlink_gse_tm_t, main_can_status) }, \
+ { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 82, offsetof(mavlink_gse_tm_t, payload_can_status) }, \
+ { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 83, offsetof(mavlink_gse_tm_t, motor_can_status) }, \
{ "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 60, offsetof(mavlink_gse_tm_t, log_number) }, \
{ "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 56, offsetof(mavlink_gse_tm_t, log_good) }, \
} \
@@ -99,19 +101,19 @@ typedef struct __mavlink_gse_tm_t {
#else
#define MAVLINK_MESSAGE_INFO_GSE_TM { \
"GSE_TM", \
- 36, \
+ 37, \
{ { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gse_tm_t, timestamp) }, \
{ "rocket_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_gse_tm_t, rocket_mass) }, \
- { "n2o_vessel_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, n2o_vessel_mass) }, \
- { "n2o_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, n2o_filling_pressure) }, \
- { "n2o_vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, n2o_vessel_pressure) }, \
+ { "ox_vessel_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, ox_vessel_mass) }, \
+ { "ox_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, ox_filling_pressure) }, \
+ { "ox_vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, ox_vessel_pressure) }, \
{ "n2_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, n2_filling_pressure) }, \
{ "n2_vessel_1_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, n2_vessel_1_pressure) }, \
{ "n2_vessel_2_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, n2_vessel_2_pressure) }, \
- { "n2o_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 62, offsetof(mavlink_gse_tm_t, n2o_filling_valve_state) }, \
- { "n2o_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 63, offsetof(mavlink_gse_tm_t, n2o_release_valve_state) }, \
- { "n2o_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 64, offsetof(mavlink_gse_tm_t, n2o_detach_state) }, \
- { "n2o_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 65, offsetof(mavlink_gse_tm_t, n2o_venting_valve_state) }, \
+ { "ox_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 62, offsetof(mavlink_gse_tm_t, ox_filling_valve_state) }, \
+ { "ox_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 63, offsetof(mavlink_gse_tm_t, ox_release_valve_state) }, \
+ { "ox_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 64, offsetof(mavlink_gse_tm_t, ox_detach_state) }, \
+ { "ox_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 65, offsetof(mavlink_gse_tm_t, ox_venting_valve_state) }, \
{ "n2_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 66, offsetof(mavlink_gse_tm_t, n2_filling_valve_state) }, \
{ "n2_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 67, offsetof(mavlink_gse_tm_t, n2_release_valve_state) }, \
{ "n2_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 68, offsetof(mavlink_gse_tm_t, n2_detach_state) }, \
@@ -119,21 +121,22 @@ typedef struct __mavlink_gse_tm_t {
{ "n2_3way_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 70, offsetof(mavlink_gse_tm_t, n2_3way_valve_state) }, \
{ "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 71, offsetof(mavlink_gse_tm_t, main_valve_state) }, \
{ "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 72, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \
- { "ignition_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 73, offsetof(mavlink_gse_tm_t, ignition_state) }, \
+ { "chamber_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 73, offsetof(mavlink_gse_tm_t, chamber_valve_state) }, \
{ "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 74, offsetof(mavlink_gse_tm_t, gmm_state) }, \
- { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 75, offsetof(mavlink_gse_tm_t, tars_state) }, \
- { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 76, offsetof(mavlink_gse_tm_t, arming_state) }, \
+ { "tars3_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 75, offsetof(mavlink_gse_tm_t, tars3_state) }, \
+ { "tars3m_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 76, offsetof(mavlink_gse_tm_t, tars3m_state) }, \
+ { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 77, offsetof(mavlink_gse_tm_t, arming_state) }, \
{ "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gse_tm_t, cpu_load) }, \
{ "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 40, offsetof(mavlink_gse_tm_t, free_heap) }, \
{ "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_gse_tm_t, battery_voltage) }, \
{ "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_gse_tm_t, current_consumption) }, \
{ "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \
- { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 77, offsetof(mavlink_gse_tm_t, main_board_state) }, \
- { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 78, offsetof(mavlink_gse_tm_t, payload_board_state) }, \
- { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 79, offsetof(mavlink_gse_tm_t, motor_board_state) }, \
- { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 80, offsetof(mavlink_gse_tm_t, main_can_status) }, \
- { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 81, offsetof(mavlink_gse_tm_t, payload_can_status) }, \
- { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 82, offsetof(mavlink_gse_tm_t, motor_can_status) }, \
+ { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 78, offsetof(mavlink_gse_tm_t, main_board_state) }, \
+ { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 79, offsetof(mavlink_gse_tm_t, payload_board_state) }, \
+ { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 80, offsetof(mavlink_gse_tm_t, motor_board_state) }, \
+ { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 81, offsetof(mavlink_gse_tm_t, main_can_status) }, \
+ { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 82, offsetof(mavlink_gse_tm_t, payload_can_status) }, \
+ { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 83, offsetof(mavlink_gse_tm_t, motor_can_status) }, \
{ "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 60, offsetof(mavlink_gse_tm_t, log_number) }, \
{ "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 56, offsetof(mavlink_gse_tm_t, log_good) }, \
} \
@@ -148,26 +151,27 @@ typedef struct __mavlink_gse_tm_t {
*
* @param timestamp [us] Timestamp in microseconds
* @param rocket_mass [kg] Rocket mass loadcell measurement
- * @param n2o_vessel_mass [kg] N2O vessel tank mass loadcell measurement
- * @param n2o_filling_pressure [Bar] N2O refueling line pressure
- * @param n2o_vessel_pressure [Bar] N2O vessel tank pressure
+ * @param ox_vessel_mass [kg] OX vessel tank mass loadcell measurement
+ * @param ox_filling_pressure [Bar] OX refueling line pressure
+ * @param ox_vessel_pressure [Bar] OX vessel tank pressure
* @param n2_filling_pressure [Bar] N2 refueling line pressure
* @param n2_vessel_1_pressure [Bar] N2 vessel 1 tank pressure
* @param n2_vessel_2_pressure [Bar] N2 vessel 2 tank pressure
- * @param n2o_filling_valve_state N2O filling valve state (1: open, 0: close)
- * @param n2o_release_valve_state N2O release line pressure valve state (1: open, 0: close)
- * @param n2o_detach_state N2O quick connector detach state (1: open, 0: close)
- * @param n2o_venting_valve_state N2O venting valve state (1: open, 0: close)
+ * @param ox_filling_valve_state OX filling valve state (1: open, 0: close)
+ * @param ox_release_valve_state OX release line pressure valve state (1: open, 0: close)
+ * @param ox_detach_state OX quick connector detach state (1: open, 0: close)
+ * @param ox_venting_valve_state OX venting valve state (1: open, 0: close)
* @param n2_filling_valve_state N2 filling valve state (1: open, 0: close)
* @param n2_release_valve_state N2 release line pressure valve state (1: open, 0: close)
* @param n2_detach_state N2 quick connector detach state (1: open, 0: close)
* @param n2_quenching_valve_state N2 quenching valve state (1: open, 0: close)
* @param n2_3way_valve_state N2 3-way valve state (1: open, 0: close)
- * @param main_valve_state Rocket main N2O valve state (1: open, 0: close)
+ * @param main_valve_state Rocket main OX valve state (1: open, 0: close)
* @param nitrogen_valve_state Rocket main N2 valve state (1: open, 0: close)
- * @param ignition_state Ignition relay logical state (1: enabled, 0: disabled)
+ * @param chamber_valve_state Chamber pressurization valve state (1: enabled, 0: disabled)
* @param gmm_state State of the GroundModeManager
- * @param tars_state State of TARS
+ * @param tars3_state State of TARS 3
+ * @param tars3m_state State of TARS 3 Maintenance
* @param arming_state Arming state (1: armed, 0: otherwise)
* @param cpu_load CPU load in percentage
* @param free_heap Amount of available heap memory
@@ -185,15 +189,15 @@ typedef struct __mavlink_gse_tm_t {
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
- uint64_t timestamp, float rocket_mass, float n2o_vessel_mass, float n2o_filling_pressure, float n2o_vessel_pressure, float n2_filling_pressure, float n2_vessel_1_pressure, float n2_vessel_2_pressure, uint8_t n2o_filling_valve_state, uint8_t n2o_release_valve_state, uint8_t n2o_detach_state, uint8_t n2o_venting_valve_state, uint8_t n2_filling_valve_state, uint8_t n2_release_valve_state, uint8_t n2_detach_state, uint8_t n2_quenching_valve_state, uint8_t n2_3way_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t ignition_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good)
+ uint64_t timestamp, float rocket_mass, float ox_vessel_mass, float ox_filling_pressure, float ox_vessel_pressure, float n2_filling_pressure, float n2_vessel_1_pressure, float n2_vessel_2_pressure, uint8_t ox_filling_valve_state, uint8_t ox_release_valve_state, uint8_t ox_detach_state, uint8_t ox_venting_valve_state, uint8_t n2_filling_valve_state, uint8_t n2_release_valve_state, uint8_t n2_detach_state, uint8_t n2_quenching_valve_state, uint8_t n2_3way_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t chamber_valve_state, uint8_t gmm_state, uint8_t tars3_state, uint8_t tars3m_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GSE_TM_LEN];
_mav_put_uint64_t(buf, 0, timestamp);
_mav_put_float(buf, 8, rocket_mass);
- _mav_put_float(buf, 12, n2o_vessel_mass);
- _mav_put_float(buf, 16, n2o_filling_pressure);
- _mav_put_float(buf, 20, n2o_vessel_pressure);
+ _mav_put_float(buf, 12, ox_vessel_mass);
+ _mav_put_float(buf, 16, ox_filling_pressure);
+ _mav_put_float(buf, 20, ox_vessel_pressure);
_mav_put_float(buf, 24, n2_filling_pressure);
_mav_put_float(buf, 28, n2_vessel_1_pressure);
_mav_put_float(buf, 32, n2_vessel_2_pressure);
@@ -204,10 +208,10 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
_mav_put_float(buf, 52, umbilical_current_consumption);
_mav_put_int32_t(buf, 56, log_good);
_mav_put_int16_t(buf, 60, log_number);
- _mav_put_uint8_t(buf, 62, n2o_filling_valve_state);
- _mav_put_uint8_t(buf, 63, n2o_release_valve_state);
- _mav_put_uint8_t(buf, 64, n2o_detach_state);
- _mav_put_uint8_t(buf, 65, n2o_venting_valve_state);
+ _mav_put_uint8_t(buf, 62, ox_filling_valve_state);
+ _mav_put_uint8_t(buf, 63, ox_release_valve_state);
+ _mav_put_uint8_t(buf, 64, ox_detach_state);
+ _mav_put_uint8_t(buf, 65, ox_venting_valve_state);
_mav_put_uint8_t(buf, 66, n2_filling_valve_state);
_mav_put_uint8_t(buf, 67, n2_release_valve_state);
_mav_put_uint8_t(buf, 68, n2_detach_state);
@@ -215,25 +219,26 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
_mav_put_uint8_t(buf, 70, n2_3way_valve_state);
_mav_put_uint8_t(buf, 71, main_valve_state);
_mav_put_uint8_t(buf, 72, nitrogen_valve_state);
- _mav_put_uint8_t(buf, 73, ignition_state);
+ _mav_put_uint8_t(buf, 73, chamber_valve_state);
_mav_put_uint8_t(buf, 74, gmm_state);
- _mav_put_uint8_t(buf, 75, tars_state);
- _mav_put_uint8_t(buf, 76, arming_state);
- _mav_put_uint8_t(buf, 77, main_board_state);
- _mav_put_uint8_t(buf, 78, payload_board_state);
- _mav_put_uint8_t(buf, 79, motor_board_state);
- _mav_put_uint8_t(buf, 80, main_can_status);
- _mav_put_uint8_t(buf, 81, payload_can_status);
- _mav_put_uint8_t(buf, 82, motor_can_status);
+ _mav_put_uint8_t(buf, 75, tars3_state);
+ _mav_put_uint8_t(buf, 76, tars3m_state);
+ _mav_put_uint8_t(buf, 77, arming_state);
+ _mav_put_uint8_t(buf, 78, main_board_state);
+ _mav_put_uint8_t(buf, 79, payload_board_state);
+ _mav_put_uint8_t(buf, 80, motor_board_state);
+ _mav_put_uint8_t(buf, 81, main_can_status);
+ _mav_put_uint8_t(buf, 82, payload_can_status);
+ _mav_put_uint8_t(buf, 83, motor_can_status);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN);
#else
mavlink_gse_tm_t packet;
packet.timestamp = timestamp;
packet.rocket_mass = rocket_mass;
- packet.n2o_vessel_mass = n2o_vessel_mass;
- packet.n2o_filling_pressure = n2o_filling_pressure;
- packet.n2o_vessel_pressure = n2o_vessel_pressure;
+ packet.ox_vessel_mass = ox_vessel_mass;
+ packet.ox_filling_pressure = ox_filling_pressure;
+ packet.ox_vessel_pressure = ox_vessel_pressure;
packet.n2_filling_pressure = n2_filling_pressure;
packet.n2_vessel_1_pressure = n2_vessel_1_pressure;
packet.n2_vessel_2_pressure = n2_vessel_2_pressure;
@@ -244,10 +249,10 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
packet.umbilical_current_consumption = umbilical_current_consumption;
packet.log_good = log_good;
packet.log_number = log_number;
- packet.n2o_filling_valve_state = n2o_filling_valve_state;
- packet.n2o_release_valve_state = n2o_release_valve_state;
- packet.n2o_detach_state = n2o_detach_state;
- packet.n2o_venting_valve_state = n2o_venting_valve_state;
+ packet.ox_filling_valve_state = ox_filling_valve_state;
+ packet.ox_release_valve_state = ox_release_valve_state;
+ packet.ox_detach_state = ox_detach_state;
+ packet.ox_venting_valve_state = ox_venting_valve_state;
packet.n2_filling_valve_state = n2_filling_valve_state;
packet.n2_release_valve_state = n2_release_valve_state;
packet.n2_detach_state = n2_detach_state;
@@ -255,9 +260,10 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
packet.n2_3way_valve_state = n2_3way_valve_state;
packet.main_valve_state = main_valve_state;
packet.nitrogen_valve_state = nitrogen_valve_state;
- packet.ignition_state = ignition_state;
+ packet.chamber_valve_state = chamber_valve_state;
packet.gmm_state = gmm_state;
- packet.tars_state = tars_state;
+ packet.tars3_state = tars3_state;
+ packet.tars3m_state = tars3m_state;
packet.arming_state = arming_state;
packet.main_board_state = main_board_state;
packet.payload_board_state = payload_board_state;
@@ -281,26 +287,27 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
* @param msg The MAVLink message to compress the data into
* @param timestamp [us] Timestamp in microseconds
* @param rocket_mass [kg] Rocket mass loadcell measurement
- * @param n2o_vessel_mass [kg] N2O vessel tank mass loadcell measurement
- * @param n2o_filling_pressure [Bar] N2O refueling line pressure
- * @param n2o_vessel_pressure [Bar] N2O vessel tank pressure
+ * @param ox_vessel_mass [kg] OX vessel tank mass loadcell measurement
+ * @param ox_filling_pressure [Bar] OX refueling line pressure
+ * @param ox_vessel_pressure [Bar] OX vessel tank pressure
* @param n2_filling_pressure [Bar] N2 refueling line pressure
* @param n2_vessel_1_pressure [Bar] N2 vessel 1 tank pressure
* @param n2_vessel_2_pressure [Bar] N2 vessel 2 tank pressure
- * @param n2o_filling_valve_state N2O filling valve state (1: open, 0: close)
- * @param n2o_release_valve_state N2O release line pressure valve state (1: open, 0: close)
- * @param n2o_detach_state N2O quick connector detach state (1: open, 0: close)
- * @param n2o_venting_valve_state N2O venting valve state (1: open, 0: close)
+ * @param ox_filling_valve_state OX filling valve state (1: open, 0: close)
+ * @param ox_release_valve_state OX release line pressure valve state (1: open, 0: close)
+ * @param ox_detach_state OX quick connector detach state (1: open, 0: close)
+ * @param ox_venting_valve_state OX venting valve state (1: open, 0: close)
* @param n2_filling_valve_state N2 filling valve state (1: open, 0: close)
* @param n2_release_valve_state N2 release line pressure valve state (1: open, 0: close)
* @param n2_detach_state N2 quick connector detach state (1: open, 0: close)
* @param n2_quenching_valve_state N2 quenching valve state (1: open, 0: close)
* @param n2_3way_valve_state N2 3-way valve state (1: open, 0: close)
- * @param main_valve_state Rocket main N2O valve state (1: open, 0: close)
+ * @param main_valve_state Rocket main OX valve state (1: open, 0: close)
* @param nitrogen_valve_state Rocket main N2 valve state (1: open, 0: close)
- * @param ignition_state Ignition relay logical state (1: enabled, 0: disabled)
+ * @param chamber_valve_state Chamber pressurization valve state (1: enabled, 0: disabled)
* @param gmm_state State of the GroundModeManager
- * @param tars_state State of TARS
+ * @param tars3_state State of TARS 3
+ * @param tars3m_state State of TARS 3 Maintenance
* @param arming_state Arming state (1: armed, 0: otherwise)
* @param cpu_load CPU load in percentage
* @param free_heap Amount of available heap memory
@@ -319,15 +326,15 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon
*/
static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
- uint64_t timestamp,float rocket_mass,float n2o_vessel_mass,float n2o_filling_pressure,float n2o_vessel_pressure,float n2_filling_pressure,float n2_vessel_1_pressure,float n2_vessel_2_pressure,uint8_t n2o_filling_valve_state,uint8_t n2o_release_valve_state,uint8_t n2o_detach_state,uint8_t n2o_venting_valve_state,uint8_t n2_filling_valve_state,uint8_t n2_release_valve_state,uint8_t n2_detach_state,uint8_t n2_quenching_valve_state,uint8_t n2_3way_valve_state,uint8_t main_valve_state,uint8_t nitrogen_valve_state,uint8_t ignition_state,uint8_t gmm_state,uint8_t tars_state,uint8_t arming_state,float cpu_load,uint32_t free_heap,float battery_voltage,float current_consumption,float umbilical_current_consumption,uint8_t main_board_state,uint8_t payload_board_state,uint8_t motor_board_state,uint8_t main_can_status,uint8_t payload_can_status,uint8_t motor_can_status,int16_t log_number,int32_t log_good)
+ uint64_t timestamp,float rocket_mass,float ox_vessel_mass,float ox_filling_pressure,float ox_vessel_pressure,float n2_filling_pressure,float n2_vessel_1_pressure,float n2_vessel_2_pressure,uint8_t ox_filling_valve_state,uint8_t ox_release_valve_state,uint8_t ox_detach_state,uint8_t ox_venting_valve_state,uint8_t n2_filling_valve_state,uint8_t n2_release_valve_state,uint8_t n2_detach_state,uint8_t n2_quenching_valve_state,uint8_t n2_3way_valve_state,uint8_t main_valve_state,uint8_t nitrogen_valve_state,uint8_t chamber_valve_state,uint8_t gmm_state,uint8_t tars3_state,uint8_t tars3m_state,uint8_t arming_state,float cpu_load,uint32_t free_heap,float battery_voltage,float current_consumption,float umbilical_current_consumption,uint8_t main_board_state,uint8_t payload_board_state,uint8_t motor_board_state,uint8_t main_can_status,uint8_t payload_can_status,uint8_t motor_can_status,int16_t log_number,int32_t log_good)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GSE_TM_LEN];
_mav_put_uint64_t(buf, 0, timestamp);
_mav_put_float(buf, 8, rocket_mass);
- _mav_put_float(buf, 12, n2o_vessel_mass);
- _mav_put_float(buf, 16, n2o_filling_pressure);
- _mav_put_float(buf, 20, n2o_vessel_pressure);
+ _mav_put_float(buf, 12, ox_vessel_mass);
+ _mav_put_float(buf, 16, ox_filling_pressure);
+ _mav_put_float(buf, 20, ox_vessel_pressure);
_mav_put_float(buf, 24, n2_filling_pressure);
_mav_put_float(buf, 28, n2_vessel_1_pressure);
_mav_put_float(buf, 32, n2_vessel_2_pressure);
@@ -338,10 +345,10 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c
_mav_put_float(buf, 52, umbilical_current_consumption);
_mav_put_int32_t(buf, 56, log_good);
_mav_put_int16_t(buf, 60, log_number);
- _mav_put_uint8_t(buf, 62, n2o_filling_valve_state);
- _mav_put_uint8_t(buf, 63, n2o_release_valve_state);
- _mav_put_uint8_t(buf, 64, n2o_detach_state);
- _mav_put_uint8_t(buf, 65, n2o_venting_valve_state);
+ _mav_put_uint8_t(buf, 62, ox_filling_valve_state);
+ _mav_put_uint8_t(buf, 63, ox_release_valve_state);
+ _mav_put_uint8_t(buf, 64, ox_detach_state);
+ _mav_put_uint8_t(buf, 65, ox_venting_valve_state);
_mav_put_uint8_t(buf, 66, n2_filling_valve_state);
_mav_put_uint8_t(buf, 67, n2_release_valve_state);
_mav_put_uint8_t(buf, 68, n2_detach_state);
@@ -349,25 +356,26 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c
_mav_put_uint8_t(buf, 70, n2_3way_valve_state);
_mav_put_uint8_t(buf, 71, main_valve_state);
_mav_put_uint8_t(buf, 72, nitrogen_valve_state);
- _mav_put_uint8_t(buf, 73, ignition_state);
+ _mav_put_uint8_t(buf, 73, chamber_valve_state);
_mav_put_uint8_t(buf, 74, gmm_state);
- _mav_put_uint8_t(buf, 75, tars_state);
- _mav_put_uint8_t(buf, 76, arming_state);
- _mav_put_uint8_t(buf, 77, main_board_state);
- _mav_put_uint8_t(buf, 78, payload_board_state);
- _mav_put_uint8_t(buf, 79, motor_board_state);
- _mav_put_uint8_t(buf, 80, main_can_status);
- _mav_put_uint8_t(buf, 81, payload_can_status);
- _mav_put_uint8_t(buf, 82, motor_can_status);
+ _mav_put_uint8_t(buf, 75, tars3_state);
+ _mav_put_uint8_t(buf, 76, tars3m_state);
+ _mav_put_uint8_t(buf, 77, arming_state);
+ _mav_put_uint8_t(buf, 78, main_board_state);
+ _mav_put_uint8_t(buf, 79, payload_board_state);
+ _mav_put_uint8_t(buf, 80, motor_board_state);
+ _mav_put_uint8_t(buf, 81, main_can_status);
+ _mav_put_uint8_t(buf, 82, payload_can_status);
+ _mav_put_uint8_t(buf, 83, motor_can_status);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN);
#else
mavlink_gse_tm_t packet;
packet.timestamp = timestamp;
packet.rocket_mass = rocket_mass;
- packet.n2o_vessel_mass = n2o_vessel_mass;
- packet.n2o_filling_pressure = n2o_filling_pressure;
- packet.n2o_vessel_pressure = n2o_vessel_pressure;
+ packet.ox_vessel_mass = ox_vessel_mass;
+ packet.ox_filling_pressure = ox_filling_pressure;
+ packet.ox_vessel_pressure = ox_vessel_pressure;
packet.n2_filling_pressure = n2_filling_pressure;
packet.n2_vessel_1_pressure = n2_vessel_1_pressure;
packet.n2_vessel_2_pressure = n2_vessel_2_pressure;
@@ -378,10 +386,10 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c
packet.umbilical_current_consumption = umbilical_current_consumption;
packet.log_good = log_good;
packet.log_number = log_number;
- packet.n2o_filling_valve_state = n2o_filling_valve_state;
- packet.n2o_release_valve_state = n2o_release_valve_state;
- packet.n2o_detach_state = n2o_detach_state;
- packet.n2o_venting_valve_state = n2o_venting_valve_state;
+ packet.ox_filling_valve_state = ox_filling_valve_state;
+ packet.ox_release_valve_state = ox_release_valve_state;
+ packet.ox_detach_state = ox_detach_state;
+ packet.ox_venting_valve_state = ox_venting_valve_state;
packet.n2_filling_valve_state = n2_filling_valve_state;
packet.n2_release_valve_state = n2_release_valve_state;
packet.n2_detach_state = n2_detach_state;
@@ -389,9 +397,10 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c
packet.n2_3way_valve_state = n2_3way_valve_state;
packet.main_valve_state = main_valve_state;
packet.nitrogen_valve_state = nitrogen_valve_state;
- packet.ignition_state = ignition_state;
+ packet.chamber_valve_state = chamber_valve_state;
packet.gmm_state = gmm_state;
- packet.tars_state = tars_state;
+ packet.tars3_state = tars3_state;
+ packet.tars3m_state = tars3m_state;
packet.arming_state = arming_state;
packet.main_board_state = main_board_state;
packet.payload_board_state = payload_board_state;
@@ -417,7 +426,7 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c
*/
static inline uint16_t mavlink_msg_gse_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gse_tm_t* gse_tm)
{
- return mavlink_msg_gse_tm_pack(system_id, component_id, msg, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->n2o_vessel_mass, gse_tm->n2o_filling_pressure, gse_tm->n2o_vessel_pressure, gse_tm->n2_filling_pressure, gse_tm->n2_vessel_1_pressure, gse_tm->n2_vessel_2_pressure, gse_tm->n2o_filling_valve_state, gse_tm->n2o_release_valve_state, gse_tm->n2o_detach_state, gse_tm->n2o_venting_valve_state, gse_tm->n2_filling_valve_state, gse_tm->n2_release_valve_state, gse_tm->n2_detach_state, gse_tm->n2_quenching_valve_state, gse_tm->n2_3way_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->ignition_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good);
+ return mavlink_msg_gse_tm_pack(system_id, component_id, msg, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->ox_vessel_mass, gse_tm->ox_filling_pressure, gse_tm->ox_vessel_pressure, gse_tm->n2_filling_pressure, gse_tm->n2_vessel_1_pressure, gse_tm->n2_vessel_2_pressure, gse_tm->ox_filling_valve_state, gse_tm->ox_release_valve_state, gse_tm->ox_detach_state, gse_tm->ox_venting_valve_state, gse_tm->n2_filling_valve_state, gse_tm->n2_release_valve_state, gse_tm->n2_detach_state, gse_tm->n2_quenching_valve_state, gse_tm->n2_3way_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->chamber_valve_state, gse_tm->gmm_state, gse_tm->tars3_state, gse_tm->tars3m_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good);
}
/**
@@ -431,7 +440,7 @@ static inline uint16_t mavlink_msg_gse_tm_encode(uint8_t system_id, uint8_t comp
*/
static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_gse_tm_t* gse_tm)
{
- return mavlink_msg_gse_tm_pack_chan(system_id, component_id, chan, msg, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->n2o_vessel_mass, gse_tm->n2o_filling_pressure, gse_tm->n2o_vessel_pressure, gse_tm->n2_filling_pressure, gse_tm->n2_vessel_1_pressure, gse_tm->n2_vessel_2_pressure, gse_tm->n2o_filling_valve_state, gse_tm->n2o_release_valve_state, gse_tm->n2o_detach_state, gse_tm->n2o_venting_valve_state, gse_tm->n2_filling_valve_state, gse_tm->n2_release_valve_state, gse_tm->n2_detach_state, gse_tm->n2_quenching_valve_state, gse_tm->n2_3way_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->ignition_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good);
+ return mavlink_msg_gse_tm_pack_chan(system_id, component_id, chan, msg, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->ox_vessel_mass, gse_tm->ox_filling_pressure, gse_tm->ox_vessel_pressure, gse_tm->n2_filling_pressure, gse_tm->n2_vessel_1_pressure, gse_tm->n2_vessel_2_pressure, gse_tm->ox_filling_valve_state, gse_tm->ox_release_valve_state, gse_tm->ox_detach_state, gse_tm->ox_venting_valve_state, gse_tm->n2_filling_valve_state, gse_tm->n2_release_valve_state, gse_tm->n2_detach_state, gse_tm->n2_quenching_valve_state, gse_tm->n2_3way_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->chamber_valve_state, gse_tm->gmm_state, gse_tm->tars3_state, gse_tm->tars3m_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good);
}
/**
@@ -440,26 +449,27 @@ static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t
*
* @param timestamp [us] Timestamp in microseconds
* @param rocket_mass [kg] Rocket mass loadcell measurement
- * @param n2o_vessel_mass [kg] N2O vessel tank mass loadcell measurement
- * @param n2o_filling_pressure [Bar] N2O refueling line pressure
- * @param n2o_vessel_pressure [Bar] N2O vessel tank pressure
+ * @param ox_vessel_mass [kg] OX vessel tank mass loadcell measurement
+ * @param ox_filling_pressure [Bar] OX refueling line pressure
+ * @param ox_vessel_pressure [Bar] OX vessel tank pressure
* @param n2_filling_pressure [Bar] N2 refueling line pressure
* @param n2_vessel_1_pressure [Bar] N2 vessel 1 tank pressure
* @param n2_vessel_2_pressure [Bar] N2 vessel 2 tank pressure
- * @param n2o_filling_valve_state N2O filling valve state (1: open, 0: close)
- * @param n2o_release_valve_state N2O release line pressure valve state (1: open, 0: close)
- * @param n2o_detach_state N2O quick connector detach state (1: open, 0: close)
- * @param n2o_venting_valve_state N2O venting valve state (1: open, 0: close)
+ * @param ox_filling_valve_state OX filling valve state (1: open, 0: close)
+ * @param ox_release_valve_state OX release line pressure valve state (1: open, 0: close)
+ * @param ox_detach_state OX quick connector detach state (1: open, 0: close)
+ * @param ox_venting_valve_state OX venting valve state (1: open, 0: close)
* @param n2_filling_valve_state N2 filling valve state (1: open, 0: close)
* @param n2_release_valve_state N2 release line pressure valve state (1: open, 0: close)
* @param n2_detach_state N2 quick connector detach state (1: open, 0: close)
* @param n2_quenching_valve_state N2 quenching valve state (1: open, 0: close)
* @param n2_3way_valve_state N2 3-way valve state (1: open, 0: close)
- * @param main_valve_state Rocket main N2O valve state (1: open, 0: close)
+ * @param main_valve_state Rocket main OX valve state (1: open, 0: close)
* @param nitrogen_valve_state Rocket main N2 valve state (1: open, 0: close)
- * @param ignition_state Ignition relay logical state (1: enabled, 0: disabled)
+ * @param chamber_valve_state Chamber pressurization valve state (1: enabled, 0: disabled)
* @param gmm_state State of the GroundModeManager
- * @param tars_state State of TARS
+ * @param tars3_state State of TARS 3
+ * @param tars3m_state State of TARS 3 Maintenance
* @param arming_state Arming state (1: armed, 0: otherwise)
* @param cpu_load CPU load in percentage
* @param free_heap Amount of available heap memory
@@ -477,15 +487,15 @@ static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t timestamp, float rocket_mass, float n2o_vessel_mass, float n2o_filling_pressure, float n2o_vessel_pressure, float n2_filling_pressure, float n2_vessel_1_pressure, float n2_vessel_2_pressure, uint8_t n2o_filling_valve_state, uint8_t n2o_release_valve_state, uint8_t n2o_detach_state, uint8_t n2o_venting_valve_state, uint8_t n2_filling_valve_state, uint8_t n2_release_valve_state, uint8_t n2_detach_state, uint8_t n2_quenching_valve_state, uint8_t n2_3way_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t ignition_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good)
+static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t timestamp, float rocket_mass, float ox_vessel_mass, float ox_filling_pressure, float ox_vessel_pressure, float n2_filling_pressure, float n2_vessel_1_pressure, float n2_vessel_2_pressure, uint8_t ox_filling_valve_state, uint8_t ox_release_valve_state, uint8_t ox_detach_state, uint8_t ox_venting_valve_state, uint8_t n2_filling_valve_state, uint8_t n2_release_valve_state, uint8_t n2_detach_state, uint8_t n2_quenching_valve_state, uint8_t n2_3way_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t chamber_valve_state, uint8_t gmm_state, uint8_t tars3_state, uint8_t tars3m_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_GSE_TM_LEN];
_mav_put_uint64_t(buf, 0, timestamp);
_mav_put_float(buf, 8, rocket_mass);
- _mav_put_float(buf, 12, n2o_vessel_mass);
- _mav_put_float(buf, 16, n2o_filling_pressure);
- _mav_put_float(buf, 20, n2o_vessel_pressure);
+ _mav_put_float(buf, 12, ox_vessel_mass);
+ _mav_put_float(buf, 16, ox_filling_pressure);
+ _mav_put_float(buf, 20, ox_vessel_pressure);
_mav_put_float(buf, 24, n2_filling_pressure);
_mav_put_float(buf, 28, n2_vessel_1_pressure);
_mav_put_float(buf, 32, n2_vessel_2_pressure);
@@ -496,10 +506,10 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time
_mav_put_float(buf, 52, umbilical_current_consumption);
_mav_put_int32_t(buf, 56, log_good);
_mav_put_int16_t(buf, 60, log_number);
- _mav_put_uint8_t(buf, 62, n2o_filling_valve_state);
- _mav_put_uint8_t(buf, 63, n2o_release_valve_state);
- _mav_put_uint8_t(buf, 64, n2o_detach_state);
- _mav_put_uint8_t(buf, 65, n2o_venting_valve_state);
+ _mav_put_uint8_t(buf, 62, ox_filling_valve_state);
+ _mav_put_uint8_t(buf, 63, ox_release_valve_state);
+ _mav_put_uint8_t(buf, 64, ox_detach_state);
+ _mav_put_uint8_t(buf, 65, ox_venting_valve_state);
_mav_put_uint8_t(buf, 66, n2_filling_valve_state);
_mav_put_uint8_t(buf, 67, n2_release_valve_state);
_mav_put_uint8_t(buf, 68, n2_detach_state);
@@ -507,25 +517,26 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time
_mav_put_uint8_t(buf, 70, n2_3way_valve_state);
_mav_put_uint8_t(buf, 71, main_valve_state);
_mav_put_uint8_t(buf, 72, nitrogen_valve_state);
- _mav_put_uint8_t(buf, 73, ignition_state);
+ _mav_put_uint8_t(buf, 73, chamber_valve_state);
_mav_put_uint8_t(buf, 74, gmm_state);
- _mav_put_uint8_t(buf, 75, tars_state);
- _mav_put_uint8_t(buf, 76, arming_state);
- _mav_put_uint8_t(buf, 77, main_board_state);
- _mav_put_uint8_t(buf, 78, payload_board_state);
- _mav_put_uint8_t(buf, 79, motor_board_state);
- _mav_put_uint8_t(buf, 80, main_can_status);
- _mav_put_uint8_t(buf, 81, payload_can_status);
- _mav_put_uint8_t(buf, 82, motor_can_status);
+ _mav_put_uint8_t(buf, 75, tars3_state);
+ _mav_put_uint8_t(buf, 76, tars3m_state);
+ _mav_put_uint8_t(buf, 77, arming_state);
+ _mav_put_uint8_t(buf, 78, main_board_state);
+ _mav_put_uint8_t(buf, 79, payload_board_state);
+ _mav_put_uint8_t(buf, 80, motor_board_state);
+ _mav_put_uint8_t(buf, 81, main_can_status);
+ _mav_put_uint8_t(buf, 82, payload_can_status);
+ _mav_put_uint8_t(buf, 83, motor_can_status);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GSE_TM, buf, MAVLINK_MSG_ID_GSE_TM_MIN_LEN, MAVLINK_MSG_ID_GSE_TM_LEN, MAVLINK_MSG_ID_GSE_TM_CRC);
#else
mavlink_gse_tm_t packet;
packet.timestamp = timestamp;
packet.rocket_mass = rocket_mass;
- packet.n2o_vessel_mass = n2o_vessel_mass;
- packet.n2o_filling_pressure = n2o_filling_pressure;
- packet.n2o_vessel_pressure = n2o_vessel_pressure;
+ packet.ox_vessel_mass = ox_vessel_mass;
+ packet.ox_filling_pressure = ox_filling_pressure;
+ packet.ox_vessel_pressure = ox_vessel_pressure;
packet.n2_filling_pressure = n2_filling_pressure;
packet.n2_vessel_1_pressure = n2_vessel_1_pressure;
packet.n2_vessel_2_pressure = n2_vessel_2_pressure;
@@ -536,10 +547,10 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time
packet.umbilical_current_consumption = umbilical_current_consumption;
packet.log_good = log_good;
packet.log_number = log_number;
- packet.n2o_filling_valve_state = n2o_filling_valve_state;
- packet.n2o_release_valve_state = n2o_release_valve_state;
- packet.n2o_detach_state = n2o_detach_state;
- packet.n2o_venting_valve_state = n2o_venting_valve_state;
+ packet.ox_filling_valve_state = ox_filling_valve_state;
+ packet.ox_release_valve_state = ox_release_valve_state;
+ packet.ox_detach_state = ox_detach_state;
+ packet.ox_venting_valve_state = ox_venting_valve_state;
packet.n2_filling_valve_state = n2_filling_valve_state;
packet.n2_release_valve_state = n2_release_valve_state;
packet.n2_detach_state = n2_detach_state;
@@ -547,9 +558,10 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time
packet.n2_3way_valve_state = n2_3way_valve_state;
packet.main_valve_state = main_valve_state;
packet.nitrogen_valve_state = nitrogen_valve_state;
- packet.ignition_state = ignition_state;
+ packet.chamber_valve_state = chamber_valve_state;
packet.gmm_state = gmm_state;
- packet.tars_state = tars_state;
+ packet.tars3_state = tars3_state;
+ packet.tars3m_state = tars3m_state;
packet.arming_state = arming_state;
packet.main_board_state = main_board_state;
packet.payload_board_state = payload_board_state;
@@ -570,7 +582,7 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time
static inline void mavlink_msg_gse_tm_send_struct(mavlink_channel_t chan, const mavlink_gse_tm_t* gse_tm)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
- mavlink_msg_gse_tm_send(chan, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->n2o_vessel_mass, gse_tm->n2o_filling_pressure, gse_tm->n2o_vessel_pressure, gse_tm->n2_filling_pressure, gse_tm->n2_vessel_1_pressure, gse_tm->n2_vessel_2_pressure, gse_tm->n2o_filling_valve_state, gse_tm->n2o_release_valve_state, gse_tm->n2o_detach_state, gse_tm->n2o_venting_valve_state, gse_tm->n2_filling_valve_state, gse_tm->n2_release_valve_state, gse_tm->n2_detach_state, gse_tm->n2_quenching_valve_state, gse_tm->n2_3way_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->ignition_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good);
+ mavlink_msg_gse_tm_send(chan, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->ox_vessel_mass, gse_tm->ox_filling_pressure, gse_tm->ox_vessel_pressure, gse_tm->n2_filling_pressure, gse_tm->n2_vessel_1_pressure, gse_tm->n2_vessel_2_pressure, gse_tm->ox_filling_valve_state, gse_tm->ox_release_valve_state, gse_tm->ox_detach_state, gse_tm->ox_venting_valve_state, gse_tm->n2_filling_valve_state, gse_tm->n2_release_valve_state, gse_tm->n2_detach_state, gse_tm->n2_quenching_valve_state, gse_tm->n2_3way_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->chamber_valve_state, gse_tm->gmm_state, gse_tm->tars3_state, gse_tm->tars3m_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good);
#else
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GSE_TM, (const char *)gse_tm, MAVLINK_MSG_ID_GSE_TM_MIN_LEN, MAVLINK_MSG_ID_GSE_TM_LEN, MAVLINK_MSG_ID_GSE_TM_CRC);
#endif
@@ -584,15 +596,15 @@ static inline void mavlink_msg_gse_tm_send_struct(mavlink_channel_t chan, const
is usually the receive buffer for the channel, and allows a reply to an
incoming message with minimum stack space usage.
*/
-static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float rocket_mass, float n2o_vessel_mass, float n2o_filling_pressure, float n2o_vessel_pressure, float n2_filling_pressure, float n2_vessel_1_pressure, float n2_vessel_2_pressure, uint8_t n2o_filling_valve_state, uint8_t n2o_release_valve_state, uint8_t n2o_detach_state, uint8_t n2o_venting_valve_state, uint8_t n2_filling_valve_state, uint8_t n2_release_valve_state, uint8_t n2_detach_state, uint8_t n2_quenching_valve_state, uint8_t n2_3way_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t ignition_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good)
+static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float rocket_mass, float ox_vessel_mass, float ox_filling_pressure, float ox_vessel_pressure, float n2_filling_pressure, float n2_vessel_1_pressure, float n2_vessel_2_pressure, uint8_t ox_filling_valve_state, uint8_t ox_release_valve_state, uint8_t ox_detach_state, uint8_t ox_venting_valve_state, uint8_t n2_filling_valve_state, uint8_t n2_release_valve_state, uint8_t n2_detach_state, uint8_t n2_quenching_valve_state, uint8_t n2_3way_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t chamber_valve_state, uint8_t gmm_state, uint8_t tars3_state, uint8_t tars3m_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
_mav_put_uint64_t(buf, 0, timestamp);
_mav_put_float(buf, 8, rocket_mass);
- _mav_put_float(buf, 12, n2o_vessel_mass);
- _mav_put_float(buf, 16, n2o_filling_pressure);
- _mav_put_float(buf, 20, n2o_vessel_pressure);
+ _mav_put_float(buf, 12, ox_vessel_mass);
+ _mav_put_float(buf, 16, ox_filling_pressure);
+ _mav_put_float(buf, 20, ox_vessel_pressure);
_mav_put_float(buf, 24, n2_filling_pressure);
_mav_put_float(buf, 28, n2_vessel_1_pressure);
_mav_put_float(buf, 32, n2_vessel_2_pressure);
@@ -603,10 +615,10 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin
_mav_put_float(buf, 52, umbilical_current_consumption);
_mav_put_int32_t(buf, 56, log_good);
_mav_put_int16_t(buf, 60, log_number);
- _mav_put_uint8_t(buf, 62, n2o_filling_valve_state);
- _mav_put_uint8_t(buf, 63, n2o_release_valve_state);
- _mav_put_uint8_t(buf, 64, n2o_detach_state);
- _mav_put_uint8_t(buf, 65, n2o_venting_valve_state);
+ _mav_put_uint8_t(buf, 62, ox_filling_valve_state);
+ _mav_put_uint8_t(buf, 63, ox_release_valve_state);
+ _mav_put_uint8_t(buf, 64, ox_detach_state);
+ _mav_put_uint8_t(buf, 65, ox_venting_valve_state);
_mav_put_uint8_t(buf, 66, n2_filling_valve_state);
_mav_put_uint8_t(buf, 67, n2_release_valve_state);
_mav_put_uint8_t(buf, 68, n2_detach_state);
@@ -614,25 +626,26 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin
_mav_put_uint8_t(buf, 70, n2_3way_valve_state);
_mav_put_uint8_t(buf, 71, main_valve_state);
_mav_put_uint8_t(buf, 72, nitrogen_valve_state);
- _mav_put_uint8_t(buf, 73, ignition_state);
+ _mav_put_uint8_t(buf, 73, chamber_valve_state);
_mav_put_uint8_t(buf, 74, gmm_state);
- _mav_put_uint8_t(buf, 75, tars_state);
- _mav_put_uint8_t(buf, 76, arming_state);
- _mav_put_uint8_t(buf, 77, main_board_state);
- _mav_put_uint8_t(buf, 78, payload_board_state);
- _mav_put_uint8_t(buf, 79, motor_board_state);
- _mav_put_uint8_t(buf, 80, main_can_status);
- _mav_put_uint8_t(buf, 81, payload_can_status);
- _mav_put_uint8_t(buf, 82, motor_can_status);
+ _mav_put_uint8_t(buf, 75, tars3_state);
+ _mav_put_uint8_t(buf, 76, tars3m_state);
+ _mav_put_uint8_t(buf, 77, arming_state);
+ _mav_put_uint8_t(buf, 78, main_board_state);
+ _mav_put_uint8_t(buf, 79, payload_board_state);
+ _mav_put_uint8_t(buf, 80, motor_board_state);
+ _mav_put_uint8_t(buf, 81, main_can_status);
+ _mav_put_uint8_t(buf, 82, payload_can_status);
+ _mav_put_uint8_t(buf, 83, motor_can_status);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GSE_TM, buf, MAVLINK_MSG_ID_GSE_TM_MIN_LEN, MAVLINK_MSG_ID_GSE_TM_LEN, MAVLINK_MSG_ID_GSE_TM_CRC);
#else
mavlink_gse_tm_t *packet = (mavlink_gse_tm_t *)msgbuf;
packet->timestamp = timestamp;
packet->rocket_mass = rocket_mass;
- packet->n2o_vessel_mass = n2o_vessel_mass;
- packet->n2o_filling_pressure = n2o_filling_pressure;
- packet->n2o_vessel_pressure = n2o_vessel_pressure;
+ packet->ox_vessel_mass = ox_vessel_mass;
+ packet->ox_filling_pressure = ox_filling_pressure;
+ packet->ox_vessel_pressure = ox_vessel_pressure;
packet->n2_filling_pressure = n2_filling_pressure;
packet->n2_vessel_1_pressure = n2_vessel_1_pressure;
packet->n2_vessel_2_pressure = n2_vessel_2_pressure;
@@ -643,10 +656,10 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin
packet->umbilical_current_consumption = umbilical_current_consumption;
packet->log_good = log_good;
packet->log_number = log_number;
- packet->n2o_filling_valve_state = n2o_filling_valve_state;
- packet->n2o_release_valve_state = n2o_release_valve_state;
- packet->n2o_detach_state = n2o_detach_state;
- packet->n2o_venting_valve_state = n2o_venting_valve_state;
+ packet->ox_filling_valve_state = ox_filling_valve_state;
+ packet->ox_release_valve_state = ox_release_valve_state;
+ packet->ox_detach_state = ox_detach_state;
+ packet->ox_venting_valve_state = ox_venting_valve_state;
packet->n2_filling_valve_state = n2_filling_valve_state;
packet->n2_release_valve_state = n2_release_valve_state;
packet->n2_detach_state = n2_detach_state;
@@ -654,9 +667,10 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin
packet->n2_3way_valve_state = n2_3way_valve_state;
packet->main_valve_state = main_valve_state;
packet->nitrogen_valve_state = nitrogen_valve_state;
- packet->ignition_state = ignition_state;
+ packet->chamber_valve_state = chamber_valve_state;
packet->gmm_state = gmm_state;
- packet->tars_state = tars_state;
+ packet->tars3_state = tars3_state;
+ packet->tars3m_state = tars3m_state;
packet->arming_state = arming_state;
packet->main_board_state = main_board_state;
packet->payload_board_state = payload_board_state;
@@ -696,31 +710,31 @@ static inline float mavlink_msg_gse_tm_get_rocket_mass(const mavlink_message_t*
}
/**
- * @brief Get field n2o_vessel_mass from gse_tm message
+ * @brief Get field ox_vessel_mass from gse_tm message
*
- * @return [kg] N2O vessel tank mass loadcell measurement
+ * @return [kg] OX vessel tank mass loadcell measurement
*/
-static inline float mavlink_msg_gse_tm_get_n2o_vessel_mass(const mavlink_message_t* msg)
+static inline float mavlink_msg_gse_tm_get_ox_vessel_mass(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
}
/**
- * @brief Get field n2o_filling_pressure from gse_tm message
+ * @brief Get field ox_filling_pressure from gse_tm message
*
- * @return [Bar] N2O refueling line pressure
+ * @return [Bar] OX refueling line pressure
*/
-static inline float mavlink_msg_gse_tm_get_n2o_filling_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_gse_tm_get_ox_filling_pressure(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 16);
}
/**
- * @brief Get field n2o_vessel_pressure from gse_tm message
+ * @brief Get field ox_vessel_pressure from gse_tm message
*
- * @return [Bar] N2O vessel tank pressure
+ * @return [Bar] OX vessel tank pressure
*/
-static inline float mavlink_msg_gse_tm_get_n2o_vessel_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_gse_tm_get_ox_vessel_pressure(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 20);
}
@@ -756,41 +770,41 @@ static inline float mavlink_msg_gse_tm_get_n2_vessel_2_pressure(const mavlink_me
}
/**
- * @brief Get field n2o_filling_valve_state from gse_tm message
+ * @brief Get field ox_filling_valve_state from gse_tm message
*
- * @return N2O filling valve state (1: open, 0: close)
+ * @return OX filling valve state (1: open, 0: close)
*/
-static inline uint8_t mavlink_msg_gse_tm_get_n2o_filling_valve_state(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_gse_tm_get_ox_filling_valve_state(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 62);
}
/**
- * @brief Get field n2o_release_valve_state from gse_tm message
+ * @brief Get field ox_release_valve_state from gse_tm message
*
- * @return N2O release line pressure valve state (1: open, 0: close)
+ * @return OX release line pressure valve state (1: open, 0: close)
*/
-static inline uint8_t mavlink_msg_gse_tm_get_n2o_release_valve_state(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_gse_tm_get_ox_release_valve_state(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 63);
}
/**
- * @brief Get field n2o_detach_state from gse_tm message
+ * @brief Get field ox_detach_state from gse_tm message
*
- * @return N2O quick connector detach state (1: open, 0: close)
+ * @return OX quick connector detach state (1: open, 0: close)
*/
-static inline uint8_t mavlink_msg_gse_tm_get_n2o_detach_state(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_gse_tm_get_ox_detach_state(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 64);
}
/**
- * @brief Get field n2o_venting_valve_state from gse_tm message
+ * @brief Get field ox_venting_valve_state from gse_tm message
*
- * @return N2O venting valve state (1: open, 0: close)
+ * @return OX venting valve state (1: open, 0: close)
*/
-static inline uint8_t mavlink_msg_gse_tm_get_n2o_venting_valve_state(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_gse_tm_get_ox_venting_valve_state(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 65);
}
@@ -848,7 +862,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_n2_3way_valve_state(const mavlink_m
/**
* @brief Get field main_valve_state from gse_tm message
*
- * @return Rocket main N2O valve state (1: open, 0: close)
+ * @return Rocket main OX valve state (1: open, 0: close)
*/
static inline uint8_t mavlink_msg_gse_tm_get_main_valve_state(const mavlink_message_t* msg)
{
@@ -866,11 +880,11 @@ static inline uint8_t mavlink_msg_gse_tm_get_nitrogen_valve_state(const mavlink_
}
/**
- * @brief Get field ignition_state from gse_tm message
+ * @brief Get field chamber_valve_state from gse_tm message
*
- * @return Ignition relay logical state (1: enabled, 0: disabled)
+ * @return Chamber pressurization valve state (1: enabled, 0: disabled)
*/
-static inline uint8_t mavlink_msg_gse_tm_get_ignition_state(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_gse_tm_get_chamber_valve_state(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 73);
}
@@ -886,15 +900,25 @@ static inline uint8_t mavlink_msg_gse_tm_get_gmm_state(const mavlink_message_t*
}
/**
- * @brief Get field tars_state from gse_tm message
+ * @brief Get field tars3_state from gse_tm message
*
- * @return State of TARS
+ * @return State of TARS 3
*/
-static inline uint8_t mavlink_msg_gse_tm_get_tars_state(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_gse_tm_get_tars3_state(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 75);
}
+/**
+ * @brief Get field tars3m_state from gse_tm message
+ *
+ * @return State of TARS 3 Maintenance
+ */
+static inline uint8_t mavlink_msg_gse_tm_get_tars3m_state(const mavlink_message_t* msg)
+{
+ return _MAV_RETURN_uint8_t(msg, 76);
+}
+
/**
* @brief Get field arming_state from gse_tm message
*
@@ -902,7 +926,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_tars_state(const mavlink_message_t*
*/
static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 76);
+ return _MAV_RETURN_uint8_t(msg, 77);
}
/**
@@ -962,7 +986,7 @@ static inline float mavlink_msg_gse_tm_get_umbilical_current_consumption(const m
*/
static inline uint8_t mavlink_msg_gse_tm_get_main_board_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 77);
+ return _MAV_RETURN_uint8_t(msg, 78);
}
/**
@@ -972,7 +996,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_main_board_state(const mavlink_mess
*/
static inline uint8_t mavlink_msg_gse_tm_get_payload_board_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 78);
+ return _MAV_RETURN_uint8_t(msg, 79);
}
/**
@@ -982,7 +1006,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_payload_board_state(const mavlink_m
*/
static inline uint8_t mavlink_msg_gse_tm_get_motor_board_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 79);
+ return _MAV_RETURN_uint8_t(msg, 80);
}
/**
@@ -992,7 +1016,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_motor_board_state(const mavlink_mes
*/
static inline uint8_t mavlink_msg_gse_tm_get_main_can_status(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 80);
+ return _MAV_RETURN_uint8_t(msg, 81);
}
/**
@@ -1002,7 +1026,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_main_can_status(const mavlink_messa
*/
static inline uint8_t mavlink_msg_gse_tm_get_payload_can_status(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 81);
+ return _MAV_RETURN_uint8_t(msg, 82);
}
/**
@@ -1012,7 +1036,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_payload_can_status(const mavlink_me
*/
static inline uint8_t mavlink_msg_gse_tm_get_motor_can_status(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 82);
+ return _MAV_RETURN_uint8_t(msg, 83);
}
/**
@@ -1046,9 +1070,9 @@ static inline void mavlink_msg_gse_tm_decode(const mavlink_message_t* msg, mavli
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
gse_tm->timestamp = mavlink_msg_gse_tm_get_timestamp(msg);
gse_tm->rocket_mass = mavlink_msg_gse_tm_get_rocket_mass(msg);
- gse_tm->n2o_vessel_mass = mavlink_msg_gse_tm_get_n2o_vessel_mass(msg);
- gse_tm->n2o_filling_pressure = mavlink_msg_gse_tm_get_n2o_filling_pressure(msg);
- gse_tm->n2o_vessel_pressure = mavlink_msg_gse_tm_get_n2o_vessel_pressure(msg);
+ gse_tm->ox_vessel_mass = mavlink_msg_gse_tm_get_ox_vessel_mass(msg);
+ gse_tm->ox_filling_pressure = mavlink_msg_gse_tm_get_ox_filling_pressure(msg);
+ gse_tm->ox_vessel_pressure = mavlink_msg_gse_tm_get_ox_vessel_pressure(msg);
gse_tm->n2_filling_pressure = mavlink_msg_gse_tm_get_n2_filling_pressure(msg);
gse_tm->n2_vessel_1_pressure = mavlink_msg_gse_tm_get_n2_vessel_1_pressure(msg);
gse_tm->n2_vessel_2_pressure = mavlink_msg_gse_tm_get_n2_vessel_2_pressure(msg);
@@ -1059,10 +1083,10 @@ static inline void mavlink_msg_gse_tm_decode(const mavlink_message_t* msg, mavli
gse_tm->umbilical_current_consumption = mavlink_msg_gse_tm_get_umbilical_current_consumption(msg);
gse_tm->log_good = mavlink_msg_gse_tm_get_log_good(msg);
gse_tm->log_number = mavlink_msg_gse_tm_get_log_number(msg);
- gse_tm->n2o_filling_valve_state = mavlink_msg_gse_tm_get_n2o_filling_valve_state(msg);
- gse_tm->n2o_release_valve_state = mavlink_msg_gse_tm_get_n2o_release_valve_state(msg);
- gse_tm->n2o_detach_state = mavlink_msg_gse_tm_get_n2o_detach_state(msg);
- gse_tm->n2o_venting_valve_state = mavlink_msg_gse_tm_get_n2o_venting_valve_state(msg);
+ gse_tm->ox_filling_valve_state = mavlink_msg_gse_tm_get_ox_filling_valve_state(msg);
+ gse_tm->ox_release_valve_state = mavlink_msg_gse_tm_get_ox_release_valve_state(msg);
+ gse_tm->ox_detach_state = mavlink_msg_gse_tm_get_ox_detach_state(msg);
+ gse_tm->ox_venting_valve_state = mavlink_msg_gse_tm_get_ox_venting_valve_state(msg);
gse_tm->n2_filling_valve_state = mavlink_msg_gse_tm_get_n2_filling_valve_state(msg);
gse_tm->n2_release_valve_state = mavlink_msg_gse_tm_get_n2_release_valve_state(msg);
gse_tm->n2_detach_state = mavlink_msg_gse_tm_get_n2_detach_state(msg);
@@ -1070,9 +1094,10 @@ static inline void mavlink_msg_gse_tm_decode(const mavlink_message_t* msg, mavli
gse_tm->n2_3way_valve_state = mavlink_msg_gse_tm_get_n2_3way_valve_state(msg);
gse_tm->main_valve_state = mavlink_msg_gse_tm_get_main_valve_state(msg);
gse_tm->nitrogen_valve_state = mavlink_msg_gse_tm_get_nitrogen_valve_state(msg);
- gse_tm->ignition_state = mavlink_msg_gse_tm_get_ignition_state(msg);
+ gse_tm->chamber_valve_state = mavlink_msg_gse_tm_get_chamber_valve_state(msg);
gse_tm->gmm_state = mavlink_msg_gse_tm_get_gmm_state(msg);
- gse_tm->tars_state = mavlink_msg_gse_tm_get_tars_state(msg);
+ gse_tm->tars3_state = mavlink_msg_gse_tm_get_tars3_state(msg);
+ gse_tm->tars3m_state = mavlink_msg_gse_tm_get_tars3m_state(msg);
gse_tm->arming_state = mavlink_msg_gse_tm_get_arming_state(msg);
gse_tm->main_board_state = mavlink_msg_gse_tm_get_main_board_state(msg);
gse_tm->payload_board_state = mavlink_msg_gse_tm_get_payload_board_state(msg);
diff --git a/mavlink_lib/orion/mavlink_msg_motor_tm.h b/mavlink_lib/orion/mavlink_msg_motor_tm.h
index 42a26a13161d0556257cd6bdd12bfe38a5882460..ef5cd5e95abde248350ad3940417388067b7c584 100644
--- a/mavlink_lib/orion/mavlink_msg_motor_tm.h
+++ b/mavlink_lib/orion/mavlink_msg_motor_tm.h
@@ -6,25 +6,28 @@
typedef struct __mavlink_motor_tm_t {
uint64_t timestamp; /*< [us] Timestamp in microseconds*/
- float top_tank_pressure; /*< [Bar] Tank upper pressure*/
- float bottom_tank_pressure; /*< [Bar] Tank bottom pressure*/
- float combustion_chamber_pressure; /*< [Bar] Pressure inside the combustion chamber used for automatic shutdown*/
- float tank_temperature; /*< Tank temperature*/
+ float ox_tank_top_pressure; /*< [Bar] OX tank top pressure*/
+ float ox_tank_bot_pressure; /*< [Bar] OX tank bottom pressure*/
+ float n2_tank_pressure; /*< [Bar] N2 tank pressure*/
+ float combustion_chamber_pressure; /*< [Bar] Pressure inside the combustion chamber*/
+ float ox_tank_temperature; /*< OX tank temperature*/
float battery_voltage; /*< [V] Battery voltage*/
int32_t log_good; /*< 0 if log failed, 1 otherwise*/
int16_t log_number; /*< Currently active log file, -1 if the logger is inactive*/
- uint8_t main_valve_state; /*< 1 If the main valve is open */
- uint8_t venting_valve_state; /*< 1 If the venting valve is open */
+ uint8_t n2_quenching_valve_state; /*< N2 quenching valve state (1: open, 0: close)*/
+ uint8_t ox_venting_valve_state; /*< OX venting valve state (1: open, 0: close)*/
+ uint8_t nitrogen_valve_state; /*< Rocket main N2 valve state (1: open, 0: close)*/
+ uint8_t main_valve_state; /*< Rocket main OX valve state (1: open, 0: close)*/
uint8_t hil_state; /*< 1 if the board is currently in HIL mode*/
} mavlink_motor_tm_t;
-#define MAVLINK_MSG_ID_MOTOR_TM_LEN 37
-#define MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN 37
-#define MAVLINK_MSG_ID_213_LEN 37
-#define MAVLINK_MSG_ID_213_MIN_LEN 37
+#define MAVLINK_MSG_ID_MOTOR_TM_LEN 43
+#define MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN 43
+#define MAVLINK_MSG_ID_213_LEN 43
+#define MAVLINK_MSG_ID_213_MIN_LEN 43
-#define MAVLINK_MSG_ID_MOTOR_TM_CRC 67
-#define MAVLINK_MSG_ID_213_CRC 67
+#define MAVLINK_MSG_ID_MOTOR_TM_CRC 135
+#define MAVLINK_MSG_ID_213_CRC 135
@@ -32,35 +35,41 @@ typedef struct __mavlink_motor_tm_t {
#define MAVLINK_MESSAGE_INFO_MOTOR_TM { \
213, \
"MOTOR_TM", \
- 11, \
+ 14, \
{ { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_motor_tm_t, timestamp) }, \
- { "top_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_motor_tm_t, top_tank_pressure) }, \
- { "bottom_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_motor_tm_t, bottom_tank_pressure) }, \
- { "combustion_chamber_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_motor_tm_t, combustion_chamber_pressure) }, \
- { "tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, tank_temperature) }, \
- { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 34, offsetof(mavlink_motor_tm_t, main_valve_state) }, \
- { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 35, offsetof(mavlink_motor_tm_t, venting_valve_state) }, \
- { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, battery_voltage) }, \
- { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 32, offsetof(mavlink_motor_tm_t, log_number) }, \
- { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 28, offsetof(mavlink_motor_tm_t, log_good) }, \
- { "hil_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 36, offsetof(mavlink_motor_tm_t, hil_state) }, \
+ { "ox_tank_top_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_motor_tm_t, ox_tank_top_pressure) }, \
+ { "ox_tank_bot_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_motor_tm_t, ox_tank_bot_pressure) }, \
+ { "n2_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_motor_tm_t, n2_tank_pressure) }, \
+ { "combustion_chamber_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, combustion_chamber_pressure) }, \
+ { "ox_tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, ox_tank_temperature) }, \
+ { "n2_quenching_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 38, offsetof(mavlink_motor_tm_t, n2_quenching_valve_state) }, \
+ { "ox_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 39, offsetof(mavlink_motor_tm_t, ox_venting_valve_state) }, \
+ { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 40, offsetof(mavlink_motor_tm_t, nitrogen_valve_state) }, \
+ { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 41, offsetof(mavlink_motor_tm_t, main_valve_state) }, \
+ { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_motor_tm_t, battery_voltage) }, \
+ { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 36, offsetof(mavlink_motor_tm_t, log_number) }, \
+ { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 32, offsetof(mavlink_motor_tm_t, log_good) }, \
+ { "hil_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 42, offsetof(mavlink_motor_tm_t, hil_state) }, \
} \
}
#else
#define MAVLINK_MESSAGE_INFO_MOTOR_TM { \
"MOTOR_TM", \
- 11, \
+ 14, \
{ { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_motor_tm_t, timestamp) }, \
- { "top_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_motor_tm_t, top_tank_pressure) }, \
- { "bottom_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_motor_tm_t, bottom_tank_pressure) }, \
- { "combustion_chamber_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_motor_tm_t, combustion_chamber_pressure) }, \
- { "tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, tank_temperature) }, \
- { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 34, offsetof(mavlink_motor_tm_t, main_valve_state) }, \
- { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 35, offsetof(mavlink_motor_tm_t, venting_valve_state) }, \
- { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, battery_voltage) }, \
- { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 32, offsetof(mavlink_motor_tm_t, log_number) }, \
- { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 28, offsetof(mavlink_motor_tm_t, log_good) }, \
- { "hil_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 36, offsetof(mavlink_motor_tm_t, hil_state) }, \
+ { "ox_tank_top_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_motor_tm_t, ox_tank_top_pressure) }, \
+ { "ox_tank_bot_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_motor_tm_t, ox_tank_bot_pressure) }, \
+ { "n2_tank_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_motor_tm_t, n2_tank_pressure) }, \
+ { "combustion_chamber_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_motor_tm_t, combustion_chamber_pressure) }, \
+ { "ox_tank_temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_motor_tm_t, ox_tank_temperature) }, \
+ { "n2_quenching_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 38, offsetof(mavlink_motor_tm_t, n2_quenching_valve_state) }, \
+ { "ox_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 39, offsetof(mavlink_motor_tm_t, ox_venting_valve_state) }, \
+ { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 40, offsetof(mavlink_motor_tm_t, nitrogen_valve_state) }, \
+ { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 41, offsetof(mavlink_motor_tm_t, main_valve_state) }, \
+ { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_motor_tm_t, battery_voltage) }, \
+ { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 36, offsetof(mavlink_motor_tm_t, log_number) }, \
+ { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 32, offsetof(mavlink_motor_tm_t, log_good) }, \
+ { "hil_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 42, offsetof(mavlink_motor_tm_t, hil_state) }, \
} \
}
#endif
@@ -72,12 +81,15 @@ typedef struct __mavlink_motor_tm_t {
* @param msg The MAVLink message to compress the data into
*
* @param timestamp [us] Timestamp in microseconds
- * @param top_tank_pressure [Bar] Tank upper pressure
- * @param bottom_tank_pressure [Bar] Tank bottom pressure
- * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber used for automatic shutdown
- * @param tank_temperature Tank temperature
- * @param main_valve_state 1 If the main valve is open
- * @param venting_valve_state 1 If the venting valve is open
+ * @param ox_tank_top_pressure [Bar] OX tank top pressure
+ * @param ox_tank_bot_pressure [Bar] OX tank bottom pressure
+ * @param n2_tank_pressure [Bar] N2 tank pressure
+ * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber
+ * @param ox_tank_temperature OX tank temperature
+ * @param n2_quenching_valve_state N2 quenching valve state (1: open, 0: close)
+ * @param ox_venting_valve_state OX venting valve state (1: open, 0: close)
+ * @param nitrogen_valve_state Rocket main N2 valve state (1: open, 0: close)
+ * @param main_valve_state Rocket main OX valve state (1: open, 0: close)
* @param battery_voltage [V] Battery voltage
* @param log_number Currently active log file, -1 if the logger is inactive
* @param log_good 0 if log failed, 1 otherwise
@@ -85,35 +97,41 @@ typedef struct __mavlink_motor_tm_t {
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
- uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, float tank_temperature, uint8_t main_valve_state, uint8_t venting_valve_state, float battery_voltage, int16_t log_number, int32_t log_good, uint8_t hil_state)
+ uint64_t timestamp, float ox_tank_top_pressure, float ox_tank_bot_pressure, float n2_tank_pressure, float combustion_chamber_pressure, float ox_tank_temperature, uint8_t n2_quenching_valve_state, uint8_t ox_venting_valve_state, uint8_t nitrogen_valve_state, uint8_t main_valve_state, float battery_voltage, int16_t log_number, int32_t log_good, uint8_t hil_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN];
_mav_put_uint64_t(buf, 0, timestamp);
- _mav_put_float(buf, 8, top_tank_pressure);
- _mav_put_float(buf, 12, bottom_tank_pressure);
- _mav_put_float(buf, 16, combustion_chamber_pressure);
- _mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, battery_voltage);
- _mav_put_int32_t(buf, 28, log_good);
- _mav_put_int16_t(buf, 32, log_number);
- _mav_put_uint8_t(buf, 34, main_valve_state);
- _mav_put_uint8_t(buf, 35, venting_valve_state);
- _mav_put_uint8_t(buf, 36, hil_state);
+ _mav_put_float(buf, 8, ox_tank_top_pressure);
+ _mav_put_float(buf, 12, ox_tank_bot_pressure);
+ _mav_put_float(buf, 16, n2_tank_pressure);
+ _mav_put_float(buf, 20, combustion_chamber_pressure);
+ _mav_put_float(buf, 24, ox_tank_temperature);
+ _mav_put_float(buf, 28, battery_voltage);
+ _mav_put_int32_t(buf, 32, log_good);
+ _mav_put_int16_t(buf, 36, log_number);
+ _mav_put_uint8_t(buf, 38, n2_quenching_valve_state);
+ _mav_put_uint8_t(buf, 39, ox_venting_valve_state);
+ _mav_put_uint8_t(buf, 40, nitrogen_valve_state);
+ _mav_put_uint8_t(buf, 41, main_valve_state);
+ _mav_put_uint8_t(buf, 42, hil_state);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_MOTOR_TM_LEN);
#else
mavlink_motor_tm_t packet;
packet.timestamp = timestamp;
- packet.top_tank_pressure = top_tank_pressure;
- packet.bottom_tank_pressure = bottom_tank_pressure;
+ packet.ox_tank_top_pressure = ox_tank_top_pressure;
+ packet.ox_tank_bot_pressure = ox_tank_bot_pressure;
+ packet.n2_tank_pressure = n2_tank_pressure;
packet.combustion_chamber_pressure = combustion_chamber_pressure;
- packet.tank_temperature = tank_temperature;
+ packet.ox_tank_temperature = ox_tank_temperature;
packet.battery_voltage = battery_voltage;
packet.log_good = log_good;
packet.log_number = log_number;
+ packet.n2_quenching_valve_state = n2_quenching_valve_state;
+ packet.ox_venting_valve_state = ox_venting_valve_state;
+ packet.nitrogen_valve_state = nitrogen_valve_state;
packet.main_valve_state = main_valve_state;
- packet.venting_valve_state = venting_valve_state;
packet.hil_state = hil_state;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_MOTOR_TM_LEN);
@@ -130,12 +148,15 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp
* @param chan The MAVLink channel this message will be sent over
* @param msg The MAVLink message to compress the data into
* @param timestamp [us] Timestamp in microseconds
- * @param top_tank_pressure [Bar] Tank upper pressure
- * @param bottom_tank_pressure [Bar] Tank bottom pressure
- * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber used for automatic shutdown
- * @param tank_temperature Tank temperature
- * @param main_valve_state 1 If the main valve is open
- * @param venting_valve_state 1 If the venting valve is open
+ * @param ox_tank_top_pressure [Bar] OX tank top pressure
+ * @param ox_tank_bot_pressure [Bar] OX tank bottom pressure
+ * @param n2_tank_pressure [Bar] N2 tank pressure
+ * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber
+ * @param ox_tank_temperature OX tank temperature
+ * @param n2_quenching_valve_state N2 quenching valve state (1: open, 0: close)
+ * @param ox_venting_valve_state OX venting valve state (1: open, 0: close)
+ * @param nitrogen_valve_state Rocket main N2 valve state (1: open, 0: close)
+ * @param main_valve_state Rocket main OX valve state (1: open, 0: close)
* @param battery_voltage [V] Battery voltage
* @param log_number Currently active log file, -1 if the logger is inactive
* @param log_good 0 if log failed, 1 otherwise
@@ -144,35 +165,41 @@ static inline uint16_t mavlink_msg_motor_tm_pack(uint8_t system_id, uint8_t comp
*/
static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
- uint64_t timestamp,float top_tank_pressure,float bottom_tank_pressure,float combustion_chamber_pressure,float tank_temperature,uint8_t main_valve_state,uint8_t venting_valve_state,float battery_voltage,int16_t log_number,int32_t log_good,uint8_t hil_state)
+ uint64_t timestamp,float ox_tank_top_pressure,float ox_tank_bot_pressure,float n2_tank_pressure,float combustion_chamber_pressure,float ox_tank_temperature,uint8_t n2_quenching_valve_state,uint8_t ox_venting_valve_state,uint8_t nitrogen_valve_state,uint8_t main_valve_state,float battery_voltage,int16_t log_number,int32_t log_good,uint8_t hil_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN];
_mav_put_uint64_t(buf, 0, timestamp);
- _mav_put_float(buf, 8, top_tank_pressure);
- _mav_put_float(buf, 12, bottom_tank_pressure);
- _mav_put_float(buf, 16, combustion_chamber_pressure);
- _mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, battery_voltage);
- _mav_put_int32_t(buf, 28, log_good);
- _mav_put_int16_t(buf, 32, log_number);
- _mav_put_uint8_t(buf, 34, main_valve_state);
- _mav_put_uint8_t(buf, 35, venting_valve_state);
- _mav_put_uint8_t(buf, 36, hil_state);
+ _mav_put_float(buf, 8, ox_tank_top_pressure);
+ _mav_put_float(buf, 12, ox_tank_bot_pressure);
+ _mav_put_float(buf, 16, n2_tank_pressure);
+ _mav_put_float(buf, 20, combustion_chamber_pressure);
+ _mav_put_float(buf, 24, ox_tank_temperature);
+ _mav_put_float(buf, 28, battery_voltage);
+ _mav_put_int32_t(buf, 32, log_good);
+ _mav_put_int16_t(buf, 36, log_number);
+ _mav_put_uint8_t(buf, 38, n2_quenching_valve_state);
+ _mav_put_uint8_t(buf, 39, ox_venting_valve_state);
+ _mav_put_uint8_t(buf, 40, nitrogen_valve_state);
+ _mav_put_uint8_t(buf, 41, main_valve_state);
+ _mav_put_uint8_t(buf, 42, hil_state);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_MOTOR_TM_LEN);
#else
mavlink_motor_tm_t packet;
packet.timestamp = timestamp;
- packet.top_tank_pressure = top_tank_pressure;
- packet.bottom_tank_pressure = bottom_tank_pressure;
+ packet.ox_tank_top_pressure = ox_tank_top_pressure;
+ packet.ox_tank_bot_pressure = ox_tank_bot_pressure;
+ packet.n2_tank_pressure = n2_tank_pressure;
packet.combustion_chamber_pressure = combustion_chamber_pressure;
- packet.tank_temperature = tank_temperature;
+ packet.ox_tank_temperature = ox_tank_temperature;
packet.battery_voltage = battery_voltage;
packet.log_good = log_good;
packet.log_number = log_number;
+ packet.n2_quenching_valve_state = n2_quenching_valve_state;
+ packet.ox_venting_valve_state = ox_venting_valve_state;
+ packet.nitrogen_valve_state = nitrogen_valve_state;
packet.main_valve_state = main_valve_state;
- packet.venting_valve_state = venting_valve_state;
packet.hil_state = hil_state;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_MOTOR_TM_LEN);
@@ -192,7 +219,7 @@ static inline uint16_t mavlink_msg_motor_tm_pack_chan(uint8_t system_id, uint8_t
*/
static inline uint16_t mavlink_msg_motor_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_motor_tm_t* motor_tm)
{
- return mavlink_msg_motor_tm_pack(system_id, component_id, msg, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->tank_temperature, motor_tm->main_valve_state, motor_tm->venting_valve_state, motor_tm->battery_voltage, motor_tm->log_number, motor_tm->log_good, motor_tm->hil_state);
+ return mavlink_msg_motor_tm_pack(system_id, component_id, msg, motor_tm->timestamp, motor_tm->ox_tank_top_pressure, motor_tm->ox_tank_bot_pressure, motor_tm->n2_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->ox_tank_temperature, motor_tm->n2_quenching_valve_state, motor_tm->ox_venting_valve_state, motor_tm->nitrogen_valve_state, motor_tm->main_valve_state, motor_tm->battery_voltage, motor_tm->log_number, motor_tm->log_good, motor_tm->hil_state);
}
/**
@@ -206,7 +233,7 @@ static inline uint16_t mavlink_msg_motor_tm_encode(uint8_t system_id, uint8_t co
*/
static inline uint16_t mavlink_msg_motor_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_motor_tm_t* motor_tm)
{
- return mavlink_msg_motor_tm_pack_chan(system_id, component_id, chan, msg, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->tank_temperature, motor_tm->main_valve_state, motor_tm->venting_valve_state, motor_tm->battery_voltage, motor_tm->log_number, motor_tm->log_good, motor_tm->hil_state);
+ return mavlink_msg_motor_tm_pack_chan(system_id, component_id, chan, msg, motor_tm->timestamp, motor_tm->ox_tank_top_pressure, motor_tm->ox_tank_bot_pressure, motor_tm->n2_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->ox_tank_temperature, motor_tm->n2_quenching_valve_state, motor_tm->ox_venting_valve_state, motor_tm->nitrogen_valve_state, motor_tm->main_valve_state, motor_tm->battery_voltage, motor_tm->log_number, motor_tm->log_good, motor_tm->hil_state);
}
/**
@@ -214,12 +241,15 @@ static inline uint16_t mavlink_msg_motor_tm_encode_chan(uint8_t system_id, uint8
* @param chan MAVLink channel to send the message
*
* @param timestamp [us] Timestamp in microseconds
- * @param top_tank_pressure [Bar] Tank upper pressure
- * @param bottom_tank_pressure [Bar] Tank bottom pressure
- * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber used for automatic shutdown
- * @param tank_temperature Tank temperature
- * @param main_valve_state 1 If the main valve is open
- * @param venting_valve_state 1 If the venting valve is open
+ * @param ox_tank_top_pressure [Bar] OX tank top pressure
+ * @param ox_tank_bot_pressure [Bar] OX tank bottom pressure
+ * @param n2_tank_pressure [Bar] N2 tank pressure
+ * @param combustion_chamber_pressure [Bar] Pressure inside the combustion chamber
+ * @param ox_tank_temperature OX tank temperature
+ * @param n2_quenching_valve_state N2 quenching valve state (1: open, 0: close)
+ * @param ox_venting_valve_state OX venting valve state (1: open, 0: close)
+ * @param nitrogen_valve_state Rocket main N2 valve state (1: open, 0: close)
+ * @param main_valve_state Rocket main OX valve state (1: open, 0: close)
* @param battery_voltage [V] Battery voltage
* @param log_number Currently active log file, -1 if the logger is inactive
* @param log_good 0 if log failed, 1 otherwise
@@ -227,35 +257,41 @@ static inline uint16_t mavlink_msg_motor_tm_encode_chan(uint8_t system_id, uint8
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, float tank_temperature, uint8_t main_valve_state, uint8_t venting_valve_state, float battery_voltage, int16_t log_number, int32_t log_good, uint8_t hil_state)
+static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t timestamp, float ox_tank_top_pressure, float ox_tank_bot_pressure, float n2_tank_pressure, float combustion_chamber_pressure, float ox_tank_temperature, uint8_t n2_quenching_valve_state, uint8_t ox_venting_valve_state, uint8_t nitrogen_valve_state, uint8_t main_valve_state, float battery_voltage, int16_t log_number, int32_t log_good, uint8_t hil_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[MAVLINK_MSG_ID_MOTOR_TM_LEN];
_mav_put_uint64_t(buf, 0, timestamp);
- _mav_put_float(buf, 8, top_tank_pressure);
- _mav_put_float(buf, 12, bottom_tank_pressure);
- _mav_put_float(buf, 16, combustion_chamber_pressure);
- _mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, battery_voltage);
- _mav_put_int32_t(buf, 28, log_good);
- _mav_put_int16_t(buf, 32, log_number);
- _mav_put_uint8_t(buf, 34, main_valve_state);
- _mav_put_uint8_t(buf, 35, venting_valve_state);
- _mav_put_uint8_t(buf, 36, hil_state);
+ _mav_put_float(buf, 8, ox_tank_top_pressure);
+ _mav_put_float(buf, 12, ox_tank_bot_pressure);
+ _mav_put_float(buf, 16, n2_tank_pressure);
+ _mav_put_float(buf, 20, combustion_chamber_pressure);
+ _mav_put_float(buf, 24, ox_tank_temperature);
+ _mav_put_float(buf, 28, battery_voltage);
+ _mav_put_int32_t(buf, 32, log_good);
+ _mav_put_int16_t(buf, 36, log_number);
+ _mav_put_uint8_t(buf, 38, n2_quenching_valve_state);
+ _mav_put_uint8_t(buf, 39, ox_venting_valve_state);
+ _mav_put_uint8_t(buf, 40, nitrogen_valve_state);
+ _mav_put_uint8_t(buf, 41, main_valve_state);
+ _mav_put_uint8_t(buf, 42, hil_state);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, buf, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC);
#else
mavlink_motor_tm_t packet;
packet.timestamp = timestamp;
- packet.top_tank_pressure = top_tank_pressure;
- packet.bottom_tank_pressure = bottom_tank_pressure;
+ packet.ox_tank_top_pressure = ox_tank_top_pressure;
+ packet.ox_tank_bot_pressure = ox_tank_bot_pressure;
+ packet.n2_tank_pressure = n2_tank_pressure;
packet.combustion_chamber_pressure = combustion_chamber_pressure;
- packet.tank_temperature = tank_temperature;
+ packet.ox_tank_temperature = ox_tank_temperature;
packet.battery_voltage = battery_voltage;
packet.log_good = log_good;
packet.log_number = log_number;
+ packet.n2_quenching_valve_state = n2_quenching_valve_state;
+ packet.ox_venting_valve_state = ox_venting_valve_state;
+ packet.nitrogen_valve_state = nitrogen_valve_state;
packet.main_valve_state = main_valve_state;
- packet.venting_valve_state = venting_valve_state;
packet.hil_state = hil_state;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, (const char *)&packet, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC);
@@ -270,7 +306,7 @@ static inline void mavlink_msg_motor_tm_send(mavlink_channel_t chan, uint64_t ti
static inline void mavlink_msg_motor_tm_send_struct(mavlink_channel_t chan, const mavlink_motor_tm_t* motor_tm)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
- mavlink_msg_motor_tm_send(chan, motor_tm->timestamp, motor_tm->top_tank_pressure, motor_tm->bottom_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->tank_temperature, motor_tm->main_valve_state, motor_tm->venting_valve_state, motor_tm->battery_voltage, motor_tm->log_number, motor_tm->log_good, motor_tm->hil_state);
+ mavlink_msg_motor_tm_send(chan, motor_tm->timestamp, motor_tm->ox_tank_top_pressure, motor_tm->ox_tank_bot_pressure, motor_tm->n2_tank_pressure, motor_tm->combustion_chamber_pressure, motor_tm->ox_tank_temperature, motor_tm->n2_quenching_valve_state, motor_tm->ox_venting_valve_state, motor_tm->nitrogen_valve_state, motor_tm->main_valve_state, motor_tm->battery_voltage, motor_tm->log_number, motor_tm->log_good, motor_tm->hil_state);
#else
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, (const char *)motor_tm, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC);
#endif
@@ -284,35 +320,41 @@ static inline void mavlink_msg_motor_tm_send_struct(mavlink_channel_t chan, cons
is usually the receive buffer for the channel, and allows a reply to an
incoming message with minimum stack space usage.
*/
-static inline void mavlink_msg_motor_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float top_tank_pressure, float bottom_tank_pressure, float combustion_chamber_pressure, float tank_temperature, uint8_t main_valve_state, uint8_t venting_valve_state, float battery_voltage, int16_t log_number, int32_t log_good, uint8_t hil_state)
+static inline void mavlink_msg_motor_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, float ox_tank_top_pressure, float ox_tank_bot_pressure, float n2_tank_pressure, float combustion_chamber_pressure, float ox_tank_temperature, uint8_t n2_quenching_valve_state, uint8_t ox_venting_valve_state, uint8_t nitrogen_valve_state, uint8_t main_valve_state, float battery_voltage, int16_t log_number, int32_t log_good, uint8_t hil_state)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char *buf = (char *)msgbuf;
_mav_put_uint64_t(buf, 0, timestamp);
- _mav_put_float(buf, 8, top_tank_pressure);
- _mav_put_float(buf, 12, bottom_tank_pressure);
- _mav_put_float(buf, 16, combustion_chamber_pressure);
- _mav_put_float(buf, 20, tank_temperature);
- _mav_put_float(buf, 24, battery_voltage);
- _mav_put_int32_t(buf, 28, log_good);
- _mav_put_int16_t(buf, 32, log_number);
- _mav_put_uint8_t(buf, 34, main_valve_state);
- _mav_put_uint8_t(buf, 35, venting_valve_state);
- _mav_put_uint8_t(buf, 36, hil_state);
+ _mav_put_float(buf, 8, ox_tank_top_pressure);
+ _mav_put_float(buf, 12, ox_tank_bot_pressure);
+ _mav_put_float(buf, 16, n2_tank_pressure);
+ _mav_put_float(buf, 20, combustion_chamber_pressure);
+ _mav_put_float(buf, 24, ox_tank_temperature);
+ _mav_put_float(buf, 28, battery_voltage);
+ _mav_put_int32_t(buf, 32, log_good);
+ _mav_put_int16_t(buf, 36, log_number);
+ _mav_put_uint8_t(buf, 38, n2_quenching_valve_state);
+ _mav_put_uint8_t(buf, 39, ox_venting_valve_state);
+ _mav_put_uint8_t(buf, 40, nitrogen_valve_state);
+ _mav_put_uint8_t(buf, 41, main_valve_state);
+ _mav_put_uint8_t(buf, 42, hil_state);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, buf, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC);
#else
mavlink_motor_tm_t *packet = (mavlink_motor_tm_t *)msgbuf;
packet->timestamp = timestamp;
- packet->top_tank_pressure = top_tank_pressure;
- packet->bottom_tank_pressure = bottom_tank_pressure;
+ packet->ox_tank_top_pressure = ox_tank_top_pressure;
+ packet->ox_tank_bot_pressure = ox_tank_bot_pressure;
+ packet->n2_tank_pressure = n2_tank_pressure;
packet->combustion_chamber_pressure = combustion_chamber_pressure;
- packet->tank_temperature = tank_temperature;
+ packet->ox_tank_temperature = ox_tank_temperature;
packet->battery_voltage = battery_voltage;
packet->log_good = log_good;
packet->log_number = log_number;
+ packet->n2_quenching_valve_state = n2_quenching_valve_state;
+ packet->ox_venting_valve_state = ox_venting_valve_state;
+ packet->nitrogen_valve_state = nitrogen_valve_state;
packet->main_valve_state = main_valve_state;
- packet->venting_valve_state = venting_valve_state;
packet->hil_state = hil_state;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MOTOR_TM, (const char *)packet, MAVLINK_MSG_ID_MOTOR_TM_MIN_LEN, MAVLINK_MSG_ID_MOTOR_TM_LEN, MAVLINK_MSG_ID_MOTOR_TM_CRC);
@@ -336,63 +378,93 @@ static inline uint64_t mavlink_msg_motor_tm_get_timestamp(const mavlink_message_
}
/**
- * @brief Get field top_tank_pressure from motor_tm message
+ * @brief Get field ox_tank_top_pressure from motor_tm message
*
- * @return [Bar] Tank upper pressure
+ * @return [Bar] OX tank top pressure
*/
-static inline float mavlink_msg_motor_tm_get_top_tank_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_motor_tm_get_ox_tank_top_pressure(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
}
/**
- * @brief Get field bottom_tank_pressure from motor_tm message
+ * @brief Get field ox_tank_bot_pressure from motor_tm message
*
- * @return [Bar] Tank bottom pressure
+ * @return [Bar] OX tank bottom pressure
*/
-static inline float mavlink_msg_motor_tm_get_bottom_tank_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_motor_tm_get_ox_tank_bot_pressure(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
}
/**
- * @brief Get field combustion_chamber_pressure from motor_tm message
+ * @brief Get field n2_tank_pressure from motor_tm message
*
- * @return [Bar] Pressure inside the combustion chamber used for automatic shutdown
+ * @return [Bar] N2 tank pressure
*/
-static inline float mavlink_msg_motor_tm_get_combustion_chamber_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_motor_tm_get_n2_tank_pressure(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 16);
}
/**
- * @brief Get field tank_temperature from motor_tm message
+ * @brief Get field combustion_chamber_pressure from motor_tm message
*
- * @return Tank temperature
+ * @return [Bar] Pressure inside the combustion chamber
*/
-static inline float mavlink_msg_motor_tm_get_tank_temperature(const mavlink_message_t* msg)
+static inline float mavlink_msg_motor_tm_get_combustion_chamber_pressure(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 20);
}
/**
- * @brief Get field main_valve_state from motor_tm message
+ * @brief Get field ox_tank_temperature from motor_tm message
*
- * @return 1 If the main valve is open
+ * @return OX tank temperature
*/
-static inline uint8_t mavlink_msg_motor_tm_get_main_valve_state(const mavlink_message_t* msg)
+static inline float mavlink_msg_motor_tm_get_ox_tank_temperature(const mavlink_message_t* msg)
+{
+ return _MAV_RETURN_float(msg, 24);
+}
+
+/**
+ * @brief Get field n2_quenching_valve_state from motor_tm message
+ *
+ * @return N2 quenching valve state (1: open, 0: close)
+ */
+static inline uint8_t mavlink_msg_motor_tm_get_n2_quenching_valve_state(const mavlink_message_t* msg)
+{
+ return _MAV_RETURN_uint8_t(msg, 38);
+}
+
+/**
+ * @brief Get field ox_venting_valve_state from motor_tm message
+ *
+ * @return OX venting valve state (1: open, 0: close)
+ */
+static inline uint8_t mavlink_msg_motor_tm_get_ox_venting_valve_state(const mavlink_message_t* msg)
+{
+ return _MAV_RETURN_uint8_t(msg, 39);
+}
+
+/**
+ * @brief Get field nitrogen_valve_state from motor_tm message
+ *
+ * @return Rocket main N2 valve state (1: open, 0: close)
+ */
+static inline uint8_t mavlink_msg_motor_tm_get_nitrogen_valve_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 34);
+ return _MAV_RETURN_uint8_t(msg, 40);
}
/**
- * @brief Get field venting_valve_state from motor_tm message
+ * @brief Get field main_valve_state from motor_tm message
*
- * @return 1 If the venting valve is open
+ * @return Rocket main OX valve state (1: open, 0: close)
*/
-static inline uint8_t mavlink_msg_motor_tm_get_venting_valve_state(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_motor_tm_get_main_valve_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 35);
+ return _MAV_RETURN_uint8_t(msg, 41);
}
/**
@@ -402,7 +474,7 @@ static inline uint8_t mavlink_msg_motor_tm_get_venting_valve_state(const mavlink
*/
static inline float mavlink_msg_motor_tm_get_battery_voltage(const mavlink_message_t* msg)
{
- return _MAV_RETURN_float(msg, 24);
+ return _MAV_RETURN_float(msg, 28);
}
/**
@@ -412,7 +484,7 @@ static inline float mavlink_msg_motor_tm_get_battery_voltage(const mavlink_messa
*/
static inline int16_t mavlink_msg_motor_tm_get_log_number(const mavlink_message_t* msg)
{
- return _MAV_RETURN_int16_t(msg, 32);
+ return _MAV_RETURN_int16_t(msg, 36);
}
/**
@@ -422,7 +494,7 @@ static inline int16_t mavlink_msg_motor_tm_get_log_number(const mavlink_message_
*/
static inline int32_t mavlink_msg_motor_tm_get_log_good(const mavlink_message_t* msg)
{
- return _MAV_RETURN_int32_t(msg, 28);
+ return _MAV_RETURN_int32_t(msg, 32);
}
/**
@@ -432,7 +504,7 @@ static inline int32_t mavlink_msg_motor_tm_get_log_good(const mavlink_message_t*
*/
static inline uint8_t mavlink_msg_motor_tm_get_hil_state(const mavlink_message_t* msg)
{
- return _MAV_RETURN_uint8_t(msg, 36);
+ return _MAV_RETURN_uint8_t(msg, 42);
}
/**
@@ -445,15 +517,18 @@ static inline void mavlink_msg_motor_tm_decode(const mavlink_message_t* msg, mav
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
motor_tm->timestamp = mavlink_msg_motor_tm_get_timestamp(msg);
- motor_tm->top_tank_pressure = mavlink_msg_motor_tm_get_top_tank_pressure(msg);
- motor_tm->bottom_tank_pressure = mavlink_msg_motor_tm_get_bottom_tank_pressure(msg);
+ motor_tm->ox_tank_top_pressure = mavlink_msg_motor_tm_get_ox_tank_top_pressure(msg);
+ motor_tm->ox_tank_bot_pressure = mavlink_msg_motor_tm_get_ox_tank_bot_pressure(msg);
+ motor_tm->n2_tank_pressure = mavlink_msg_motor_tm_get_n2_tank_pressure(msg);
motor_tm->combustion_chamber_pressure = mavlink_msg_motor_tm_get_combustion_chamber_pressure(msg);
- motor_tm->tank_temperature = mavlink_msg_motor_tm_get_tank_temperature(msg);
+ motor_tm->ox_tank_temperature = mavlink_msg_motor_tm_get_ox_tank_temperature(msg);
motor_tm->battery_voltage = mavlink_msg_motor_tm_get_battery_voltage(msg);
motor_tm->log_good = mavlink_msg_motor_tm_get_log_good(msg);
motor_tm->log_number = mavlink_msg_motor_tm_get_log_number(msg);
+ motor_tm->n2_quenching_valve_state = mavlink_msg_motor_tm_get_n2_quenching_valve_state(msg);
+ motor_tm->ox_venting_valve_state = mavlink_msg_motor_tm_get_ox_venting_valve_state(msg);
+ motor_tm->nitrogen_valve_state = mavlink_msg_motor_tm_get_nitrogen_valve_state(msg);
motor_tm->main_valve_state = mavlink_msg_motor_tm_get_main_valve_state(msg);
- motor_tm->venting_valve_state = mavlink_msg_motor_tm_get_venting_valve_state(msg);
motor_tm->hil_state = mavlink_msg_motor_tm_get_hil_state(msg);
#else
uint8_t len = msg->len < MAVLINK_MSG_ID_MOTOR_TM_LEN? msg->len : MAVLINK_MSG_ID_MOTOR_TM_LEN;
diff --git a/mavlink_lib/orion/orion.h b/mavlink_lib/orion/orion.h
index 00e5276f40912b9d9907b92abe561e3d326c21f0..561bf4410a1fddb062fd5f01180cc98fa7c5ec2e 100644
--- a/mavlink_lib/orion/orion.h
+++ b/mavlink_lib/orion/orion.h
@@ -11,7 +11,7 @@
#endif
#undef MAVLINK_THIS_XML_HASH
-#define MAVLINK_THIS_XML_HASH -4454992741057024693
+#define MAVLINK_THIS_XML_HASH -8658508618732954074
#ifdef __cplusplus
extern "C" {
@@ -20,11 +20,11 @@ extern "C" {
// MESSAGE LENGTHS AND CRCS
#ifndef MAVLINK_MESSAGE_LENGTHS
-#define MAVLINK_MESSAGE_LENGTHS {0, 8, 1, 1, 1, 1, 5, 1, 1, 4, 4, 12, 16, 8, 2, 4, 8, 1, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 13, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 12, 12, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 74, 64, 32, 60, 32, 32, 32, 32, 56, 22, 5, 19, 36, 36, 36, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 46, 28, 20, 44, 53, 77, 29, 178, 158, 180, 170, 83, 37, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define MAVLINK_MESSAGE_LENGTHS {0, 8, 1, 1, 1, 1, 5, 1, 1, 4, 4, 12, 16, 8, 2, 4, 8, 1, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 14, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 12, 12, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 74, 64, 32, 60, 32, 32, 32, 32, 56, 22, 5, 19, 36, 36, 36, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 46, 28, 20, 44, 53, 77, 29, 178, 158, 180, 170, 84, 43, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#endif
#ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {0, 136, 198, 165, 248, 184, 215, 226, 160, 113, 38, 71, 168, 67, 218, 44, 81, 181, 199, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 22, 163, 79, 167, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, 246, 173, 183, 220, 181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 251, 51, 57, 72, 87, 229, 245, 212, 140, 148, 6, 165, 87, 255, 103, 9, 68, 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 142, 108, 39, 19, 234, 66, 11, 235, 188, 195, 99, 196, 67, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define MAVLINK_MESSAGE_CRCS {0, 136, 198, 165, 248, 184, 215, 226, 160, 113, 38, 71, 168, 67, 218, 44, 81, 181, 199, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 22, 238, 79, 167, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, 246, 173, 183, 220, 181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 251, 51, 57, 72, 87, 229, 245, 212, 140, 148, 6, 165, 87, 255, 103, 9, 68, 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 142, 108, 39, 19, 234, 66, 11, 235, 188, 195, 99, 26, 135, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#endif
#include "../protocol.h"
@@ -160,15 +160,15 @@ typedef enum ServosList
EXPULSION_SERVO=2, /* Servo of the expulsion system | */
PARAFOIL_LEFT_SERVO=3, /* Servo of the left parafoil control rope | */
PARAFOIL_RIGHT_SERVO=4, /* Servo of the right parafoil control rope | */
- N2O_FILLING_VALVE=5, /* Valve filling the N2O tank | */
- N2O_RELEASE_VALVE=6, /* Release valve to depressurize the N2O refueling line | */
- N2O_DETACH_SERVO=7, /* Detach of the N2O refueling quick connector | */
- N2O_VENTING_VALVE=8, /* Venting from the N2O tank to air | */
+ OX_FILLING_VALVE=5, /* Valve filling the OX tank | */
+ OX_RELEASE_VALVE=6, /* Release valve to depressurize the OX refueling line | */
+ OX_DETACH_SERVO=7, /* Detach of the OX refueling quick connector | */
+ OX_VENTING_VALVE=8, /* Venting from the OX tank to air | */
N2_FILLING_VALVE=9, /* Valve filling the N2 tank | */
N2_RELEASE_VALVE=10, /* Release valve to depressurize the N2 refueling line | */
N2_DETACH_SERVO=11, /* Detach of the N2 refueling quick connector | */
N2_QUENCHING_VALVE=12, /* Venting from the N2 tank to the combustion chamber | */
- N2_3WAY_VAVLE=13, /* 3-way valve to select between the two N2 tanks | */
+ N2_3WAY_VALVE=13, /* 3-way valve to select between the two N2 tanks | */
MAIN_VALVE=14, /* Valve enabling N2O to flow to the combustion chamber | */
NITROGEN_VALVE=15, /* Valve enabling N2 to reach the pressure regulator and pressurize the N2O | */
ServosList_ENUM_END=16, /* | */
@@ -280,7 +280,7 @@ typedef enum PinsList
#undef MAVLINK_THIS_XML_HASH
-#define MAVLINK_THIS_XML_HASH -4454992741057024693
+#define MAVLINK_THIS_XML_HASH -8658508618732954074
#if MAVLINK_THIS_XML_HASH == MAVLINK_PRIMARY_XML_HASH
# define MAVLINK_MESSAGE_INFO {{"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_PING_TC, MAVLINK_MESSAGE_INFO_COMMAND_TC, MAVLINK_MESSAGE_INFO_SYSTEM_TM_REQUEST_TC, MAVLINK_MESSAGE_INFO_SENSOR_TM_REQUEST_TC, MAVLINK_MESSAGE_INFO_SERVO_TM_REQUEST_TC, MAVLINK_MESSAGE_INFO_SET_SERVO_ANGLE_TC, MAVLINK_MESSAGE_INFO_RESET_SERVO_TC, MAVLINK_MESSAGE_INFO_WIGGLE_SERVO_TC, MAVLINK_MESSAGE_INFO_SET_REFERENCE_ALTITUDE_TC, MAVLINK_MESSAGE_INFO_SET_REFERENCE_TEMPERATURE_TC, MAVLINK_MESSAGE_INFO_SET_ORIENTATION_TC, MAVLINK_MESSAGE_INFO_SET_ORIENTATION_QUAT_TC, MAVLINK_MESSAGE_INFO_SET_COORDINATES_TC, MAVLINK_MESSAGE_INFO_RAW_EVENT_TC, MAVLINK_MESSAGE_INFO_SET_DEPLOYMENT_ALTITUDE_TC, MAVLINK_MESSAGE_INFO_SET_TARGET_COORDINATES_TC, MAVLINK_MESSAGE_INFO_SET_ALGORITHM_TC, MAVLINK_MESSAGE_INFO_SET_CALIBRATION_PRESSURE_TC, MAVLINK_MESSAGE_INFO_SET_INITIAL_MEA_MASS_TC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_ATOMIC_VALVE_TIMING_TC, MAVLINK_MESSAGE_INFO_SET_VALVE_MAXIMUM_APERTURE_TC, MAVLINK_MESSAGE_INFO_CONRIG_STATE_TC, MAVLINK_MESSAGE_INFO_SET_IGNITION_TIME_TC, MAVLINK_MESSAGE_INFO_SET_NITROGEN_TIME_TC, MAVLINK_MESSAGE_INFO_SET_COOLING_TIME_TC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SET_STEPPER_ANGLE_TC, MAVLINK_MESSAGE_INFO_SET_STEPPER_STEPS_TC, MAVLINK_MESSAGE_INFO_SET_STEPPER_MULTIPLIER_TC, MAVLINK_MESSAGE_INFO_SET_ANTENNA_COORDINATES_ARP_TC, MAVLINK_MESSAGE_INFO_SET_ROCKET_COORDINATES_ARP_TC, MAVLINK_MESSAGE_INFO_ARP_COMMAND_TC, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ACK_TM, MAVLINK_MESSAGE_INFO_NACK_TM, MAVLINK_MESSAGE_INFO_WACK_TM, MAVLINK_MESSAGE_INFO_GPS_TM, MAVLINK_MESSAGE_INFO_IMU_TM, MAVLINK_MESSAGE_INFO_PRESSURE_TM, MAVLINK_MESSAGE_INFO_ADC_TM, MAVLINK_MESSAGE_INFO_VOLTAGE_TM, MAVLINK_MESSAGE_INFO_CURRENT_TM, MAVLINK_MESSAGE_INFO_TEMP_TM, MAVLINK_MESSAGE_INFO_LOAD_TM, MAVLINK_MESSAGE_INFO_ATTITUDE_TM, MAVLINK_MESSAGE_INFO_SENSOR_STATE_TM, MAVLINK_MESSAGE_INFO_SERVO_TM, MAVLINK_MESSAGE_INFO_PIN_TM, MAVLINK_MESSAGE_INFO_REFERENCE_TM, MAVLINK_MESSAGE_INFO_REGISTRY_FLOAT_TM, MAVLINK_MESSAGE_INFO_REGISTRY_INT_TM, MAVLINK_MESSAGE_INFO_REGISTRY_COORD_TM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_ARP_TM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, MAVLINK_MESSAGE_INFO_SYS_TM, MAVLINK_MESSAGE_INFO_LOGGER_TM, MAVLINK_MESSAGE_INFO_MAVLINK_STATS_TM, MAVLINK_MESSAGE_INFO_CAN_STATS_TM, MAVLINK_MESSAGE_INFO_TASK_STATS_TM, MAVLINK_MESSAGE_INFO_ADA_TM, MAVLINK_MESSAGE_INFO_NAS_TM, MAVLINK_MESSAGE_INFO_MEA_TM, MAVLINK_MESSAGE_INFO_ROCKET_FLIGHT_TM, MAVLINK_MESSAGE_INFO_PAYLOAD_FLIGHT_TM, MAVLINK_MESSAGE_INFO_ROCKET_STATS_TM, MAVLINK_MESSAGE_INFO_PAYLOAD_STATS_TM, MAVLINK_MESSAGE_INFO_GSE_TM, MAVLINK_MESSAGE_INFO_MOTOR_TM, MAVLINK_MESSAGE_INFO_CALIBRATION_TM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}}
diff --git a/mavlink_lib/orion/testsuite.h b/mavlink_lib/orion/testsuite.h
index ce19f91965fb7ea0adafa235ec74f7fea711860c..4be78b7c0f42ba6805c49dc2f4fd5e73875109a7 100644
--- a/mavlink_lib/orion/testsuite.h
+++ b/mavlink_lib/orion/testsuite.h
@@ -1287,20 +1287,21 @@ static void mavlink_test_conrig_state_tc(uint8_t system_id, uint8_t component_id
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_conrig_state_tc_t packet_in = {
- 5,72,139,206,17,84,151,218,29,96,163,230,41
+ 5,72,139,206,17,84,151,218,29,96,163,230,41,108
};
mavlink_conrig_state_tc_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
- packet1.n2o_filling_btn = packet_in.n2o_filling_btn;
- packet1.n2o_release_btn = packet_in.n2o_release_btn;
- packet1.n2o_detach_btn = packet_in.n2o_detach_btn;
- packet1.n2o_venting_btn = packet_in.n2o_venting_btn;
+ packet1.ox_filling_btn = packet_in.ox_filling_btn;
+ packet1.ox_release_btn = packet_in.ox_release_btn;
+ packet1.ox_detach_btn = packet_in.ox_detach_btn;
+ packet1.ox_venting_btn = packet_in.ox_venting_btn;
packet1.n2_filling_btn = packet_in.n2_filling_btn;
packet1.n2_release_btn = packet_in.n2_release_btn;
packet1.n2_detach_btn = packet_in.n2_detach_btn;
packet1.n2_quenching_btn = packet_in.n2_quenching_btn;
packet1.n2_3way_btn = packet_in.n2_3way_btn;
- packet1.tars_btn = packet_in.tars_btn;
+ packet1.tars3_btn = packet_in.tars3_btn;
+ packet1.tars3m_btn = packet_in.tars3m_btn;
packet1.nitrogen_btn = packet_in.nitrogen_btn;
packet1.ignition_btn = packet_in.ignition_btn;
packet1.arm_switch = packet_in.arm_switch;
@@ -1318,12 +1319,12 @@ static void mavlink_test_conrig_state_tc(uint8_t system_id, uint8_t component_id
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_conrig_state_tc_pack(system_id, component_id, &msg , packet1.n2o_filling_btn , packet1.n2o_release_btn , packet1.n2o_detach_btn , packet1.n2o_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars_btn , packet1.nitrogen_btn , packet1.ignition_btn , packet1.arm_switch );
+ mavlink_msg_conrig_state_tc_pack(system_id, component_id, &msg , packet1.ox_filling_btn , packet1.ox_release_btn , packet1.ox_detach_btn , packet1.ox_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars3_btn , packet1.tars3m_btn , packet1.nitrogen_btn , packet1.ignition_btn , packet1.arm_switch );
mavlink_msg_conrig_state_tc_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.n2o_filling_btn , packet1.n2o_release_btn , packet1.n2o_detach_btn , packet1.n2o_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars_btn , packet1.nitrogen_btn , packet1.ignition_btn , packet1.arm_switch );
+ mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.ox_filling_btn , packet1.ox_release_btn , packet1.ox_detach_btn , packet1.ox_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars3_btn , packet1.tars3m_btn , packet1.nitrogen_btn , packet1.ignition_btn , packet1.arm_switch );
mavlink_msg_conrig_state_tc_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -1336,7 +1337,7 @@ static void mavlink_test_conrig_state_tc(uint8_t system_id, uint8_t component_id
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_conrig_state_tc_send(MAVLINK_COMM_1 , packet1.n2o_filling_btn , packet1.n2o_release_btn , packet1.n2o_detach_btn , packet1.n2o_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars_btn , packet1.nitrogen_btn , packet1.ignition_btn , packet1.arm_switch );
+ mavlink_msg_conrig_state_tc_send(MAVLINK_COMM_1 , packet1.ox_filling_btn , packet1.ox_release_btn , packet1.ox_detach_btn , packet1.ox_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars3_btn , packet1.tars3m_btn , packet1.nitrogen_btn , packet1.ignition_btn , packet1.arm_switch );
mavlink_msg_conrig_state_tc_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -4143,15 +4144,15 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_gse_tm_t packet_in = {
- 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,963499544,325.0,353.0,381.0,963500376,20355,63,130,197,8,75,142,209,20,87,154,221,32,99,166,233,44,111,178,245,56,123
+ 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,963499544,325.0,353.0,381.0,963500376,20355,63,130,197,8,75,142,209,20,87,154,221,32,99,166,233,44,111,178,245,56,123,190
};
mavlink_gse_tm_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
packet1.timestamp = packet_in.timestamp;
packet1.rocket_mass = packet_in.rocket_mass;
- packet1.n2o_vessel_mass = packet_in.n2o_vessel_mass;
- packet1.n2o_filling_pressure = packet_in.n2o_filling_pressure;
- packet1.n2o_vessel_pressure = packet_in.n2o_vessel_pressure;
+ packet1.ox_vessel_mass = packet_in.ox_vessel_mass;
+ packet1.ox_filling_pressure = packet_in.ox_filling_pressure;
+ packet1.ox_vessel_pressure = packet_in.ox_vessel_pressure;
packet1.n2_filling_pressure = packet_in.n2_filling_pressure;
packet1.n2_vessel_1_pressure = packet_in.n2_vessel_1_pressure;
packet1.n2_vessel_2_pressure = packet_in.n2_vessel_2_pressure;
@@ -4162,10 +4163,10 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink
packet1.umbilical_current_consumption = packet_in.umbilical_current_consumption;
packet1.log_good = packet_in.log_good;
packet1.log_number = packet_in.log_number;
- packet1.n2o_filling_valve_state = packet_in.n2o_filling_valve_state;
- packet1.n2o_release_valve_state = packet_in.n2o_release_valve_state;
- packet1.n2o_detach_state = packet_in.n2o_detach_state;
- packet1.n2o_venting_valve_state = packet_in.n2o_venting_valve_state;
+ packet1.ox_filling_valve_state = packet_in.ox_filling_valve_state;
+ packet1.ox_release_valve_state = packet_in.ox_release_valve_state;
+ packet1.ox_detach_state = packet_in.ox_detach_state;
+ packet1.ox_venting_valve_state = packet_in.ox_venting_valve_state;
packet1.n2_filling_valve_state = packet_in.n2_filling_valve_state;
packet1.n2_release_valve_state = packet_in.n2_release_valve_state;
packet1.n2_detach_state = packet_in.n2_detach_state;
@@ -4173,9 +4174,10 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink
packet1.n2_3way_valve_state = packet_in.n2_3way_valve_state;
packet1.main_valve_state = packet_in.main_valve_state;
packet1.nitrogen_valve_state = packet_in.nitrogen_valve_state;
- packet1.ignition_state = packet_in.ignition_state;
+ packet1.chamber_valve_state = packet_in.chamber_valve_state;
packet1.gmm_state = packet_in.gmm_state;
- packet1.tars_state = packet_in.tars_state;
+ packet1.tars3_state = packet_in.tars3_state;
+ packet1.tars3m_state = packet_in.tars3m_state;
packet1.arming_state = packet_in.arming_state;
packet1.main_board_state = packet_in.main_board_state;
packet1.payload_board_state = packet_in.payload_board_state;
@@ -4197,12 +4199,12 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_gse_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.rocket_mass , packet1.n2o_vessel_mass , packet1.n2o_filling_pressure , packet1.n2o_vessel_pressure , packet1.n2_filling_pressure , packet1.n2_vessel_1_pressure , packet1.n2_vessel_2_pressure , packet1.n2o_filling_valve_state , packet1.n2o_release_valve_state , packet1.n2o_detach_state , packet1.n2o_venting_valve_state , packet1.n2_filling_valve_state , packet1.n2_release_valve_state , packet1.n2_detach_state , packet1.n2_quenching_valve_state , packet1.n2_3way_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.ignition_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good );
+ mavlink_msg_gse_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.rocket_mass , packet1.ox_vessel_mass , packet1.ox_filling_pressure , packet1.ox_vessel_pressure , packet1.n2_filling_pressure , packet1.n2_vessel_1_pressure , packet1.n2_vessel_2_pressure , packet1.ox_filling_valve_state , packet1.ox_release_valve_state , packet1.ox_detach_state , packet1.ox_venting_valve_state , packet1.n2_filling_valve_state , packet1.n2_release_valve_state , packet1.n2_detach_state , packet1.n2_quenching_valve_state , packet1.n2_3way_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.chamber_valve_state , packet1.gmm_state , packet1.tars3_state , packet1.tars3m_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good );
mavlink_msg_gse_tm_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_gse_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.rocket_mass , packet1.n2o_vessel_mass , packet1.n2o_filling_pressure , packet1.n2o_vessel_pressure , packet1.n2_filling_pressure , packet1.n2_vessel_1_pressure , packet1.n2_vessel_2_pressure , packet1.n2o_filling_valve_state , packet1.n2o_release_valve_state , packet1.n2o_detach_state , packet1.n2o_venting_valve_state , packet1.n2_filling_valve_state , packet1.n2_release_valve_state , packet1.n2_detach_state , packet1.n2_quenching_valve_state , packet1.n2_3way_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.ignition_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good );
+ mavlink_msg_gse_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.rocket_mass , packet1.ox_vessel_mass , packet1.ox_filling_pressure , packet1.ox_vessel_pressure , packet1.n2_filling_pressure , packet1.n2_vessel_1_pressure , packet1.n2_vessel_2_pressure , packet1.ox_filling_valve_state , packet1.ox_release_valve_state , packet1.ox_detach_state , packet1.ox_venting_valve_state , packet1.n2_filling_valve_state , packet1.n2_release_valve_state , packet1.n2_detach_state , packet1.n2_quenching_valve_state , packet1.n2_3way_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.chamber_valve_state , packet1.gmm_state , packet1.tars3_state , packet1.tars3m_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good );
mavlink_msg_gse_tm_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -4215,7 +4217,7 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_gse_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.rocket_mass , packet1.n2o_vessel_mass , packet1.n2o_filling_pressure , packet1.n2o_vessel_pressure , packet1.n2_filling_pressure , packet1.n2_vessel_1_pressure , packet1.n2_vessel_2_pressure , packet1.n2o_filling_valve_state , packet1.n2o_release_valve_state , packet1.n2o_detach_state , packet1.n2o_venting_valve_state , packet1.n2_filling_valve_state , packet1.n2_release_valve_state , packet1.n2_detach_state , packet1.n2_quenching_valve_state , packet1.n2_3way_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.ignition_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good );
+ mavlink_msg_gse_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.rocket_mass , packet1.ox_vessel_mass , packet1.ox_filling_pressure , packet1.ox_vessel_pressure , packet1.n2_filling_pressure , packet1.n2_vessel_1_pressure , packet1.n2_vessel_2_pressure , packet1.ox_filling_valve_state , packet1.ox_release_valve_state , packet1.ox_detach_state , packet1.ox_venting_valve_state , packet1.n2_filling_valve_state , packet1.n2_release_valve_state , packet1.n2_detach_state , packet1.n2_quenching_valve_state , packet1.n2_3way_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.chamber_valve_state , packet1.gmm_state , packet1.tars3_state , packet1.tars3m_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good );
mavlink_msg_gse_tm_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -4237,20 +4239,23 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_motor_tm_t packet_in = {
- 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,963498920,18899,235,46,113
+ 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,963499128,19107,247,58,125,192,3
};
mavlink_motor_tm_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
packet1.timestamp = packet_in.timestamp;
- packet1.top_tank_pressure = packet_in.top_tank_pressure;
- packet1.bottom_tank_pressure = packet_in.bottom_tank_pressure;
+ packet1.ox_tank_top_pressure = packet_in.ox_tank_top_pressure;
+ packet1.ox_tank_bot_pressure = packet_in.ox_tank_bot_pressure;
+ packet1.n2_tank_pressure = packet_in.n2_tank_pressure;
packet1.combustion_chamber_pressure = packet_in.combustion_chamber_pressure;
- packet1.tank_temperature = packet_in.tank_temperature;
+ packet1.ox_tank_temperature = packet_in.ox_tank_temperature;
packet1.battery_voltage = packet_in.battery_voltage;
packet1.log_good = packet_in.log_good;
packet1.log_number = packet_in.log_number;
+ packet1.n2_quenching_valve_state = packet_in.n2_quenching_valve_state;
+ packet1.ox_venting_valve_state = packet_in.ox_venting_valve_state;
+ packet1.nitrogen_valve_state = packet_in.nitrogen_valve_state;
packet1.main_valve_state = packet_in.main_valve_state;
- packet1.venting_valve_state = packet_in.venting_valve_state;
packet1.hil_state = packet_in.hil_state;
@@ -4266,12 +4271,12 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_motor_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.tank_temperature , packet1.main_valve_state , packet1.venting_valve_state , packet1.battery_voltage , packet1.log_number , packet1.log_good , packet1.hil_state );
+ mavlink_msg_motor_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.ox_tank_top_pressure , packet1.ox_tank_bot_pressure , packet1.n2_tank_pressure , packet1.combustion_chamber_pressure , packet1.ox_tank_temperature , packet1.n2_quenching_valve_state , packet1.ox_venting_valve_state , packet1.nitrogen_valve_state , packet1.main_valve_state , packet1.battery_voltage , packet1.log_number , packet1.log_good , packet1.hil_state );
mavlink_msg_motor_tm_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_motor_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.tank_temperature , packet1.main_valve_state , packet1.venting_valve_state , packet1.battery_voltage , packet1.log_number , packet1.log_good , packet1.hil_state );
+ mavlink_msg_motor_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.ox_tank_top_pressure , packet1.ox_tank_bot_pressure , packet1.n2_tank_pressure , packet1.combustion_chamber_pressure , packet1.ox_tank_temperature , packet1.n2_quenching_valve_state , packet1.ox_venting_valve_state , packet1.nitrogen_valve_state , packet1.main_valve_state , packet1.battery_voltage , packet1.log_number , packet1.log_good , packet1.hil_state );
mavlink_msg_motor_tm_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
@@ -4284,7 +4289,7 @@ static void mavlink_test_motor_tm(uint8_t system_id, uint8_t component_id, mavli
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
- mavlink_msg_motor_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.top_tank_pressure , packet1.bottom_tank_pressure , packet1.combustion_chamber_pressure , packet1.tank_temperature , packet1.main_valve_state , packet1.venting_valve_state , packet1.battery_voltage , packet1.log_number , packet1.log_good , packet1.hil_state );
+ mavlink_msg_motor_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.ox_tank_top_pressure , packet1.ox_tank_bot_pressure , packet1.n2_tank_pressure , packet1.combustion_chamber_pressure , packet1.ox_tank_temperature , packet1.n2_quenching_valve_state , packet1.ox_venting_valve_state , packet1.nitrogen_valve_state , packet1.main_valve_state , packet1.battery_voltage , packet1.log_number , packet1.log_good , packet1.hil_state );
mavlink_msg_motor_tm_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
diff --git a/mavlink_lib/orion/version.h b/mavlink_lib/orion/version.h
index de7bcd9ad2859f0c18925224154510bd00e0eae1..bd075d5bf875bbcaec6354e67af7f96d8ba00cfb 100644
--- a/mavlink_lib/orion/version.h
+++ b/mavlink_lib/orion/version.h
@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
-#define MAVLINK_BUILD_DATE "Mon Nov 25 2024"
+#define MAVLINK_BUILD_DATE "Mon Mar 10 2025"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 180
diff --git a/message_definitions/orion.xml b/message_definitions/orion.xml
index 4c8b2f6cad67e17a25a7c22071dc35e1886e1dc8..dbfb4f57290eab43a5035ac0ec36bf1899582dac 100644
--- a/message_definitions/orion.xml
+++ b/message_definitions/orion.xml
@@ -262,17 +262,17 @@
<entry name="PARAFOIL_RIGHT_SERVO" value="4">
<description>Servo of the right parafoil control rope</description>
</entry>
- <entry name="N2O_FILLING_VALVE" value="5">
- <description>Valve filling the N2O tank</description>
+ <entry name="OX_FILLING_VALVE" value="5">
+ <description>Valve filling the OX tank</description>
</entry>
- <entry name="N2O_RELEASE_VALVE" value="6">
- <description>Release valve to depressurize the N2O refueling line</description>
+ <entry name="OX_RELEASE_VALVE" value="6">
+ <description>Release valve to depressurize the OX refueling line</description>
</entry>
- <entry name="N2O_DETACH_SERVO" value="7">
- <description>Detach of the N2O refueling quick connector</description>
+ <entry name="OX_DETACH_SERVO" value="7">
+ <description>Detach of the OX refueling quick connector</description>
</entry>
- <entry name="N2O_VENTING_VALVE" value="8">
- <description>Venting from the N2O tank to air</description>
+ <entry name="OX_VENTING_VALVE" value="8">
+ <description>Venting from the OX tank to air</description>
</entry>
<entry name="N2_FILLING_VALVE" value="9">
<description>Valve filling the N2 tank</description>
@@ -286,7 +286,7 @@
<entry name="N2_QUENCHING_VALVE" value="12">
<description>Venting from the N2 tank to the combustion chamber</description>
</entry>
- <entry name="N2_3WAY_VAVLE" value="13">
+ <entry name="N2_3WAY_VALVE" value="13">
<description>3-way valve to select between the two N2 tanks</description>
</entry>
<entry name="MAIN_VALVE" value="14">
@@ -407,17 +407,18 @@
<field name="maximum_aperture" type="float">Maximum aperture</field>
</message>
<message id="32" name="CONRIG_STATE_TC">
- <description>Send the state of the conRIG.</description>
- <field name="n2o_filling_btn" type="uint8_t">N2O filling valve button state</field>
- <field name="n2o_release_btn" type="uint8_t">N2O release line pressure valve button state</field>
- <field name="n2o_detach_btn" type="uint8_t">N2O quick connector detach button state</field>
- <field name="n2o_venting_btn" type="uint8_t">N2O venting valve button state</field>
+ <description>The state of the ConRIG control panel</description>
+ <field name="ox_filling_btn" type="uint8_t">OX filling valve button state</field>
+ <field name="ox_release_btn" type="uint8_t">OX release line pressure valve button state</field>
+ <field name="ox_detach_btn" type="uint8_t">OX quick connector detach button state</field>
+ <field name="ox_venting_btn" type="uint8_t">OX venting valve button state</field>
<field name="n2_filling_btn" type="uint8_t">N2 filling valve button state</field>
<field name="n2_release_btn" type="uint8_t">N2 release line pressure valve button state</field>
<field name="n2_detach_btn" type="uint8_t">N2 quick connector detach button state</field>
<field name="n2_quenching_btn" type="uint8_t">N2 quenching valve button state</field>
<field name="n2_3way_btn" type="uint8_t">N2 3-way valve button state</field>
- <field name="tars_btn" type="uint8_t">TARS algorithm button state</field>
+ <field name="tars3_btn" type="uint8_t">TARS 3 algorithm button state</field>
+ <field name="tars3m_btn" type="uint8_t">TARS 3M algorithm button state</field>
<field name="nitrogen_btn" type="uint8_t">Nitrogen valve button state</field>
<field name="ignition_btn" type="uint8_t">Ignition button state</field>
<field name="arm_switch" type="uint8_t">Arming switch state</field>
@@ -964,26 +965,27 @@
<description>Ground Segment Equipment telemetry</description>
<field name="timestamp" type="uint64_t" units="us">Timestamp in microseconds</field>
<field name="rocket_mass" type="float" units="kg">Rocket mass loadcell measurement</field>
- <field name="n2o_vessel_mass" type="float" units="kg">N2O vessel tank mass loadcell measurement</field>
- <field name="n2o_filling_pressure" type="float" units="Bar">N2O refueling line pressure</field>
- <field name="n2o_vessel_pressure" type="float" units="Bar">N2O vessel tank pressure</field>
+ <field name="ox_vessel_mass" type="float" units="kg">OX vessel tank mass loadcell measurement</field>
+ <field name="ox_filling_pressure" type="float" units="Bar">OX refueling line pressure</field>
+ <field name="ox_vessel_pressure" type="float" units="Bar">OX vessel tank pressure</field>
<field name="n2_filling_pressure" type="float" units="Bar">N2 refueling line pressure</field>
<field name="n2_vessel_1_pressure" type="float" units="Bar">N2 vessel 1 tank pressure</field>
<field name="n2_vessel_2_pressure" type="float" units="Bar">N2 vessel 2 tank pressure</field>
- <field name="n2o_filling_valve_state" type="uint8_t">N2O filling valve state (1: open, 0: close)</field>
- <field name="n2o_release_valve_state" type="uint8_t">N2O release line pressure valve state (1: open, 0: close)</field>
- <field name="n2o_detach_state" type="uint8_t">N2O quick connector detach state (1: open, 0: close)</field>
- <field name="n2o_venting_valve_state" type="uint8_t">N2O venting valve state (1: open, 0: close)</field>
+ <field name="ox_filling_valve_state" type="uint8_t">OX filling valve state (1: open, 0: close)</field>
+ <field name="ox_release_valve_state" type="uint8_t">OX release line pressure valve state (1: open, 0: close)</field>
+ <field name="ox_detach_state" type="uint8_t">OX quick connector detach state (1: open, 0: close)</field>
+ <field name="ox_venting_valve_state" type="uint8_t">OX venting valve state (1: open, 0: close)</field>
<field name="n2_filling_valve_state" type="uint8_t">N2 filling valve state (1: open, 0: close)</field>
<field name="n2_release_valve_state" type="uint8_t">N2 release line pressure valve state (1: open, 0: close)</field>
<field name="n2_detach_state" type="uint8_t">N2 quick connector detach state (1: open, 0: close)</field>
<field name="n2_quenching_valve_state" type="uint8_t">N2 quenching valve state (1: open, 0: close)</field>
<field name="n2_3way_valve_state" type="uint8_t">N2 3-way valve state (1: open, 0: close)</field>
- <field name="main_valve_state" type="uint8_t">Rocket main N2O valve state (1: open, 0: close)</field>
+ <field name="main_valve_state" type="uint8_t">Rocket main OX valve state (1: open, 0: close)</field>
<field name="nitrogen_valve_state" type="uint8_t">Rocket main N2 valve state (1: open, 0: close)</field>
- <field name="ignition_state" type="uint8_t">Ignition relay logical state (1: enabled, 0: disabled)</field>
+ <field name="chamber_valve_state" type="uint8_t">Chamber pressurization valve state (1: enabled, 0: disabled)</field>
<field name="gmm_state" type="uint8_t">State of the GroundModeManager</field>
- <field name="tars_state" type="uint8_t">State of TARS</field>
+ <field name="tars3_state" type="uint8_t">State of TARS 3</field>
+ <field name="tars3m_state" type="uint8_t">State of TARS 3 Maintenance</field>
<field name="arming_state" type="uint8_t">Arming state (1: armed, 0: otherwise)</field>
<field name="cpu_load" type="float">CPU load in percentage</field>
<field name="free_heap" type="uint32_t">Amount of available heap memory</field>
@@ -1002,12 +1004,15 @@
<message id="213" name="MOTOR_TM">
<description>Motor rocket telemetry</description>
<field name="timestamp" type="uint64_t" units="us">Timestamp in microseconds</field>
- <field name="top_tank_pressure" type="float" units="Bar">Tank upper pressure</field>
- <field name="bottom_tank_pressure" type="float" units="Bar">Tank bottom pressure</field>
- <field name="combustion_chamber_pressure" type="float" units="Bar">Pressure inside the combustion chamber used for automatic shutdown</field>
- <field name="tank_temperature" type="float">Tank temperature</field>
- <field name="main_valve_state" type="uint8_t">1 If the main valve is open </field>
- <field name="venting_valve_state" type="uint8_t">1 If the venting valve is open </field>
+ <field name="ox_tank_top_pressure" type="float" units="Bar">OX tank top pressure</field>
+ <field name="ox_tank_bot_pressure" type="float" units="Bar">OX tank bottom pressure</field>
+ <field name="n2_tank_pressure" type="float" units="Bar">N2 tank pressure</field>
+ <field name="combustion_chamber_pressure" type="float" units="Bar">Pressure inside the combustion chamber</field>
+ <field name="ox_tank_temperature" type="float">OX tank temperature</field>
+ <field name="n2_quenching_valve_state" type="uint8_t">N2 quenching valve state (1: open, 0: close)</field>
+ <field name="ox_venting_valve_state" type="uint8_t">OX venting valve state (1: open, 0: close)</field>
+ <field name="nitrogen_valve_state" type="uint8_t">Rocket main N2 valve state (1: open, 0: close)</field>
+ <field name="main_valve_state" type="uint8_t">Rocket main OX valve state (1: open, 0: close)</field>
<field name="battery_voltage" type="float" units="V">Battery voltage</field>
<field name="log_number" type="int16_t">Currently active log file, -1 if the logger is inactive</field>
<field name="log_good" type="int32_t">0 if log failed, 1 otherwise</field>