diff --git a/mavlink_lib.py b/mavlink_lib.py index 4e2b273435f6f9b42b3280c613c73dc2bdf0a2f4..daf30bfbfae07d5620848b14a1151bc3e0359e15 100644 --- a/mavlink_lib.py +++ b/mavlink_lib.py @@ -2979,23 +2979,23 @@ class MAVLink_gse_tm_message(MAVLink_message): ''' id = MAVLINK_MSG_ID_GSE_TM name = 'GSE_TM' - fieldnames = ['timestamp', 'loadcell_rocket', 'loadcell_vessel', 'filling_pressure', 'vessel_pressure', 'filling_valve_state', 'venting_valve_state', 'release_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'gmm_state', 'tars_state', 'arming_state', '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', 'loadcell_rocket', 'loadcell_vessel', 'filling_pressure', 'vessel_pressure', 'battery_voltage', 'current_consumption', 'umbilical_current_consumption', 'log_good', 'log_number', 'filling_valve_state', 'venting_valve_state', 'release_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'gmm_state', 'tars_state', 'arming_state', 'main_board_state', 'payload_board_state', 'motor_board_state', 'main_can_status', 'payload_can_status', 'motor_can_status'] - fieldtypes = ['uint64_t', 'float', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'float', 'float', 'float', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'int16_t', 'int32_t'] + fieldnames = ['timestamp', 'loadcell_rocket', 'loadcell_vessel', 'filling_pressure', 'vessel_pressure', 'filling_valve_state', 'venting_valve_state', 'release_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'gmm_state', 'tars_state', 'arming_state', 'cpu_load', 'free_heap', 'battery_voltage', 'current_consumption', 'umbilical_current_consumption', 'main_board_state', 'payload_board_state', 'motor_board_state', 'main_can_status', 'payload_can_status', 'motor_can_status', 'log_number', 'log_good'] + ordered_fieldnames = ['timestamp', 'loadcell_rocket', 'loadcell_vessel', 'filling_pressure', 'vessel_pressure', 'cpu_load', 'free_heap', 'battery_voltage', 'current_consumption', 'umbilical_current_consumption', 'log_good', 'log_number', 'filling_valve_state', 'venting_valve_state', 'release_valve_state', 'main_valve_state', 'nitrogen_valve_state', 'gmm_state', 'tars_state', 'arming_state', 'main_board_state', 'payload_board_state', 'motor_board_state', 'main_can_status', 'payload_can_status', 'motor_can_status'] + fieldtypes = ['uint64_t', 'float', 'float', 'float', 'float', '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", "loadcell_rocket": "kg", "loadcell_vessel": "kg", "filling_pressure": "Bar", "vessel_pressure": "Bar", "current_consumption": "A", "umbilical_current_consumption": "A"} - format = '<QfffffffihBBBBBBBBBBBBBB' - native_format = bytearray('<QfffffffihBBBBBBBBBBBBBB', 'ascii') - orders = [0, 1, 2, 3, 4, 10, 11, 12, 13, 14, 15, 16, 17, 5, 6, 7, 18, 19, 20, 21, 22, 23, 9, 8] - 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] - 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] - crc_extra = 33 - unpacker = struct.Struct('<QfffffffihBBBBBBBBBBBBBB') + format = '<QfffffIfffihBBBBBBBBBBBBBB' + native_format = bytearray('<QfffffIfffihBBBBBBBBBBBBBB', 'ascii') + orders = [0, 1, 2, 3, 4, 12, 13, 14, 15, 16, 17, 18, 19, 5, 6, 7, 8, 9, 20, 21, 22, 23, 24, 25, 11, 10] + 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] + 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] + crc_extra = 87 + unpacker = struct.Struct('<QfffffIfffihBBBBBBBBBBBBBB') instance_field = None instance_offset = -1 - def __init__(self, timestamp, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, 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, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good): 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 @@ -3013,6 +3013,8 @@ class MAVLink_gse_tm_message(MAVLink_message): self.gmm_state = gmm_state self.tars_state = tars_state self.arming_state = arming_state + self.cpu_load = cpu_load + self.free_heap = free_heap self.battery_voltage = battery_voltage self.current_consumption = current_consumption self.umbilical_current_consumption = umbilical_current_consumption @@ -3026,7 +3028,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, 33, struct.pack('<QfffffffihBBBBBBBBBBBBBB', self.timestamp, self.loadcell_rocket, self.loadcell_vessel, self.filling_pressure, self.vessel_pressure, self.battery_voltage, self.current_consumption, self.umbilical_current_consumption, self.log_good, self.log_number, self.filling_valve_state, self.venting_valve_state, self.release_valve_state, self.main_valve_state, self.nitrogen_valve_state, self.gmm_state, self.tars_state, self.arming_state, self.main_board_state, self.payload_board_state, self.motor_board_state, self.main_can_status, self.payload_can_status, self.motor_can_status), force_mavlink1=force_mavlink1) + return MAVLink_message.pack(self, mav, 87, struct.pack('<QfffffIfffihBBBBBBBBBBBBBB', self.timestamp, self.loadcell_rocket, self.loadcell_vessel, self.filling_pressure, self.vessel_pressure, self.cpu_load, self.free_heap, self.battery_voltage, self.current_consumption, self.umbilical_current_consumption, self.log_good, self.log_number, self.filling_valve_state, self.venting_valve_state, self.release_valve_state, self.main_valve_state, self.nitrogen_valve_state, self.gmm_state, self.tars_state, self.arming_state, self.main_board_state, self.payload_board_state, self.motor_board_state, self.main_can_status, self.payload_can_status, self.motor_can_status), force_mavlink1=force_mavlink1) class MAVLink_motor_tm_message(MAVLink_message): ''' @@ -5522,7 +5524,7 @@ 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, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, 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, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good): ''' Ground Segment Equipment telemetry @@ -5539,6 +5541,8 @@ class MAVLink(object): gmm_state : State of the GroundModeManager (type:uint8_t) tars_state : State of Tars (type:uint8_t) arming_state : Arming state (1 if armed, 0 otherwise) (type:uint8_t) + cpu_load : CPU load in percentage (type:float) + free_heap : Amount of available heap in memory (type:uint32_t) battery_voltage : Battery voltage (type:float) current_consumption : RIG current [A] (type:float) umbilical_current_consumption : Umbilical current [A] (type:float) @@ -5552,9 +5556,9 @@ class MAVLink(object): log_good : 0 if log failed, 1 otherwise (type:int32_t) ''' - return MAVLink_gse_tm_message(timestamp, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, 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, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good) - def gse_tm_send(self, timestamp, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, 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, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good, force_mavlink1=False): ''' Ground Segment Equipment telemetry @@ -5571,6 +5575,8 @@ class MAVLink(object): gmm_state : State of the GroundModeManager (type:uint8_t) tars_state : State of Tars (type:uint8_t) arming_state : Arming state (1 if armed, 0 otherwise) (type:uint8_t) + cpu_load : CPU load in percentage (type:float) + free_heap : Amount of available heap in memory (type:uint32_t) battery_voltage : Battery voltage (type:float) current_consumption : RIG current [A] (type:float) umbilical_current_consumption : Umbilical current [A] (type:float) @@ -5584,7 +5590,7 @@ class MAVLink(object): log_good : 0 if log failed, 1 otherwise (type:int32_t) ''' - return self.send(self.gse_tm_encode(timestamp, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, 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, loadcell_rocket, loadcell_vessel, filling_pressure, vessel_pressure, filling_valve_state, venting_valve_state, release_valve_state, main_valve_state, nitrogen_valve_state, gmm_state, tars_state, arming_state, cpu_load, free_heap, battery_voltage, current_consumption, umbilical_current_consumption, main_board_state, payload_board_state, motor_board_state, main_can_status, payload_can_status, motor_can_status, log_number, log_good), force_mavlink1=force_mavlink1) def motor_tm_encode(self, timestamp, top_tank_pressure, bottom_tank_pressure, combustion_chamber_pressure, tank_temperature, main_valve_state, venting_valve_state, battery_voltage, log_number, log_good, hil_state): ''' diff --git a/mavlink_lib/lyra/lyra.h b/mavlink_lib/lyra/lyra.h index e50e7709dc1f3e97176a0655b6befa81cc611779..a5860a406d34787ac4860674e8c2473c00690581 100644 --- a/mavlink_lib/lyra/lyra.h +++ b/mavlink_lib/lyra/lyra.h @@ -11,7 +11,7 @@ #endif #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH 3488695080754260571 +#define MAVLINK_THIS_XML_HASH -5660799532835485979 #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, 7, 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, 56, 37, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define MAVLINK_MESSAGE_LENGTHS {0, 8, 1, 1, 1, 1, 5, 1, 1, 4, 4, 12, 16, 8, 2, 4, 8, 1, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 7, 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, 64, 37, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #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, 65, 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, 33, 67, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define MAVLINK_MESSAGE_CRCS {0, 136, 198, 165, 248, 184, 215, 226, 160, 113, 38, 71, 168, 67, 218, 44, 81, 181, 199, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 22, 65, 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, 87, 67, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #endif #include "../protocol.h" @@ -274,7 +274,7 @@ typedef enum PinsList #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH 3488695080754260571 +#define MAVLINK_THIS_XML_HASH -5660799532835485979 #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/lyra/mavlink.h b/mavlink_lib/lyra/mavlink.h index 761a8c388abf7ed53e9149b84a632c0b95e4324f..1d32754890f7b8c5eb9ac62150b94d0ba27c12d5 100644 --- a/mavlink_lib/lyra/mavlink.h +++ b/mavlink_lib/lyra/mavlink.h @@ -6,7 +6,7 @@ #ifndef MAVLINK_H #define MAVLINK_H -#define MAVLINK_PRIMARY_XML_HASH 3488695080754260571 +#define MAVLINK_PRIMARY_XML_HASH -5660799532835485979 #ifndef MAVLINK_STX #define MAVLINK_STX 254 diff --git a/mavlink_lib/lyra/mavlink_msg_gse_tm.h b/mavlink_lib/lyra/mavlink_msg_gse_tm.h index a2b898320cced664284c0022f94c49b071147cb6..01381833f25aee999c037ed570927498b8fddbda 100644 --- a/mavlink_lib/lyra/mavlink_msg_gse_tm.h +++ b/mavlink_lib/lyra/mavlink_msg_gse_tm.h @@ -10,6 +10,8 @@ typedef struct __mavlink_gse_tm_t { float loadcell_vessel; /*< [kg] External tank weight*/ float filling_pressure; /*< [Bar] Refueling line pressure*/ float vessel_pressure; /*< [Bar] Vessel tank pressure*/ + float cpu_load; /*< CPU load in percentage*/ + uint32_t free_heap; /*< Amount of available heap in memory*/ float battery_voltage; /*< Battery voltage*/ float current_consumption; /*< [A] RIG current*/ float umbilical_current_consumption; /*< [A] Umbilical current*/ @@ -31,13 +33,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 56 -#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 56 -#define MAVLINK_MSG_ID_212_LEN 56 -#define MAVLINK_MSG_ID_212_MIN_LEN 56 +#define MAVLINK_MSG_ID_GSE_TM_LEN 64 +#define MAVLINK_MSG_ID_GSE_TM_MIN_LEN 64 +#define MAVLINK_MSG_ID_212_LEN 64 +#define MAVLINK_MSG_ID_212_MIN_LEN 64 -#define MAVLINK_MSG_ID_GSE_TM_CRC 33 -#define MAVLINK_MSG_ID_212_CRC 33 +#define MAVLINK_MSG_ID_GSE_TM_CRC 87 +#define MAVLINK_MSG_ID_212_CRC 87 @@ -45,61 +47,65 @@ typedef struct __mavlink_gse_tm_t { #define MAVLINK_MESSAGE_INFO_GSE_TM { \ 212, \ "GSE_TM", \ - 24, \ + 26, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gse_tm_t, timestamp) }, \ { "loadcell_rocket", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_gse_tm_t, loadcell_rocket) }, \ { "loadcell_vessel", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, loadcell_vessel) }, \ { "filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, filling_pressure) }, \ { "vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, vessel_pressure) }, \ - { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 42, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ - { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 43, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ - { "release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 44, offsetof(mavlink_gse_tm_t, release_valve_state) }, \ - { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 45, offsetof(mavlink_gse_tm_t, main_valve_state) }, \ - { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 46, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \ - { "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 47, offsetof(mavlink_gse_tm_t, gmm_state) }, \ - { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 48, offsetof(mavlink_gse_tm_t, tars_state) }, \ - { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 49, offsetof(mavlink_gse_tm_t, arming_state) }, \ - { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, battery_voltage) }, \ - { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, current_consumption) }, \ - { "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \ - { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 50, offsetof(mavlink_gse_tm_t, main_board_state) }, \ - { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 51, offsetof(mavlink_gse_tm_t, payload_board_state) }, \ - { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 52, offsetof(mavlink_gse_tm_t, motor_board_state) }, \ - { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 53, offsetof(mavlink_gse_tm_t, main_can_status) }, \ - { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 54, offsetof(mavlink_gse_tm_t, payload_can_status) }, \ - { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 55, offsetof(mavlink_gse_tm_t, motor_can_status) }, \ - { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 40, offsetof(mavlink_gse_tm_t, log_number) }, \ - { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 36, offsetof(mavlink_gse_tm_t, log_good) }, \ + { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 50, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ + { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 51, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ + { "release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 52, offsetof(mavlink_gse_tm_t, release_valve_state) }, \ + { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 53, offsetof(mavlink_gse_tm_t, main_valve_state) }, \ + { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 54, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \ + { "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 55, offsetof(mavlink_gse_tm_t, gmm_state) }, \ + { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 56, offsetof(mavlink_gse_tm_t, tars_state) }, \ + { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 57, offsetof(mavlink_gse_tm_t, arming_state) }, \ + { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, cpu_load) }, \ + { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 28, offsetof(mavlink_gse_tm_t, free_heap) }, \ + { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, battery_voltage) }, \ + { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gse_tm_t, current_consumption) }, \ + { "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \ + { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 58, offsetof(mavlink_gse_tm_t, main_board_state) }, \ + { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 59, offsetof(mavlink_gse_tm_t, payload_board_state) }, \ + { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 60, offsetof(mavlink_gse_tm_t, motor_board_state) }, \ + { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 61, offsetof(mavlink_gse_tm_t, main_can_status) }, \ + { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 62, offsetof(mavlink_gse_tm_t, payload_can_status) }, \ + { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 63, offsetof(mavlink_gse_tm_t, motor_can_status) }, \ + { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 48, offsetof(mavlink_gse_tm_t, log_number) }, \ + { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 44, offsetof(mavlink_gse_tm_t, log_good) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_GSE_TM { \ "GSE_TM", \ - 24, \ + 26, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gse_tm_t, timestamp) }, \ { "loadcell_rocket", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_gse_tm_t, loadcell_rocket) }, \ { "loadcell_vessel", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gse_tm_t, loadcell_vessel) }, \ { "filling_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gse_tm_t, filling_pressure) }, \ { "vessel_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gse_tm_t, vessel_pressure) }, \ - { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 42, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ - { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 43, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ - { "release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 44, offsetof(mavlink_gse_tm_t, release_valve_state) }, \ - { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 45, offsetof(mavlink_gse_tm_t, main_valve_state) }, \ - { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 46, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \ - { "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 47, offsetof(mavlink_gse_tm_t, gmm_state) }, \ - { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 48, offsetof(mavlink_gse_tm_t, tars_state) }, \ - { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 49, offsetof(mavlink_gse_tm_t, arming_state) }, \ - { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, battery_voltage) }, \ - { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gse_tm_t, current_consumption) }, \ - { "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \ - { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 50, offsetof(mavlink_gse_tm_t, main_board_state) }, \ - { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 51, offsetof(mavlink_gse_tm_t, payload_board_state) }, \ - { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 52, offsetof(mavlink_gse_tm_t, motor_board_state) }, \ - { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 53, offsetof(mavlink_gse_tm_t, main_can_status) }, \ - { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 54, offsetof(mavlink_gse_tm_t, payload_can_status) }, \ - { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 55, offsetof(mavlink_gse_tm_t, motor_can_status) }, \ - { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 40, offsetof(mavlink_gse_tm_t, log_number) }, \ - { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 36, offsetof(mavlink_gse_tm_t, log_good) }, \ + { "filling_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 50, offsetof(mavlink_gse_tm_t, filling_valve_state) }, \ + { "venting_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 51, offsetof(mavlink_gse_tm_t, venting_valve_state) }, \ + { "release_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 52, offsetof(mavlink_gse_tm_t, release_valve_state) }, \ + { "main_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 53, offsetof(mavlink_gse_tm_t, main_valve_state) }, \ + { "nitrogen_valve_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 54, offsetof(mavlink_gse_tm_t, nitrogen_valve_state) }, \ + { "gmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 55, offsetof(mavlink_gse_tm_t, gmm_state) }, \ + { "tars_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 56, offsetof(mavlink_gse_tm_t, tars_state) }, \ + { "arming_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 57, offsetof(mavlink_gse_tm_t, arming_state) }, \ + { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gse_tm_t, cpu_load) }, \ + { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 28, offsetof(mavlink_gse_tm_t, free_heap) }, \ + { "battery_voltage", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gse_tm_t, battery_voltage) }, \ + { "current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_gse_tm_t, current_consumption) }, \ + { "umbilical_current_consumption", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_gse_tm_t, umbilical_current_consumption) }, \ + { "main_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 58, offsetof(mavlink_gse_tm_t, main_board_state) }, \ + { "payload_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 59, offsetof(mavlink_gse_tm_t, payload_board_state) }, \ + { "motor_board_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 60, offsetof(mavlink_gse_tm_t, motor_board_state) }, \ + { "main_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 61, offsetof(mavlink_gse_tm_t, main_can_status) }, \ + { "payload_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 62, offsetof(mavlink_gse_tm_t, payload_can_status) }, \ + { "motor_can_status", NULL, MAVLINK_TYPE_UINT8_T, 0, 63, offsetof(mavlink_gse_tm_t, motor_can_status) }, \ + { "log_number", NULL, MAVLINK_TYPE_INT16_T, 0, 48, offsetof(mavlink_gse_tm_t, log_number) }, \ + { "log_good", NULL, MAVLINK_TYPE_INT32_T, 0, 44, offsetof(mavlink_gse_tm_t, log_good) }, \ } \ } #endif @@ -123,6 +129,8 @@ typedef struct __mavlink_gse_tm_t { * @param gmm_state State of the GroundModeManager * @param tars_state State of Tars * @param arming_state Arming state (1 if armed, 0 otherwise) + * @param cpu_load CPU load in percentage + * @param free_heap Amount of available heap in memory * @param battery_voltage Battery voltage * @param current_consumption [A] RIG current * @param umbilical_current_consumption [A] Umbilical current @@ -137,7 +145,7 @@ 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 loadcell_rocket, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, 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 loadcell_rocket, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_GSE_TM_LEN]; @@ -146,25 +154,27 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); _mav_put_float(buf, 20, vessel_pressure); - _mav_put_float(buf, 24, battery_voltage); - _mav_put_float(buf, 28, current_consumption); - _mav_put_float(buf, 32, umbilical_current_consumption); - _mav_put_int32_t(buf, 36, log_good); - _mav_put_int16_t(buf, 40, log_number); - _mav_put_uint8_t(buf, 42, filling_valve_state); - _mav_put_uint8_t(buf, 43, venting_valve_state); - _mav_put_uint8_t(buf, 44, release_valve_state); - _mav_put_uint8_t(buf, 45, main_valve_state); - _mav_put_uint8_t(buf, 46, nitrogen_valve_state); - _mav_put_uint8_t(buf, 47, gmm_state); - _mav_put_uint8_t(buf, 48, tars_state); - _mav_put_uint8_t(buf, 49, arming_state); - _mav_put_uint8_t(buf, 50, main_board_state); - _mav_put_uint8_t(buf, 51, payload_board_state); - _mav_put_uint8_t(buf, 52, motor_board_state); - _mav_put_uint8_t(buf, 53, main_can_status); - _mav_put_uint8_t(buf, 54, payload_can_status); - _mav_put_uint8_t(buf, 55, motor_can_status); + _mav_put_float(buf, 24, cpu_load); + _mav_put_uint32_t(buf, 28, free_heap); + _mav_put_float(buf, 32, battery_voltage); + _mav_put_float(buf, 36, current_consumption); + _mav_put_float(buf, 40, umbilical_current_consumption); + _mav_put_int32_t(buf, 44, log_good); + _mav_put_int16_t(buf, 48, log_number); + _mav_put_uint8_t(buf, 50, filling_valve_state); + _mav_put_uint8_t(buf, 51, venting_valve_state); + _mav_put_uint8_t(buf, 52, release_valve_state); + _mav_put_uint8_t(buf, 53, main_valve_state); + _mav_put_uint8_t(buf, 54, nitrogen_valve_state); + _mav_put_uint8_t(buf, 55, gmm_state); + _mav_put_uint8_t(buf, 56, tars_state); + _mav_put_uint8_t(buf, 57, arming_state); + _mav_put_uint8_t(buf, 58, main_board_state); + _mav_put_uint8_t(buf, 59, payload_board_state); + _mav_put_uint8_t(buf, 60, motor_board_state); + _mav_put_uint8_t(buf, 61, main_can_status); + _mav_put_uint8_t(buf, 62, payload_can_status); + _mav_put_uint8_t(buf, 63, motor_can_status); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN); #else @@ -174,6 +184,8 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon packet.loadcell_vessel = loadcell_vessel; packet.filling_pressure = filling_pressure; packet.vessel_pressure = vessel_pressure; + packet.cpu_load = cpu_load; + packet.free_heap = free_heap; packet.battery_voltage = battery_voltage; packet.current_consumption = current_consumption; packet.umbilical_current_consumption = umbilical_current_consumption; @@ -220,6 +232,8 @@ static inline uint16_t mavlink_msg_gse_tm_pack(uint8_t system_id, uint8_t compon * @param gmm_state State of the GroundModeManager * @param tars_state State of Tars * @param arming_state Arming state (1 if armed, 0 otherwise) + * @param cpu_load CPU load in percentage + * @param free_heap Amount of available heap in memory * @param battery_voltage Battery voltage * @param current_consumption [A] RIG current * @param umbilical_current_consumption [A] Umbilical current @@ -235,7 +249,7 @@ 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 loadcell_rocket,float loadcell_vessel,float filling_pressure,float vessel_pressure,uint8_t filling_valve_state,uint8_t venting_valve_state,uint8_t release_valve_state,uint8_t main_valve_state,uint8_t nitrogen_valve_state,uint8_t gmm_state,uint8_t tars_state,uint8_t arming_state,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 loadcell_rocket,float loadcell_vessel,float filling_pressure,float vessel_pressure,uint8_t filling_valve_state,uint8_t venting_valve_state,uint8_t release_valve_state,uint8_t main_valve_state,uint8_t nitrogen_valve_state,uint8_t gmm_state,uint8_t tars_state,uint8_t arming_state,float cpu_load,uint32_t free_heap,float battery_voltage,float current_consumption,float umbilical_current_consumption,uint8_t main_board_state,uint8_t payload_board_state,uint8_t motor_board_state,uint8_t main_can_status,uint8_t payload_can_status,uint8_t motor_can_status,int16_t log_number,int32_t log_good) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_GSE_TM_LEN]; @@ -244,25 +258,27 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); _mav_put_float(buf, 20, vessel_pressure); - _mav_put_float(buf, 24, battery_voltage); - _mav_put_float(buf, 28, current_consumption); - _mav_put_float(buf, 32, umbilical_current_consumption); - _mav_put_int32_t(buf, 36, log_good); - _mav_put_int16_t(buf, 40, log_number); - _mav_put_uint8_t(buf, 42, filling_valve_state); - _mav_put_uint8_t(buf, 43, venting_valve_state); - _mav_put_uint8_t(buf, 44, release_valve_state); - _mav_put_uint8_t(buf, 45, main_valve_state); - _mav_put_uint8_t(buf, 46, nitrogen_valve_state); - _mav_put_uint8_t(buf, 47, gmm_state); - _mav_put_uint8_t(buf, 48, tars_state); - _mav_put_uint8_t(buf, 49, arming_state); - _mav_put_uint8_t(buf, 50, main_board_state); - _mav_put_uint8_t(buf, 51, payload_board_state); - _mav_put_uint8_t(buf, 52, motor_board_state); - _mav_put_uint8_t(buf, 53, main_can_status); - _mav_put_uint8_t(buf, 54, payload_can_status); - _mav_put_uint8_t(buf, 55, motor_can_status); + _mav_put_float(buf, 24, cpu_load); + _mav_put_uint32_t(buf, 28, free_heap); + _mav_put_float(buf, 32, battery_voltage); + _mav_put_float(buf, 36, current_consumption); + _mav_put_float(buf, 40, umbilical_current_consumption); + _mav_put_int32_t(buf, 44, log_good); + _mav_put_int16_t(buf, 48, log_number); + _mav_put_uint8_t(buf, 50, filling_valve_state); + _mav_put_uint8_t(buf, 51, venting_valve_state); + _mav_put_uint8_t(buf, 52, release_valve_state); + _mav_put_uint8_t(buf, 53, main_valve_state); + _mav_put_uint8_t(buf, 54, nitrogen_valve_state); + _mav_put_uint8_t(buf, 55, gmm_state); + _mav_put_uint8_t(buf, 56, tars_state); + _mav_put_uint8_t(buf, 57, arming_state); + _mav_put_uint8_t(buf, 58, main_board_state); + _mav_put_uint8_t(buf, 59, payload_board_state); + _mav_put_uint8_t(buf, 60, motor_board_state); + _mav_put_uint8_t(buf, 61, main_can_status); + _mav_put_uint8_t(buf, 62, payload_can_status); + _mav_put_uint8_t(buf, 63, motor_can_status); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_GSE_TM_LEN); #else @@ -272,6 +288,8 @@ static inline uint16_t mavlink_msg_gse_tm_pack_chan(uint8_t system_id, uint8_t c packet.loadcell_vessel = loadcell_vessel; packet.filling_pressure = filling_pressure; packet.vessel_pressure = vessel_pressure; + packet.cpu_load = cpu_load; + packet.free_heap = free_heap; packet.battery_voltage = battery_voltage; packet.current_consumption = current_consumption; packet.umbilical_current_consumption = umbilical_current_consumption; @@ -309,7 +327,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->loadcell_rocket, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, 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->loadcell_rocket, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good); } /** @@ -323,7 +341,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->loadcell_rocket, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, 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->loadcell_rocket, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good); } /** @@ -343,6 +361,8 @@ static inline uint16_t mavlink_msg_gse_tm_encode_chan(uint8_t system_id, uint8_t * @param gmm_state State of the GroundModeManager * @param tars_state State of Tars * @param arming_state Arming state (1 if armed, 0 otherwise) + * @param cpu_load CPU load in percentage + * @param free_heap Amount of available heap in memory * @param battery_voltage Battery voltage * @param current_consumption [A] RIG current * @param umbilical_current_consumption [A] Umbilical current @@ -357,7 +377,7 @@ 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 loadcell_rocket, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, 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 loadcell_rocket, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_GSE_TM_LEN]; @@ -366,25 +386,27 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); _mav_put_float(buf, 20, vessel_pressure); - _mav_put_float(buf, 24, battery_voltage); - _mav_put_float(buf, 28, current_consumption); - _mav_put_float(buf, 32, umbilical_current_consumption); - _mav_put_int32_t(buf, 36, log_good); - _mav_put_int16_t(buf, 40, log_number); - _mav_put_uint8_t(buf, 42, filling_valve_state); - _mav_put_uint8_t(buf, 43, venting_valve_state); - _mav_put_uint8_t(buf, 44, release_valve_state); - _mav_put_uint8_t(buf, 45, main_valve_state); - _mav_put_uint8_t(buf, 46, nitrogen_valve_state); - _mav_put_uint8_t(buf, 47, gmm_state); - _mav_put_uint8_t(buf, 48, tars_state); - _mav_put_uint8_t(buf, 49, arming_state); - _mav_put_uint8_t(buf, 50, main_board_state); - _mav_put_uint8_t(buf, 51, payload_board_state); - _mav_put_uint8_t(buf, 52, motor_board_state); - _mav_put_uint8_t(buf, 53, main_can_status); - _mav_put_uint8_t(buf, 54, payload_can_status); - _mav_put_uint8_t(buf, 55, motor_can_status); + _mav_put_float(buf, 24, cpu_load); + _mav_put_uint32_t(buf, 28, free_heap); + _mav_put_float(buf, 32, battery_voltage); + _mav_put_float(buf, 36, current_consumption); + _mav_put_float(buf, 40, umbilical_current_consumption); + _mav_put_int32_t(buf, 44, log_good); + _mav_put_int16_t(buf, 48, log_number); + _mav_put_uint8_t(buf, 50, filling_valve_state); + _mav_put_uint8_t(buf, 51, venting_valve_state); + _mav_put_uint8_t(buf, 52, release_valve_state); + _mav_put_uint8_t(buf, 53, main_valve_state); + _mav_put_uint8_t(buf, 54, nitrogen_valve_state); + _mav_put_uint8_t(buf, 55, gmm_state); + _mav_put_uint8_t(buf, 56, tars_state); + _mav_put_uint8_t(buf, 57, arming_state); + _mav_put_uint8_t(buf, 58, main_board_state); + _mav_put_uint8_t(buf, 59, payload_board_state); + _mav_put_uint8_t(buf, 60, motor_board_state); + _mav_put_uint8_t(buf, 61, main_can_status); + _mav_put_uint8_t(buf, 62, payload_can_status); + _mav_put_uint8_t(buf, 63, 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 @@ -394,6 +416,8 @@ static inline void mavlink_msg_gse_tm_send(mavlink_channel_t chan, uint64_t time packet.loadcell_vessel = loadcell_vessel; packet.filling_pressure = filling_pressure; packet.vessel_pressure = vessel_pressure; + packet.cpu_load = cpu_load; + packet.free_heap = free_heap; packet.battery_voltage = battery_voltage; packet.current_consumption = current_consumption; packet.umbilical_current_consumption = umbilical_current_consumption; @@ -426,7 +450,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->loadcell_rocket, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, 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->loadcell_rocket, gse_tm->loadcell_vessel, gse_tm->filling_pressure, gse_tm->vessel_pressure, gse_tm->filling_valve_state, gse_tm->venting_valve_state, gse_tm->release_valve_state, gse_tm->main_valve_state, gse_tm->nitrogen_valve_state, gse_tm->gmm_state, gse_tm->tars_state, gse_tm->arming_state, gse_tm->cpu_load, gse_tm->free_heap, gse_tm->battery_voltage, gse_tm->current_consumption, gse_tm->umbilical_current_consumption, gse_tm->main_board_state, gse_tm->payload_board_state, gse_tm->motor_board_state, gse_tm->main_can_status, gse_tm->payload_can_status, gse_tm->motor_can_status, gse_tm->log_number, gse_tm->log_good); #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 @@ -440,7 +464,7 @@ 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 loadcell_rocket, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, 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 loadcell_rocket, float loadcell_vessel, float filling_pressure, float vessel_pressure, uint8_t filling_valve_state, uint8_t venting_valve_state, uint8_t release_valve_state, uint8_t main_valve_state, uint8_t nitrogen_valve_state, uint8_t gmm_state, uint8_t tars_state, uint8_t arming_state, float cpu_load, uint32_t free_heap, float battery_voltage, float current_consumption, float umbilical_current_consumption, uint8_t main_board_state, uint8_t payload_board_state, uint8_t motor_board_state, uint8_t main_can_status, uint8_t payload_can_status, uint8_t motor_can_status, int16_t log_number, int32_t log_good) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; @@ -449,25 +473,27 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin _mav_put_float(buf, 12, loadcell_vessel); _mav_put_float(buf, 16, filling_pressure); _mav_put_float(buf, 20, vessel_pressure); - _mav_put_float(buf, 24, battery_voltage); - _mav_put_float(buf, 28, current_consumption); - _mav_put_float(buf, 32, umbilical_current_consumption); - _mav_put_int32_t(buf, 36, log_good); - _mav_put_int16_t(buf, 40, log_number); - _mav_put_uint8_t(buf, 42, filling_valve_state); - _mav_put_uint8_t(buf, 43, venting_valve_state); - _mav_put_uint8_t(buf, 44, release_valve_state); - _mav_put_uint8_t(buf, 45, main_valve_state); - _mav_put_uint8_t(buf, 46, nitrogen_valve_state); - _mav_put_uint8_t(buf, 47, gmm_state); - _mav_put_uint8_t(buf, 48, tars_state); - _mav_put_uint8_t(buf, 49, arming_state); - _mav_put_uint8_t(buf, 50, main_board_state); - _mav_put_uint8_t(buf, 51, payload_board_state); - _mav_put_uint8_t(buf, 52, motor_board_state); - _mav_put_uint8_t(buf, 53, main_can_status); - _mav_put_uint8_t(buf, 54, payload_can_status); - _mav_put_uint8_t(buf, 55, motor_can_status); + _mav_put_float(buf, 24, cpu_load); + _mav_put_uint32_t(buf, 28, free_heap); + _mav_put_float(buf, 32, battery_voltage); + _mav_put_float(buf, 36, current_consumption); + _mav_put_float(buf, 40, umbilical_current_consumption); + _mav_put_int32_t(buf, 44, log_good); + _mav_put_int16_t(buf, 48, log_number); + _mav_put_uint8_t(buf, 50, filling_valve_state); + _mav_put_uint8_t(buf, 51, venting_valve_state); + _mav_put_uint8_t(buf, 52, release_valve_state); + _mav_put_uint8_t(buf, 53, main_valve_state); + _mav_put_uint8_t(buf, 54, nitrogen_valve_state); + _mav_put_uint8_t(buf, 55, gmm_state); + _mav_put_uint8_t(buf, 56, tars_state); + _mav_put_uint8_t(buf, 57, arming_state); + _mav_put_uint8_t(buf, 58, main_board_state); + _mav_put_uint8_t(buf, 59, payload_board_state); + _mav_put_uint8_t(buf, 60, motor_board_state); + _mav_put_uint8_t(buf, 61, main_can_status); + _mav_put_uint8_t(buf, 62, payload_can_status); + _mav_put_uint8_t(buf, 63, 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 @@ -477,6 +503,8 @@ static inline void mavlink_msg_gse_tm_send_buf(mavlink_message_t *msgbuf, mavlin packet->loadcell_vessel = loadcell_vessel; packet->filling_pressure = filling_pressure; packet->vessel_pressure = vessel_pressure; + packet->cpu_load = cpu_load; + packet->free_heap = free_heap; packet->battery_voltage = battery_voltage; packet->current_consumption = current_consumption; packet->umbilical_current_consumption = umbilical_current_consumption; @@ -564,7 +592,7 @@ static inline float mavlink_msg_gse_tm_get_vessel_pressure(const mavlink_message */ static inline uint8_t mavlink_msg_gse_tm_get_filling_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 42); + return _MAV_RETURN_uint8_t(msg, 50); } /** @@ -574,7 +602,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_filling_valve_state(const mavlink_m */ static inline uint8_t mavlink_msg_gse_tm_get_venting_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 43); + return _MAV_RETURN_uint8_t(msg, 51); } /** @@ -584,7 +612,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_venting_valve_state(const mavlink_m */ static inline uint8_t mavlink_msg_gse_tm_get_release_valve_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 44); + return _MAV_RETURN_uint8_t(msg, 52); } /** @@ -594,7 +622,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_release_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, 45); + return _MAV_RETURN_uint8_t(msg, 53); } /** @@ -604,7 +632,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, 46); + return _MAV_RETURN_uint8_t(msg, 54); } /** @@ -614,7 +642,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_nitrogen_valve_state(const mavlink_ */ static inline uint8_t mavlink_msg_gse_tm_get_gmm_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 47); + return _MAV_RETURN_uint8_t(msg, 55); } /** @@ -624,7 +652,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_tars_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 48); + return _MAV_RETURN_uint8_t(msg, 56); } /** @@ -634,7 +662,27 @@ static inline uint8_t mavlink_msg_gse_tm_get_tars_state(const mavlink_message_t* */ static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 49); + return _MAV_RETURN_uint8_t(msg, 57); +} + +/** + * @brief Get field cpu_load from gse_tm message + * + * @return CPU load in percentage + */ +static inline float mavlink_msg_gse_tm_get_cpu_load(const mavlink_message_t* msg) +{ + return _MAV_RETURN_float(msg, 24); +} + +/** + * @brief Get field free_heap from gse_tm message + * + * @return Amount of available heap in memory + */ +static inline uint32_t mavlink_msg_gse_tm_get_free_heap(const mavlink_message_t* msg) +{ + return _MAV_RETURN_uint32_t(msg, 28); } /** @@ -644,7 +692,7 @@ static inline uint8_t mavlink_msg_gse_tm_get_arming_state(const mavlink_message_ */ static inline float mavlink_msg_gse_tm_get_battery_voltage(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 24); + return _MAV_RETURN_float(msg, 32); } /** @@ -654,7 +702,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, 28); + return _MAV_RETURN_float(msg, 36); } /** @@ -664,7 +712,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, 32); + return _MAV_RETURN_float(msg, 40); } /** @@ -674,7 +722,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, 50); + return _MAV_RETURN_uint8_t(msg, 58); } /** @@ -684,7 +732,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, 51); + return _MAV_RETURN_uint8_t(msg, 59); } /** @@ -694,7 +742,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, 52); + return _MAV_RETURN_uint8_t(msg, 60); } /** @@ -704,7 +752,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, 53); + return _MAV_RETURN_uint8_t(msg, 61); } /** @@ -714,7 +762,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, 54); + return _MAV_RETURN_uint8_t(msg, 62); } /** @@ -724,7 +772,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, 55); + return _MAV_RETURN_uint8_t(msg, 63); } /** @@ -734,7 +782,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, 40); + return _MAV_RETURN_int16_t(msg, 48); } /** @@ -744,7 +792,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, 36); + return _MAV_RETURN_int32_t(msg, 44); } /** @@ -761,6 +809,8 @@ static inline void mavlink_msg_gse_tm_decode(const mavlink_message_t* msg, mavli gse_tm->loadcell_vessel = mavlink_msg_gse_tm_get_loadcell_vessel(msg); gse_tm->filling_pressure = mavlink_msg_gse_tm_get_filling_pressure(msg); gse_tm->vessel_pressure = mavlink_msg_gse_tm_get_vessel_pressure(msg); + gse_tm->cpu_load = mavlink_msg_gse_tm_get_cpu_load(msg); + gse_tm->free_heap = mavlink_msg_gse_tm_get_free_heap(msg); gse_tm->battery_voltage = mavlink_msg_gse_tm_get_battery_voltage(msg); gse_tm->current_consumption = mavlink_msg_gse_tm_get_current_consumption(msg); gse_tm->umbilical_current_consumption = mavlink_msg_gse_tm_get_umbilical_current_consumption(msg); diff --git a/mavlink_lib/lyra/testsuite.h b/mavlink_lib/lyra/testsuite.h index fcac05d21ec2ee819550e50f435ce36be06d3f43..943c0cfdd12b3493b8b680fb54c3063bbfa69be9 100644 --- a/mavlink_lib/lyra/testsuite.h +++ b/mavlink_lib/lyra/testsuite.h @@ -4137,7 +4137,7 @@ 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,963499336,19315,3,70,137,204,15,82,149,216,27,94,161,228,39,106 + 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,963498920,241.0,269.0,297.0,963499752,19731,27,94,161,228,39,106,173,240,51,118,185,252,63,130 }; mavlink_gse_tm_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); @@ -4146,6 +4146,8 @@ static void mavlink_test_gse_tm(uint8_t system_id, uint8_t component_id, mavlink packet1.loadcell_vessel = packet_in.loadcell_vessel; packet1.filling_pressure = packet_in.filling_pressure; packet1.vessel_pressure = packet_in.vessel_pressure; + packet1.cpu_load = packet_in.cpu_load; + packet1.free_heap = packet_in.free_heap; packet1.battery_voltage = packet_in.battery_voltage; packet1.current_consumption = packet_in.current_consumption; packet1.umbilical_current_consumption = packet_in.umbilical_current_consumption; @@ -4179,12 +4181,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.loadcell_rocket , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , 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.loadcell_rocket , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good ); mavlink_msg_gse_tm_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.loadcell_rocket , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , 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.loadcell_rocket , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good ); mavlink_msg_gse_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -4197,7 +4199,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.loadcell_rocket , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , 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.loadcell_rocket , packet1.loadcell_vessel , packet1.filling_pressure , packet1.vessel_pressure , packet1.filling_valve_state , packet1.venting_valve_state , packet1.release_valve_state , packet1.main_valve_state , packet1.nitrogen_valve_state , packet1.gmm_state , packet1.tars_state , packet1.arming_state , packet1.cpu_load , packet1.free_heap , packet1.battery_voltage , packet1.current_consumption , packet1.umbilical_current_consumption , packet1.main_board_state , packet1.payload_board_state , packet1.motor_board_state , packet1.main_can_status , packet1.payload_can_status , packet1.motor_can_status , packet1.log_number , packet1.log_good ); mavlink_msg_gse_tm_decode(last_msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); diff --git a/mavlink_lib/lyra/version.h b/mavlink_lib/lyra/version.h index ecf1d27549b88642d137ed8c38167e8bb546fcd4..8adbdabbb022bb67ca73ac8fdd88fa4a0204676c 100644 --- a/mavlink_lib/lyra/version.h +++ b/mavlink_lib/lyra/version.h @@ -7,7 +7,7 @@ #ifndef MAVLINK_VERSION_H #define MAVLINK_VERSION_H -#define MAVLINK_BUILD_DATE "Mon Sep 09 2024" +#define MAVLINK_BUILD_DATE "Tue Sep 10 2024" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 180 diff --git a/message_definitions/lyra.xml b/message_definitions/lyra.xml index 77ff4ba0c8f1e65d3a8e6aae315c2c10f7af457a..cd258f674fb0bcb7f7646daf8f085b0d89d1bfd7 100644 --- a/message_definitions/lyra.xml +++ b/message_definitions/lyra.xml @@ -933,6 +933,8 @@ <field name="gmm_state" type="uint8_t">State of the GroundModeManager</field> <field name="tars_state" type="uint8_t">State of Tars</field> <field name="arming_state" type="uint8_t">Arming state (1 if armed, 0 otherwise)</field> + <field name="cpu_load" type="float">CPU load in percentage</field> + <field name="free_heap" type="uint32_t">Amount of available heap in memory</field> <field name="battery_voltage" type="float">Battery voltage</field> <field name="current_consumption" type="float" units="A">RIG current</field> <field name="umbilical_current_consumption" type="float" units="A">Umbilical current</field>