diff --git a/mavlink_lib.py b/mavlink_lib.py index 1bc792396c4654a39307a20f0c6c43a4bf3b17c0..e0b18bffd1ce4b1314ed6e3b19ecf0d1cfdbf744 100644 --- a/mavlink_lib.py +++ b/mavlink_lib.py @@ -2999,29 +2999,30 @@ class MAVLink_gse_tm_message(MAVLink_message): ''' id = MAVLINK_MSG_ID_GSE_TM name = 'GSE_TM' - 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'] + fieldnames = ['timestamp', 'rocket_mass', 'ox_tank_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_tank_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', '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", "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') + fieldunits_by_name = {"timestamp": "us", "rocket_mass": "kg", "ox_tank_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 = '<QfffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB' + native_format = bytearray('<QfffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB', 'ascii') + orders = [0, 1, 2, 3, 4, 5, 6, 7, 8, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 9, 10, 11, 12, 13, 32, 33, 34, 35, 36, 37, 15, 14] + 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, 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, 0] + crc_extra = 84 + unpacker = struct.Struct('<QfffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB') instance_field = None instance_offset = -1 - 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): + def __init__(self, timestamp, rocket_mass, ox_tank_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.ox_tank_mass = ox_tank_mass self.ox_vessel_mass = ox_vessel_mass self.ox_filling_pressure = ox_filling_pressure self.ox_vessel_pressure = ox_vessel_pressure @@ -3059,7 +3060,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, 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) + return MAVLink_message.pack(self, mav, 84, struct.pack('<QfffffffffIfffihBBBBBBBBBBBBBBBBBBBBBB', self.timestamp, self.rocket_mass, self.ox_tank_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): ''' @@ -5572,12 +5573,13 @@ 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, 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_encode(self, timestamp, rocket_mass, ox_tank_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) + ox_tank_mass : OX tank mass loadcell measurement [kg] (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) @@ -5615,14 +5617,15 @@ class MAVLink(object): log_good : 0 if log failed, 1 otherwise (type:int32_t) ''' - 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) + return MAVLink_gse_tm_message(timestamp, rocket_mass, ox_tank_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, 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): + def gse_tm_send(self, timestamp, rocket_mass, ox_tank_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) + ox_tank_mass : OX tank mass loadcell measurement [kg] (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) @@ -5660,7 +5663,7 @@ class MAVLink(object): log_good : 0 if log failed, 1 otherwise (type:int32_t) ''' - 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) + return self.send(self.gse_tm_encode(timestamp, rocket_mass, ox_tank_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, 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): ''' diff --git a/mavlink_lib/orion/mavlink.h b/mavlink_lib/orion/mavlink.h index a8750ba04904c04e43fb6714cf83cc3e3e6f0035..6b28abbec6a9aa1d2edf7df36fa63ee90ec9a83c 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 -8658508618732954074 +#define MAVLINK_PRIMARY_XML_HASH 1309536867628119565 #ifndef MAVLINK_STX #define MAVLINK_STX 254 diff --git a/mavlink_lib/orion/mavlink_msg_gse_tm.h b/mavlink_lib/orion/mavlink_msg_gse_tm.h index 20dda33844ec0d73ab2a670a15d2bbb905145d13..d4a993e35f6b0d1751b815b414ead8554c73cbd8 100644 --- a/mavlink_lib/orion/mavlink_msg_gse_tm.h +++ b/mavlink_lib/orion/mavlink_msg_gse_tm.h @@ -7,6 +7,7 @@ typedef struct __mavlink_gse_tm_t { uint64_t timestamp; /*< [us] Timestamp in microseconds*/ float rocket_mass; /*< [kg] Rocket mass loadcell measurement*/ + float ox_tank_mass; /*< [kg] OX tank mass loadcell measurement*/ 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*/ @@ -44,13 +45,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 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_LEN 88 +#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 88 +#define MAVLINK_MSG_ID_212_LEN 88 +#define MAVLINK_MSG_ID_212_MIN_LEN 88 -#define MAVLINK_MSG_ID_GSE_TM_CRC 26 -#define MAVLINK_MSG_ID_212_CRC 26 +#define MAVLINK_MSG_ID_GSE_TM_CRC 84 +#define MAVLINK_MSG_ID_212_CRC 84 @@ -58,87 +59,89 @@ typedef struct __mavlink_gse_tm_t { #define MAVLINK_MESSAGE_INFO_GSE_TM { \ 212, \ "GSE_TM", \ - 37, \ + 38, \ { { "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) }, \ - { "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) }, \ - { "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) }, \ - { "n2_quenching_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 69, offsetof(mavlink_gse_tm_t, n2_quenching_valve_state) }, \ - { "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) }, \ - { "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) }, \ - { "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, 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) }, \ + { "ox_tank_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, ox_tank_mass) }, \ + { "ox_vessel_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, ox_vessel_mass) }, \ + { "ox_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, ox_filling_pressure) }, \ + { "ox_vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, ox_vessel_pressure) }, \ + { "n2_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, n2_filling_pressure) }, \ + { "n2_vessel_1_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, n2_vessel_1_pressure) }, \ + { "n2_vessel_2_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gse_tm_t, n2_vessel_2_pressure) }, \ + { "ox_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 66, offsetof(mavlink_gse_tm_t, ox_filling_valve_state) }, \ + { "ox_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 67, offsetof(mavlink_gse_tm_t, ox_release_valve_state) }, \ + { "ox_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 68, offsetof(mavlink_gse_tm_t, ox_detach_state) }, \ + { "ox_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 69, offsetof(mavlink_gse_tm_t, ox_venting_valve_state) }, \ + { "n2_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 70, offsetof(mavlink_gse_tm_t, n2_filling_valve_state) }, \ + { "n2_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 71, offsetof(mavlink_gse_tm_t, n2_release_valve_state) }, \ + { "n2_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 72, offsetof(mavlink_gse_tm_t, n2_detach_state) }, \ + { "n2_quenching_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 73, offsetof(mavlink_gse_tm_t, n2_quenching_valve_state) }, \ + { "n2_3way_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 74, offsetof(mavlink_gse_tm_t, n2_3way_valve_state) }, \ + { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 75, offsetof(mavlink_gse_tm_t, main_valve_state) }, \ + { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 76, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \ + { "chamber_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 77, offsetof(mavlink_gse_tm_t, chamber_valve_state) }, \ + { "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 78, offsetof(mavlink_gse_tm_t, gmm_state) }, \ + { "tars3_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 79, offsetof(mavlink_gse_tm_t, tars3_state) }, \ + { "tars3m_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 80, offsetof(mavlink_gse_tm_t, tars3m_state) }, \ + { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 81, offsetof(mavlink_gse_tm_t, arming_state) }, \ + { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_gse_tm_t, cpu_load) }, \ + { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 44, offsetof(mavlink_gse_tm_t, free_heap) }, \ + { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_gse_tm_t, battery_voltage) }, \ + { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_gse_tm_t, current_consumption) }, \ + { "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \ + { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 82, offsetof(mavlink_gse_tm_t, main_board_state) }, \ + { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 83, offsetof(mavlink_gse_tm_t, payload_board_state) }, \ + { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 84, offsetof(mavlink_gse_tm_t, motor_board_state) }, \ + { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 85, offsetof(mavlink_gse_tm_t, main_can_status) }, \ + { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 86, offsetof(mavlink_gse_tm_t, payload_can_status) }, \ + { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 87, offsetof(mavlink_gse_tm_t, motor_can_status) }, \ + { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 64, offsetof(mavlink_gse_tm_t, log_number) }, \ + { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 60, offsetof(mavlink_gse_tm_t, log_good) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_GSE_TM { \ "GSE_TM", \ - 37, \ + 38, \ { { "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) }, \ - { "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) }, \ - { "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) }, \ - { "n2_quenching_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 69, offsetof(mavlink_gse_tm_t, n2_quenching_valve_state) }, \ - { "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) }, \ - { "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) }, \ - { "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, 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) }, \ + { "ox_tank_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, ox_tank_mass) }, \ + { "ox_vessel_mass", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, ox_vessel_mass) }, \ + { "ox_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, ox_filling_pressure) }, \ + { "ox_vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, ox_vessel_pressure) }, \ + { "n2_filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, n2_filling_pressure) }, \ + { "n2_vessel_1_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, n2_vessel_1_pressure) }, \ + { "n2_vessel_2_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gse_tm_t, n2_vessel_2_pressure) }, \ + { "ox_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 66, offsetof(mavlink_gse_tm_t, ox_filling_valve_state) }, \ + { "ox_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 67, offsetof(mavlink_gse_tm_t, ox_release_valve_state) }, \ + { "ox_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 68, offsetof(mavlink_gse_tm_t, ox_detach_state) }, \ + { "ox_venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 69, offsetof(mavlink_gse_tm_t, ox_venting_valve_state) }, \ + { "n2_filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 70, offsetof(mavlink_gse_tm_t, n2_filling_valve_state) }, \ + { "n2_release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 71, offsetof(mavlink_gse_tm_t, n2_release_valve_state) }, \ + { "n2_detach_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 72, offsetof(mavlink_gse_tm_t, n2_detach_state) }, \ + { "n2_quenching_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 73, offsetof(mavlink_gse_tm_t, n2_quenching_valve_state) }, \ + { "n2_3way_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 74, offsetof(mavlink_gse_tm_t, n2_3way_valve_state) }, \ + { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 75, offsetof(mavlink_gse_tm_t, main_valve_state) }, \ + { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 76, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \ + { "chamber_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 77, offsetof(mavlink_gse_tm_t, chamber_valve_state) }, \ + { "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 78, offsetof(mavlink_gse_tm_t, gmm_state) }, \ + { "tars3_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 79, offsetof(mavlink_gse_tm_t, tars3_state) }, \ + { "tars3m_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 80, offsetof(mavlink_gse_tm_t, tars3m_state) }, \ + { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 81, offsetof(mavlink_gse_tm_t, arming_state) }, \ + { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_gse_tm_t, cpu_load) }, \ + { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 44, offsetof(mavlink_gse_tm_t, free_heap) }, \ + { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_gse_tm_t, battery_voltage) }, \ + { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_gse_tm_t, current_consumption) }, \ + { "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \ + { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 82, offsetof(mavlink_gse_tm_t, main_board_state) }, \ + { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 83, offsetof(mavlink_gse_tm_t, payload_board_state) }, \ + { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 84, offsetof(mavlink_gse_tm_t, motor_board_state) }, \ + { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 85, offsetof(mavlink_gse_tm_t, main_can_status) }, \ + { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 86, offsetof(mavlink_gse_tm_t, payload_can_status) }, \ + { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 87, offsetof(mavlink_gse_tm_t, motor_can_status) }, \ + { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 64, offsetof(mavlink_gse_tm_t, log_number) }, \ + { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 60, offsetof(mavlink_gse_tm_t, log_good) }, \ } \ } #endif @@ -151,6 +154,7 @@ typedef struct __mavlink_gse_tm_t { * * @param timestamp [us] Timestamp in microseconds * @param rocket_mass [kg] Rocket mass loadcell measurement + * @param ox_tank_mass [kg] OX tank mass loadcell measurement * @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 @@ -189,53 +193,55 @@ 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 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) + uint64_t timestamp, float rocket_mass, float ox_tank_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, 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); - _mav_put_float(buf, 36, cpu_load); - _mav_put_uint32_t(buf, 40, free_heap); - _mav_put_float(buf, 44, battery_voltage); - _mav_put_float(buf, 48, current_consumption); - _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, 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); - _mav_put_uint8_t(buf, 69, n2_quenching_valve_state); - _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, chamber_valve_state); - _mav_put_uint8_t(buf, 74, gmm_state); - _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_put_float(buf, 12, ox_tank_mass); + _mav_put_float(buf, 16, ox_vessel_mass); + _mav_put_float(buf, 20, ox_filling_pressure); + _mav_put_float(buf, 24, ox_vessel_pressure); + _mav_put_float(buf, 28, n2_filling_pressure); + _mav_put_float(buf, 32, n2_vessel_1_pressure); + _mav_put_float(buf, 36, n2_vessel_2_pressure); + _mav_put_float(buf, 40, cpu_load); + _mav_put_uint32_t(buf, 44, free_heap); + _mav_put_float(buf, 48, battery_voltage); + _mav_put_float(buf, 52, current_consumption); + _mav_put_float(buf, 56, umbilical_current_consumption); + _mav_put_int32_t(buf, 60, log_good); + _mav_put_int16_t(buf, 64, log_number); + _mav_put_uint8_t(buf, 66, ox_filling_valve_state); + _mav_put_uint8_t(buf, 67, ox_release_valve_state); + _mav_put_uint8_t(buf, 68, ox_detach_state); + _mav_put_uint8_t(buf, 69, ox_venting_valve_state); + _mav_put_uint8_t(buf, 70, n2_filling_valve_state); + _mav_put_uint8_t(buf, 71, n2_release_valve_state); + _mav_put_uint8_t(buf, 72, n2_detach_state); + _mav_put_uint8_t(buf, 73, n2_quenching_valve_state); + _mav_put_uint8_t(buf, 74, n2_3way_valve_state); + _mav_put_uint8_t(buf, 75, main_valve_state); + _mav_put_uint8_t(buf, 76, nitrogen_valve_state); + _mav_put_uint8_t(buf, 77, chamber_valve_state); + _mav_put_uint8_t(buf, 78, gmm_state); + _mav_put_uint8_t(buf, 79, tars3_state); + _mav_put_uint8_t(buf, 80, tars3m_state); + _mav_put_uint8_t(buf, 81, arming_state); + _mav_put_uint8_t(buf, 82, main_board_state); + _mav_put_uint8_t(buf, 83, payload_board_state); + _mav_put_uint8_t(buf, 84, motor_board_state); + _mav_put_uint8_t(buf, 85, main_can_status); + _mav_put_uint8_t(buf, 86, payload_can_status); + _mav_put_uint8_t(buf, 87, 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.ox_tank_mass = ox_tank_mass; packet.ox_vessel_mass = ox_vessel_mass; packet.ox_filling_pressure = ox_filling_pressure; packet.ox_vessel_pressure = ox_vessel_pressure; @@ -287,6 +293,7 @@ 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 ox_tank_mass [kg] OX tank mass loadcell measurement * @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 @@ -326,53 +333,55 @@ 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 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) + uint64_t timestamp,float rocket_mass,float ox_tank_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, 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); - _mav_put_float(buf, 36, cpu_load); - _mav_put_uint32_t(buf, 40, free_heap); - _mav_put_float(buf, 44, battery_voltage); - _mav_put_float(buf, 48, current_consumption); - _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, 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); - _mav_put_uint8_t(buf, 69, n2_quenching_valve_state); - _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, chamber_valve_state); - _mav_put_uint8_t(buf, 74, gmm_state); - _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_put_float(buf, 12, ox_tank_mass); + _mav_put_float(buf, 16, ox_vessel_mass); + _mav_put_float(buf, 20, ox_filling_pressure); + _mav_put_float(buf, 24, ox_vessel_pressure); + _mav_put_float(buf, 28, n2_filling_pressure); + _mav_put_float(buf, 32, n2_vessel_1_pressure); + _mav_put_float(buf, 36, n2_vessel_2_pressure); + _mav_put_float(buf, 40, cpu_load); + _mav_put_uint32_t(buf, 44, free_heap); + _mav_put_float(buf, 48, battery_voltage); + _mav_put_float(buf, 52, current_consumption); + _mav_put_float(buf, 56, umbilical_current_consumption); + _mav_put_int32_t(buf, 60, log_good); + _mav_put_int16_t(buf, 64, log_number); + _mav_put_uint8_t(buf, 66, ox_filling_valve_state); + _mav_put_uint8_t(buf, 67, ox_release_valve_state); + _mav_put_uint8_t(buf, 68, ox_detach_state); + _mav_put_uint8_t(buf, 69, ox_venting_valve_state); + _mav_put_uint8_t(buf, 70, n2_filling_valve_state); + _mav_put_uint8_t(buf, 71, n2_release_valve_state); + _mav_put_uint8_t(buf, 72, n2_detach_state); + _mav_put_uint8_t(buf, 73, n2_quenching_valve_state); + _mav_put_uint8_t(buf, 74, n2_3way_valve_state); + _mav_put_uint8_t(buf, 75, main_valve_state); + _mav_put_uint8_t(buf, 76, nitrogen_valve_state); + _mav_put_uint8_t(buf, 77, chamber_valve_state); + _mav_put_uint8_t(buf, 78, gmm_state); + _mav_put_uint8_t(buf, 79, tars3_state); + _mav_put_uint8_t(buf, 80, tars3m_state); + _mav_put_uint8_t(buf, 81, arming_state); + _mav_put_uint8_t(buf, 82, main_board_state); + _mav_put_uint8_t(buf, 83, payload_board_state); + _mav_put_uint8_t(buf, 84, motor_board_state); + _mav_put_uint8_t(buf, 85, main_can_status); + _mav_put_uint8_t(buf, 86, payload_can_status); + _mav_put_uint8_t(buf, 87, 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.ox_tank_mass = ox_tank_mass; packet.ox_vessel_mass = ox_vessel_mass; packet.ox_filling_pressure = ox_filling_pressure; packet.ox_vessel_pressure = ox_vessel_pressure; @@ -426,7 +435,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->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); + return mavlink_msg_gse_tm_pack(system_id, component_id, msg, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->ox_tank_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,7 +449,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->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); + return mavlink_msg_gse_tm_pack_chan(system_id, component_id, chan, msg, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->ox_tank_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); } /** @@ -449,6 +458,7 @@ 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 ox_tank_mass [kg] OX tank mass loadcell measurement * @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 @@ -487,53 +497,55 @@ 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 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) +static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t timestamp, float rocket_mass, float ox_tank_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, 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); - _mav_put_float(buf, 36, cpu_load); - _mav_put_uint32_t(buf, 40, free_heap); - _mav_put_float(buf, 44, battery_voltage); - _mav_put_float(buf, 48, current_consumption); - _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, 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); - _mav_put_uint8_t(buf, 69, n2_quenching_valve_state); - _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, chamber_valve_state); - _mav_put_uint8_t(buf, 74, gmm_state); - _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_put_float(buf, 12, ox_tank_mass); + _mav_put_float(buf, 16, ox_vessel_mass); + _mav_put_float(buf, 20, ox_filling_pressure); + _mav_put_float(buf, 24, ox_vessel_pressure); + _mav_put_float(buf, 28, n2_filling_pressure); + _mav_put_float(buf, 32, n2_vessel_1_pressure); + _mav_put_float(buf, 36, n2_vessel_2_pressure); + _mav_put_float(buf, 40, cpu_load); + _mav_put_uint32_t(buf, 44, free_heap); + _mav_put_float(buf, 48, battery_voltage); + _mav_put_float(buf, 52, current_consumption); + _mav_put_float(buf, 56, umbilical_current_consumption); + _mav_put_int32_t(buf, 60, log_good); + _mav_put_int16_t(buf, 64, log_number); + _mav_put_uint8_t(buf, 66, ox_filling_valve_state); + _mav_put_uint8_t(buf, 67, ox_release_valve_state); + _mav_put_uint8_t(buf, 68, ox_detach_state); + _mav_put_uint8_t(buf, 69, ox_venting_valve_state); + _mav_put_uint8_t(buf, 70, n2_filling_valve_state); + _mav_put_uint8_t(buf, 71, n2_release_valve_state); + _mav_put_uint8_t(buf, 72, n2_detach_state); + _mav_put_uint8_t(buf, 73, n2_quenching_valve_state); + _mav_put_uint8_t(buf, 74, n2_3way_valve_state); + _mav_put_uint8_t(buf, 75, main_valve_state); + _mav_put_uint8_t(buf, 76, nitrogen_valve_state); + _mav_put_uint8_t(buf, 77, chamber_valve_state); + _mav_put_uint8_t(buf, 78, gmm_state); + _mav_put_uint8_t(buf, 79, tars3_state); + _mav_put_uint8_t(buf, 80, tars3m_state); + _mav_put_uint8_t(buf, 81, arming_state); + _mav_put_uint8_t(buf, 82, main_board_state); + _mav_put_uint8_t(buf, 83, payload_board_state); + _mav_put_uint8_t(buf, 84, motor_board_state); + _mav_put_uint8_t(buf, 85, main_can_status); + _mav_put_uint8_t(buf, 86, payload_can_status); + _mav_put_uint8_t(buf, 87, 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.ox_tank_mass = ox_tank_mass; packet.ox_vessel_mass = ox_vessel_mass; packet.ox_filling_pressure = ox_filling_pressure; packet.ox_vessel_pressure = ox_vessel_pressure; @@ -582,7 +594,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->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); + mavlink_msg_gse_tm_send(chan, gse_tm->timestamp, gse_tm->rocket_mass, gse_tm->ox_tank_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 @@ -596,53 +608,55 @@ 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 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) +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_tank_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, 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); - _mav_put_float(buf, 36, cpu_load); - _mav_put_uint32_t(buf, 40, free_heap); - _mav_put_float(buf, 44, battery_voltage); - _mav_put_float(buf, 48, current_consumption); - _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, 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); - _mav_put_uint8_t(buf, 69, n2_quenching_valve_state); - _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, chamber_valve_state); - _mav_put_uint8_t(buf, 74, gmm_state); - _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_put_float(buf, 12, ox_tank_mass); + _mav_put_float(buf, 16, ox_vessel_mass); + _mav_put_float(buf, 20, ox_filling_pressure); + _mav_put_float(buf, 24, ox_vessel_pressure); + _mav_put_float(buf, 28, n2_filling_pressure); + _mav_put_float(buf, 32, n2_vessel_1_pressure); + _mav_put_float(buf, 36, n2_vessel_2_pressure); + _mav_put_float(buf, 40, cpu_load); + _mav_put_uint32_t(buf, 44, free_heap); + _mav_put_float(buf, 48, battery_voltage); + _mav_put_float(buf, 52, current_consumption); + _mav_put_float(buf, 56, umbilical_current_consumption); + _mav_put_int32_t(buf, 60, log_good); + _mav_put_int16_t(buf, 64, log_number); + _mav_put_uint8_t(buf, 66, ox_filling_valve_state); + _mav_put_uint8_t(buf, 67, ox_release_valve_state); + _mav_put_uint8_t(buf, 68, ox_detach_state); + _mav_put_uint8_t(buf, 69, ox_venting_valve_state); + _mav_put_uint8_t(buf, 70, n2_filling_valve_state); + _mav_put_uint8_t(buf, 71, n2_release_valve_state); + _mav_put_uint8_t(buf, 72, n2_detach_state); + _mav_put_uint8_t(buf, 73, n2_quenching_valve_state); + _mav_put_uint8_t(buf, 74, n2_3way_valve_state); + _mav_put_uint8_t(buf, 75, main_valve_state); + _mav_put_uint8_t(buf, 76, nitrogen_valve_state); + _mav_put_uint8_t(buf, 77, chamber_valve_state); + _mav_put_uint8_t(buf, 78, gmm_state); + _mav_put_uint8_t(buf, 79, tars3_state); + _mav_put_uint8_t(buf, 80, tars3m_state); + _mav_put_uint8_t(buf, 81, arming_state); + _mav_put_uint8_t(buf, 82, main_board_state); + _mav_put_uint8_t(buf, 83, payload_board_state); + _mav_put_uint8_t(buf, 84, motor_board_state); + _mav_put_uint8_t(buf, 85, main_can_status); + _mav_put_uint8_t(buf, 86, payload_can_status); + _mav_put_uint8_t(buf, 87, 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->ox_tank_mass = ox_tank_mass; packet->ox_vessel_mass = ox_vessel_mass; packet->ox_filling_pressure = ox_filling_pressure; packet->ox_vessel_pressure = ox_vessel_pressure; @@ -709,6 +723,16 @@ static inline float mavlink_msg_gse_tm_get_rocket_mass(const mavlink_message_t* return _MAV_RETURN_float(msg, 8); } +/** + * @brief Get field ox_tank_mass from gse_tm message + * + * @return [kg] OX tank mass loadcell measurement + */ +static inline float mavlink_msg_gse_tm_get_ox_tank_mass(const mavlink_message_t* msg) +{ + return _MAV_RETURN_float(msg, 12); +} + /** * @brief Get field ox_vessel_mass from gse_tm message * @@ -716,7 +740,7 @@ static inline float mavlink_msg_gse_tm_get_rocket_mass(const mavlink_message_t* */ static inline float mavlink_msg_gse_tm_get_ox_vessel_mass(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 12); + return _MAV_RETURN_float(msg, 16); } /** @@ -726,7 +750,7 @@ static inline float mavlink_msg_gse_tm_get_ox_vessel_mass(const mavlink_message_ */ static inline float mavlink_msg_gse_tm_get_ox_filling_pressure(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 16); + return _MAV_RETURN_float(msg, 20); } /** @@ -736,7 +760,7 @@ static inline float mavlink_msg_gse_tm_get_ox_filling_pressure(const mavlink_mes */ static inline float mavlink_msg_gse_tm_get_ox_vessel_pressure(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 20); + return _MAV_RETURN_float(msg, 24); } /** @@ -746,7 +770,7 @@ static inline float mavlink_msg_gse_tm_get_ox_vessel_pressure(const mavlink_mess */ static inline float mavlink_msg_gse_tm_get_n2_filling_pressure(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 24); + return _MAV_RETURN_float(msg, 28); } /** @@ -756,7 +780,7 @@ static inline float mavlink_msg_gse_tm_get_n2_filling_pressure(const mavlink_mes */ static inline float mavlink_msg_gse_tm_get_n2_vessel_1_pressure(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 28); + return _MAV_RETURN_float(msg, 32); } /** @@ -766,7 +790,7 @@ static inline float mavlink_msg_gse_tm_get_n2_vessel_1_pressure(const mavlink_me */ static inline float mavlink_msg_gse_tm_get_n2_vessel_2_pressure(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 32); + return _MAV_RETURN_float(msg, 36); } /** @@ -776,7 +800,7 @@ static inline float mavlink_msg_gse_tm_get_n2_vessel_2_pressure(const mavlink_me */ 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); + return _MAV_RETURN_uint8_t(msg, 66); } /** @@ -786,7 +810,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_ox_filling_valve_state(const mavlin */ 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); + return _MAV_RETURN_uint8_t(msg, 67); } /** @@ -796,7 +820,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_ox_release_valve_state(const mavlin */ static inline uint8_t mavlink_msg_gse_tm_get_ox_detach_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 64); + return _MAV_RETURN_uint8_t(msg, 68); } /** @@ -806,7 +830,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_ox_detach_state(const mavlink_messa */ 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); + return _MAV_RETURN_uint8_t(msg, 69); } /** @@ -816,7 +840,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_ox_venting_valve_state(const mavlin */ static inline uint8_t mavlink_msg_gse_tm_get_n2_filling_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 66); + return _MAV_RETURN_uint8_t(msg, 70); } /** @@ -826,7 +850,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_n2_filling_valve_state(const mavlin */ static inline uint8_t mavlink_msg_gse_tm_get_n2_release_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 67); + return _MAV_RETURN_uint8_t(msg, 71); } /** @@ -836,7 +860,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_n2_release_valve_state(const mavlin */ static inline uint8_t mavlink_msg_gse_tm_get_n2_detach_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 68); + return _MAV_RETURN_uint8_t(msg, 72); } /** @@ -846,7 +870,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_n2_detach_state(const mavlink_messa */ static inline uint8_t mavlink_msg_gse_tm_get_n2_quenching_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 69); + return _MAV_RETURN_uint8_t(msg, 73); } /** @@ -856,7 +880,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_n2_quenching_valve_state(const mavl */ static inline uint8_t mavlink_msg_gse_tm_get_n2_3way_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 70); + return _MAV_RETURN_uint8_t(msg, 74); } /** @@ -866,7 +890,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_n2_3way_valve_state(const mavlink_m */ static inline uint8_t mavlink_msg_gse_tm_get_main_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 71); + return _MAV_RETURN_uint8_t(msg, 75); } /** @@ -876,7 +900,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_main_valve_state(const mavlink_mess */ static inline uint8_t mavlink_msg_gse_tm_get_nitrogen_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 72); + return _MAV_RETURN_uint8_t(msg, 76); } /** @@ -886,7 +910,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_nitrogen_valve_state(const mavlink_ */ static inline uint8_t mavlink_msg_gse_tm_get_chamber_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 73); + return _MAV_RETURN_uint8_t(msg, 77); } /** @@ -896,7 +920,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_chamber_valve_state(const mavlink_m */ static inline uint8_t mavlink_msg_gse_tm_get_gmm_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 74); + return _MAV_RETURN_uint8_t(msg, 78); } /** @@ -906,7 +930,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_gmm_state(const mavlink_message_t* */ static inline uint8_t mavlink_msg_gse_tm_get_tars3_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 75); + return _MAV_RETURN_uint8_t(msg, 79); } /** @@ -916,7 +940,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_tars3_state(const mavlink_message_t */ static inline uint8_t mavlink_msg_gse_tm_get_tars3m_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 76); + return _MAV_RETURN_uint8_t(msg, 80); } /** @@ -926,7 +950,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_tars3m_state(const mavlink_message_ */ static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 77); + return _MAV_RETURN_uint8_t(msg, 81); } /** @@ -936,7 +960,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_ */ static inline float mavlink_msg_gse_tm_get_cpu_load(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 36); + return _MAV_RETURN_float(msg, 40); } /** @@ -946,7 +970,7 @@ static inline float mavlink_msg_gse_tm_get_cpu_load(const mavlink_message_t* msg */ static inline uint32_t mavlink_msg_gse_tm_get_free_heap(const mavlink_message_t* msg) { - return _MAV_RETURN_uint32_t(msg, 40); + return _MAV_RETURN_uint32_t(msg, 44); } /** @@ -956,7 +980,7 @@ static inline uint32_t mavlink_msg_gse_tm_get_free_heap(const mavlink_message_t* */ static inline float mavlink_msg_gse_tm_get_battery_voltage(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 44); + return _MAV_RETURN_float(msg, 48); } /** @@ -966,7 +990,7 @@ static inline float mavlink_msg_gse_tm_get_battery_voltage(const mavlink_message */ static inline float mavlink_msg_gse_tm_get_current_consumption(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 48); + return _MAV_RETURN_float(msg, 52); } /** @@ -976,7 +1000,7 @@ static inline float mavlink_msg_gse_tm_get_current_consumption(const mavlink_mes */ static inline float mavlink_msg_gse_tm_get_umbilical_current_consumption(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 52); + return _MAV_RETURN_float(msg, 56); } /** @@ -986,7 +1010,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, 78); + return _MAV_RETURN_uint8_t(msg, 82); } /** @@ -996,7 +1020,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, 79); + return _MAV_RETURN_uint8_t(msg, 83); } /** @@ -1006,7 +1030,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, 80); + return _MAV_RETURN_uint8_t(msg, 84); } /** @@ -1016,7 +1040,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, 81); + return _MAV_RETURN_uint8_t(msg, 85); } /** @@ -1026,7 +1050,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, 82); + return _MAV_RETURN_uint8_t(msg, 86); } /** @@ -1036,7 +1060,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, 83); + return _MAV_RETURN_uint8_t(msg, 87); } /** @@ -1046,7 +1070,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_motor_can_status(const mavlink_mess */ static inline int16_t mavlink_msg_gse_tm_get_log_number(const mavlink_message_t* msg) { - return _MAV_RETURN_int16_t(msg, 60); + return _MAV_RETURN_int16_t(msg, 64); } /** @@ -1056,7 +1080,7 @@ static inline int16_t mavlink_msg_gse_tm_get_log_number(const mavlink_message_t* */ static inline int32_t mavlink_msg_gse_tm_get_log_good(const mavlink_message_t* msg) { - return _MAV_RETURN_int32_t(msg, 56); + return _MAV_RETURN_int32_t(msg, 60); } /** @@ -1070,6 +1094,7 @@ 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->ox_tank_mass = mavlink_msg_gse_tm_get_ox_tank_mass(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); diff --git a/mavlink_lib/orion/orion.h b/mavlink_lib/orion/orion.h index 561bf4410a1fddb062fd5f01180cc98fa7c5ec2e..6ce4e363b712577b0ced2ed184e63b97fa3aaa07 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 -8658508618732954074 +#define MAVLINK_THIS_XML_HASH 1309536867628119565 #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, 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} +#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, 88, 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, 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} +#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, 84, 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" @@ -280,7 +280,7 @@ typedef enum PinsList #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH -8658508618732954074 +#define MAVLINK_THIS_XML_HASH 1309536867628119565 #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 4be78b7c0f42ba6805c49dc2f4fd5e73875109a7..d766439a39c269f129f0ce47fc990e8d707ece78 100644 --- a/mavlink_lib/orion/testsuite.h +++ b/mavlink_lib/orion/testsuite.h @@ -4144,12 +4144,13 @@ 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,190 + 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,297.0,963499752,353.0,381.0,409.0,963500584,20563,75,142,209,20,87,154,221,32,99,166,233,44,111,178,245,56,123,190,1,68,135,202 }; mavlink_gse_tm_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); packet1.timestamp = packet_in.timestamp; packet1.rocket_mass = packet_in.rocket_mass; + packet1.ox_tank_mass = packet_in.ox_tank_mass; 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; @@ -4199,12 +4200,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.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_pack(system_id, component_id, &msg , packet1.timestamp , packet1.rocket_mass , packet1.ox_tank_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.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_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.rocket_mass , packet1.ox_tank_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); @@ -4217,7 +4218,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.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_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.rocket_mass , packet1.ox_tank_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); diff --git a/mavlink_lib/orion/version.h b/mavlink_lib/orion/version.h index bd075d5bf875bbcaec6354e67af7f96d8ba00cfb..6126ea993ae13734738f435df1793abe3a0905e4 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 Mar 10 2025" +#define MAVLINK_BUILD_DATE "Tue Apr 08 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 dbfb4f57290eab43a5035ac0ec36bf1899582dac..8d7914f1dbead79169f4002e3647f322d2a6ada1 100644 --- a/message_definitions/orion.xml +++ b/message_definitions/orion.xml @@ -965,6 +965,7 @@ <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="ox_tank_mass" type="float" units="kg">OX tank mass loadcell measurement</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>