diff --git a/mavlink_lib.py b/mavlink_lib.py index 549c4bff17ce17177f24a97f83ddb6a506a60fd9..5f82a89b08e427862aaacbd6ffa1d8ff86cb7b19 100644 --- a/mavlink_lib.py +++ b/mavlink_lib.py @@ -1253,42 +1253,47 @@ class MAVLink_set_valve_maximum_aperture_tc_message(MAVLink_message): class MAVLink_conrig_state_tc_message(MAVLink_message): ''' - Send the state of the conrig buttons + Send the state of the conRIG. ''' id = MAVLINK_MSG_ID_CONRIG_STATE_TC name = 'CONRIG_STATE_TC' - fieldnames = ['ignition_btn', 'filling_valve_btn', 'venting_valve_btn', 'release_pressure_btn', 'quick_connector_btn', 'start_tars_btn', 'nitrogen_valve_btn', 'arm_switch'] - ordered_fieldnames = ['ignition_btn', 'filling_valve_btn', 'venting_valve_btn', 'release_pressure_btn', 'quick_connector_btn', 'start_tars_btn', 'nitrogen_valve_btn', 'arm_switch'] - fieldtypes = ['uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t'] + fieldnames = ['ignition_btn', 'n2o_filling_btn', 'n2o_release_btn', 'n2o_detach_btn', 'n2o_venting_btn', 'n2_filling_btn', 'n2_release_btn', 'n2_detach_btn', 'n2_quenching_btn', 'n2_3way_btn', 'tars_btn', 'nitrogen_btn', 'arm_switch'] + ordered_fieldnames = ['ignition_btn', 'n2o_filling_btn', 'n2o_release_btn', 'n2o_detach_btn', 'n2o_venting_btn', 'n2_filling_btn', 'n2_release_btn', 'n2_detach_btn', 'n2_quenching_btn', 'n2_3way_btn', 'tars_btn', 'nitrogen_btn', 'arm_switch'] + fieldtypes = ['uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t', 'uint8_t'] fielddisplays_by_name = {} fieldenums_by_name = {} fieldunits_by_name = {} - format = '<BBBBBBBB' - native_format = bytearray('<BBBBBBBB', 'ascii') - orders = [0, 1, 2, 3, 4, 5, 6, 7] - lengths = [1, 1, 1, 1, 1, 1, 1, 1] - array_lengths = [0, 0, 0, 0, 0, 0, 0, 0] - crc_extra = 223 - unpacker = struct.Struct('<BBBBBBBB') + format = '<BBBBBBBBBBBBB' + native_format = bytearray('<BBBBBBBBBBBBB', 'ascii') + orders = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + lengths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + array_lengths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + crc_extra = 225 + unpacker = struct.Struct('<BBBBBBBBBBBBB') instance_field = None instance_offset = -1 - def __init__(self, ignition_btn, filling_valve_btn, venting_valve_btn, release_pressure_btn, quick_connector_btn, start_tars_btn, nitrogen_valve_btn, arm_switch): + def __init__(self, ignition_btn, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, arm_switch): MAVLink_message.__init__(self, MAVLink_conrig_state_tc_message.id, MAVLink_conrig_state_tc_message.name) self._fieldnames = MAVLink_conrig_state_tc_message.fieldnames self._instance_field = MAVLink_conrig_state_tc_message.instance_field self._instance_offset = MAVLink_conrig_state_tc_message.instance_offset self.ignition_btn = ignition_btn - self.filling_valve_btn = filling_valve_btn - self.venting_valve_btn = venting_valve_btn - self.release_pressure_btn = release_pressure_btn - self.quick_connector_btn = quick_connector_btn - self.start_tars_btn = start_tars_btn - self.nitrogen_valve_btn = nitrogen_valve_btn + self.n2o_filling_btn = n2o_filling_btn + self.n2o_release_btn = n2o_release_btn + self.n2o_detach_btn = n2o_detach_btn + self.n2o_venting_btn = n2o_venting_btn + self.n2_filling_btn = n2_filling_btn + self.n2_release_btn = n2_release_btn + self.n2_detach_btn = n2_detach_btn + self.n2_quenching_btn = n2_quenching_btn + self.n2_3way_btn = n2_3way_btn + self.tars_btn = tars_btn + self.nitrogen_btn = nitrogen_btn self.arm_switch = arm_switch def pack(self, mav, force_mavlink1=False): - return MAVLink_message.pack(self, mav, 223, struct.pack('<BBBBBBBB', self.ignition_btn, self.filling_valve_btn, self.venting_valve_btn, self.release_pressure_btn, self.quick_connector_btn, self.start_tars_btn, self.nitrogen_valve_btn, self.arm_switch), force_mavlink1=force_mavlink1) + return MAVLink_message.pack(self, mav, 225, struct.pack('<BBBBBBBBBBBBB', self.ignition_btn, self.n2o_filling_btn, self.n2o_release_btn, self.n2o_detach_btn, self.n2o_venting_btn, self.n2_filling_btn, self.n2_release_btn, self.n2_detach_btn, self.n2_quenching_btn, self.n2_3way_btn, self.tars_btn, self.nitrogen_btn, self.arm_switch), force_mavlink1=force_mavlink1) class MAVLink_set_ignition_time_tc_message(MAVLink_message): ''' @@ -4015,37 +4020,47 @@ class MAVLink(object): ''' return self.send(self.set_valve_maximum_aperture_tc_encode(servo_id, maximum_aperture), force_mavlink1=force_mavlink1) - def conrig_state_tc_encode(self, ignition_btn, filling_valve_btn, venting_valve_btn, release_pressure_btn, quick_connector_btn, start_tars_btn, nitrogen_valve_btn, arm_switch): - ''' - Send the state of the conrig buttons - - ignition_btn : Ignition button pressed (type:uint8_t) - filling_valve_btn : Open filling valve pressed (type:uint8_t) - venting_valve_btn : Open venting valve pressed (type:uint8_t) - release_pressure_btn : Release filling line pressure pressed (type:uint8_t) - quick_connector_btn : Detach quick connector pressed (type:uint8_t) - start_tars_btn : Startup TARS pressed (type:uint8_t) - nitrogen_valve_btn : Open nitrogen valve pressed (type:uint8_t) + def conrig_state_tc_encode(self, ignition_btn, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, arm_switch): + ''' + Send the state of the conRIG. + + ignition_btn : Ignition button state (type:uint8_t) + n2o_filling_btn : N2O filling valve button state (type:uint8_t) + n2o_release_btn : N2O release line pressure valve button state (type:uint8_t) + n2o_detach_btn : N2O quick connector detach button state (type:uint8_t) + n2o_venting_btn : N2O venting valve button state (type:uint8_t) + n2_filling_btn : N2 filling valve button state (type:uint8_t) + n2_release_btn : N2 release line pressure valve button state (type:uint8_t) + n2_detach_btn : N2 quick connector detach button state (type:uint8_t) + n2_quenching_btn : N2 quenching valve button state (type:uint8_t) + n2_3way_btn : N2 3-way valve button state (type:uint8_t) + tars_btn : TARS algorithm button state (type:uint8_t) + nitrogen_btn : Nitrogen valve button state (type:uint8_t) arm_switch : Arming switch state (type:uint8_t) ''' - return MAVLink_conrig_state_tc_message(ignition_btn, filling_valve_btn, venting_valve_btn, release_pressure_btn, quick_connector_btn, start_tars_btn, nitrogen_valve_btn, arm_switch) + return MAVLink_conrig_state_tc_message(ignition_btn, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, arm_switch) - def conrig_state_tc_send(self, ignition_btn, filling_valve_btn, venting_valve_btn, release_pressure_btn, quick_connector_btn, start_tars_btn, nitrogen_valve_btn, arm_switch, force_mavlink1=False): + def conrig_state_tc_send(self, ignition_btn, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, arm_switch, force_mavlink1=False): ''' - Send the state of the conrig buttons + Send the state of the conRIG. - ignition_btn : Ignition button pressed (type:uint8_t) - filling_valve_btn : Open filling valve pressed (type:uint8_t) - venting_valve_btn : Open venting valve pressed (type:uint8_t) - release_pressure_btn : Release filling line pressure pressed (type:uint8_t) - quick_connector_btn : Detach quick connector pressed (type:uint8_t) - start_tars_btn : Startup TARS pressed (type:uint8_t) - nitrogen_valve_btn : Open nitrogen valve pressed (type:uint8_t) + ignition_btn : Ignition button state (type:uint8_t) + n2o_filling_btn : N2O filling valve button state (type:uint8_t) + n2o_release_btn : N2O release line pressure valve button state (type:uint8_t) + n2o_detach_btn : N2O quick connector detach button state (type:uint8_t) + n2o_venting_btn : N2O venting valve button state (type:uint8_t) + n2_filling_btn : N2 filling valve button state (type:uint8_t) + n2_release_btn : N2 release line pressure valve button state (type:uint8_t) + n2_detach_btn : N2 quick connector detach button state (type:uint8_t) + n2_quenching_btn : N2 quenching valve button state (type:uint8_t) + n2_3way_btn : N2 3-way valve button state (type:uint8_t) + tars_btn : TARS algorithm button state (type:uint8_t) + nitrogen_btn : Nitrogen valve button state (type:uint8_t) arm_switch : Arming switch state (type:uint8_t) ''' - return self.send(self.conrig_state_tc_encode(ignition_btn, filling_valve_btn, venting_valve_btn, release_pressure_btn, quick_connector_btn, start_tars_btn, nitrogen_valve_btn, arm_switch), force_mavlink1=force_mavlink1) + return self.send(self.conrig_state_tc_encode(ignition_btn, n2o_filling_btn, n2o_release_btn, n2o_detach_btn, n2o_venting_btn, n2_filling_btn, n2_release_btn, n2_detach_btn, n2_quenching_btn, n2_3way_btn, tars_btn, nitrogen_btn, arm_switch), force_mavlink1=force_mavlink1) def set_ignition_time_tc_encode(self, timing): ''' diff --git a/mavlink_lib/orion/mavlink.h b/mavlink_lib/orion/mavlink.h index c0edd61264a16ff41909883450be6f45d68a6baf..20b70845d6748557e7f5f4f0cbce83fd89eb6dba 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 2206683186881539724 +#define MAVLINK_PRIMARY_XML_HASH 8590756781382699195 #ifndef MAVLINK_STX #define MAVLINK_STX 254 diff --git a/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h b/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h index aa2341d04842fa05f59b3acd9f91023ce51e54df..72a0faf813c98e106e754120abbfae103825e781 100644 --- a/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h +++ b/mavlink_lib/orion/mavlink_msg_conrig_state_tc.h @@ -5,23 +5,28 @@ typedef struct __mavlink_conrig_state_tc_t { - uint8_t ignition_btn; /*< Ignition button pressed*/ - uint8_t filling_valve_btn; /*< Open filling valve pressed*/ - uint8_t venting_valve_btn; /*< Open venting valve pressed*/ - uint8_t release_pressure_btn; /*< Release filling line pressure pressed*/ - uint8_t quick_connector_btn; /*< Detach quick connector pressed*/ - uint8_t start_tars_btn; /*< Startup TARS pressed*/ - uint8_t nitrogen_valve_btn; /*< Open nitrogen valve pressed*/ + uint8_t ignition_btn; /*< Ignition button state*/ + uint8_t n2o_filling_btn; /*< N2O filling valve button state*/ + uint8_t n2o_release_btn; /*< N2O release line pressure valve button state*/ + uint8_t n2o_detach_btn; /*< N2O quick connector detach button state*/ + uint8_t n2o_venting_btn; /*< N2O venting valve button state*/ + uint8_t n2_filling_btn; /*< N2 filling valve button state*/ + uint8_t n2_release_btn; /*< N2 release line pressure valve button state*/ + uint8_t n2_detach_btn; /*< N2 quick connector detach button state*/ + uint8_t n2_quenching_btn; /*< N2 quenching valve button state*/ + uint8_t n2_3way_btn; /*< N2 3-way valve button state*/ + uint8_t tars_btn; /*< TARS algorithm button state*/ + uint8_t nitrogen_btn; /*< Nitrogen valve button state*/ uint8_t arm_switch; /*< Arming switch state*/ } mavlink_conrig_state_tc_t; -#define MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN 8 -#define MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN 8 -#define MAVLINK_MSG_ID_32_LEN 8 -#define MAVLINK_MSG_ID_32_MIN_LEN 8 +#define MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN 13 +#define MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN 13 +#define MAVLINK_MSG_ID_32_LEN 13 +#define MAVLINK_MSG_ID_32_MIN_LEN 13 -#define MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC 223 -#define MAVLINK_MSG_ID_32_CRC 223 +#define MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC 225 +#define MAVLINK_MSG_ID_32_CRC 225 @@ -29,29 +34,39 @@ typedef struct __mavlink_conrig_state_tc_t { #define MAVLINK_MESSAGE_INFO_CONRIG_STATE_TC { \ 32, \ "CONRIG_STATE_TC", \ - 8, \ + 13, \ { { "ignition_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_conrig_state_tc_t, ignition_btn) }, \ - { "filling_valve_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, filling_valve_btn) }, \ - { "venting_valve_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, venting_valve_btn) }, \ - { "release_pressure_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, release_pressure_btn) }, \ - { "quick_connector_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_conrig_state_tc_t, quick_connector_btn) }, \ - { "start_tars_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_conrig_state_tc_t, start_tars_btn) }, \ - { "nitrogen_valve_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_conrig_state_tc_t, nitrogen_valve_btn) }, \ - { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \ + { "n2o_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, n2o_filling_btn) }, \ + { "n2o_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, n2o_release_btn) }, \ + { "n2o_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, n2o_detach_btn) }, \ + { "n2o_venting_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_conrig_state_tc_t, n2o_venting_btn) }, \ + { "n2_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_conrig_state_tc_t, n2_filling_btn) }, \ + { "n2_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_conrig_state_tc_t, n2_release_btn) }, \ + { "n2_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_conrig_state_tc_t, n2_detach_btn) }, \ + { "n2_quenching_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_conrig_state_tc_t, n2_quenching_btn) }, \ + { "n2_3way_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_conrig_state_tc_t, n2_3way_btn) }, \ + { "tars_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_conrig_state_tc_t, tars_btn) }, \ + { "nitrogen_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_conrig_state_tc_t, nitrogen_btn) }, \ + { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_CONRIG_STATE_TC { \ "CONRIG_STATE_TC", \ - 8, \ + 13, \ { { "ignition_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_conrig_state_tc_t, ignition_btn) }, \ - { "filling_valve_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, filling_valve_btn) }, \ - { "venting_valve_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, venting_valve_btn) }, \ - { "release_pressure_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, release_pressure_btn) }, \ - { "quick_connector_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_conrig_state_tc_t, quick_connector_btn) }, \ - { "start_tars_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_conrig_state_tc_t, start_tars_btn) }, \ - { "nitrogen_valve_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_conrig_state_tc_t, nitrogen_valve_btn) }, \ - { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \ + { "n2o_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_conrig_state_tc_t, n2o_filling_btn) }, \ + { "n2o_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_conrig_state_tc_t, n2o_release_btn) }, \ + { "n2o_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_conrig_state_tc_t, n2o_detach_btn) }, \ + { "n2o_venting_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_conrig_state_tc_t, n2o_venting_btn) }, \ + { "n2_filling_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_conrig_state_tc_t, n2_filling_btn) }, \ + { "n2_release_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_conrig_state_tc_t, n2_release_btn) }, \ + { "n2_detach_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_conrig_state_tc_t, n2_detach_btn) }, \ + { "n2_quenching_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_conrig_state_tc_t, n2_quenching_btn) }, \ + { "n2_3way_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_conrig_state_tc_t, n2_3way_btn) }, \ + { "tars_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_conrig_state_tc_t, tars_btn) }, \ + { "nitrogen_btn", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_conrig_state_tc_t, nitrogen_btn) }, \ + { "arm_switch", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_conrig_state_tc_t, arm_switch) }, \ } \ } #endif @@ -62,40 +77,55 @@ typedef struct __mavlink_conrig_state_tc_t { * @param component_id ID of this component (e.g. 200 for IMU) * @param msg The MAVLink message to compress the data into * - * @param ignition_btn Ignition button pressed - * @param filling_valve_btn Open filling valve pressed - * @param venting_valve_btn Open venting valve pressed - * @param release_pressure_btn Release filling line pressure pressed - * @param quick_connector_btn Detach quick connector pressed - * @param start_tars_btn Startup TARS pressed - * @param nitrogen_valve_btn Open nitrogen valve pressed + * @param ignition_btn Ignition button state + * @param n2o_filling_btn N2O filling valve button state + * @param n2o_release_btn N2O release line pressure valve button state + * @param n2o_detach_btn N2O quick connector detach button state + * @param n2o_venting_btn N2O venting valve button state + * @param n2_filling_btn N2 filling valve button state + * @param n2_release_btn N2 release line pressure valve button state + * @param n2_detach_btn N2 quick connector detach button state + * @param n2_quenching_btn N2 quenching valve button state + * @param n2_3way_btn N2 3-way valve button state + * @param tars_btn TARS algorithm button state + * @param nitrogen_btn Nitrogen valve button state * @param arm_switch Arming switch state * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_conrig_state_tc_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - uint8_t ignition_btn, uint8_t filling_valve_btn, uint8_t venting_valve_btn, uint8_t release_pressure_btn, uint8_t quick_connector_btn, uint8_t start_tars_btn, uint8_t nitrogen_valve_btn, uint8_t arm_switch) + uint8_t ignition_btn, uint8_t n2o_filling_btn, uint8_t n2o_release_btn, uint8_t n2o_detach_btn, uint8_t n2o_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars_btn, uint8_t nitrogen_btn, uint8_t arm_switch) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN]; _mav_put_uint8_t(buf, 0, ignition_btn); - _mav_put_uint8_t(buf, 1, filling_valve_btn); - _mav_put_uint8_t(buf, 2, venting_valve_btn); - _mav_put_uint8_t(buf, 3, release_pressure_btn); - _mav_put_uint8_t(buf, 4, quick_connector_btn); - _mav_put_uint8_t(buf, 5, start_tars_btn); - _mav_put_uint8_t(buf, 6, nitrogen_valve_btn); - _mav_put_uint8_t(buf, 7, arm_switch); + _mav_put_uint8_t(buf, 1, n2o_filling_btn); + _mav_put_uint8_t(buf, 2, n2o_release_btn); + _mav_put_uint8_t(buf, 3, n2o_detach_btn); + _mav_put_uint8_t(buf, 4, n2o_venting_btn); + _mav_put_uint8_t(buf, 5, n2_filling_btn); + _mav_put_uint8_t(buf, 6, n2_release_btn); + _mav_put_uint8_t(buf, 7, n2_detach_btn); + _mav_put_uint8_t(buf, 8, n2_quenching_btn); + _mav_put_uint8_t(buf, 9, n2_3way_btn); + _mav_put_uint8_t(buf, 10, tars_btn); + _mav_put_uint8_t(buf, 11, nitrogen_btn); + _mav_put_uint8_t(buf, 12, arm_switch); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN); #else mavlink_conrig_state_tc_t packet; packet.ignition_btn = ignition_btn; - packet.filling_valve_btn = filling_valve_btn; - packet.venting_valve_btn = venting_valve_btn; - packet.release_pressure_btn = release_pressure_btn; - packet.quick_connector_btn = quick_connector_btn; - packet.start_tars_btn = start_tars_btn; - packet.nitrogen_valve_btn = nitrogen_valve_btn; + packet.n2o_filling_btn = n2o_filling_btn; + packet.n2o_release_btn = n2o_release_btn; + packet.n2o_detach_btn = n2o_detach_btn; + packet.n2o_venting_btn = n2o_venting_btn; + packet.n2_filling_btn = n2_filling_btn; + packet.n2_release_btn = n2_release_btn; + packet.n2_detach_btn = n2_detach_btn; + packet.n2_quenching_btn = n2_quenching_btn; + packet.n2_3way_btn = n2_3way_btn; + packet.tars_btn = tars_btn; + packet.nitrogen_btn = nitrogen_btn; packet.arm_switch = arm_switch; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN); @@ -111,41 +141,56 @@ static inline uint16_t mavlink_msg_conrig_state_tc_pack(uint8_t system_id, uint8 * @param component_id ID of this component (e.g. 200 for IMU) * @param chan The MAVLink channel this message will be sent over * @param msg The MAVLink message to compress the data into - * @param ignition_btn Ignition button pressed - * @param filling_valve_btn Open filling valve pressed - * @param venting_valve_btn Open venting valve pressed - * @param release_pressure_btn Release filling line pressure pressed - * @param quick_connector_btn Detach quick connector pressed - * @param start_tars_btn Startup TARS pressed - * @param nitrogen_valve_btn Open nitrogen valve pressed + * @param ignition_btn Ignition button state + * @param n2o_filling_btn N2O filling valve button state + * @param n2o_release_btn N2O release line pressure valve button state + * @param n2o_detach_btn N2O quick connector detach button state + * @param n2o_venting_btn N2O venting valve button state + * @param n2_filling_btn N2 filling valve button state + * @param n2_release_btn N2 release line pressure valve button state + * @param n2_detach_btn N2 quick connector detach button state + * @param n2_quenching_btn N2 quenching valve button state + * @param n2_3way_btn N2 3-way valve button state + * @param tars_btn TARS algorithm button state + * @param nitrogen_btn Nitrogen valve button state * @param arm_switch Arming switch state * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_conrig_state_tc_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - uint8_t ignition_btn,uint8_t filling_valve_btn,uint8_t venting_valve_btn,uint8_t release_pressure_btn,uint8_t quick_connector_btn,uint8_t start_tars_btn,uint8_t nitrogen_valve_btn,uint8_t arm_switch) + uint8_t ignition_btn,uint8_t n2o_filling_btn,uint8_t n2o_release_btn,uint8_t n2o_detach_btn,uint8_t n2o_venting_btn,uint8_t n2_filling_btn,uint8_t n2_release_btn,uint8_t n2_detach_btn,uint8_t n2_quenching_btn,uint8_t n2_3way_btn,uint8_t tars_btn,uint8_t nitrogen_btn,uint8_t arm_switch) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN]; _mav_put_uint8_t(buf, 0, ignition_btn); - _mav_put_uint8_t(buf, 1, filling_valve_btn); - _mav_put_uint8_t(buf, 2, venting_valve_btn); - _mav_put_uint8_t(buf, 3, release_pressure_btn); - _mav_put_uint8_t(buf, 4, quick_connector_btn); - _mav_put_uint8_t(buf, 5, start_tars_btn); - _mav_put_uint8_t(buf, 6, nitrogen_valve_btn); - _mav_put_uint8_t(buf, 7, arm_switch); + _mav_put_uint8_t(buf, 1, n2o_filling_btn); + _mav_put_uint8_t(buf, 2, n2o_release_btn); + _mav_put_uint8_t(buf, 3, n2o_detach_btn); + _mav_put_uint8_t(buf, 4, n2o_venting_btn); + _mav_put_uint8_t(buf, 5, n2_filling_btn); + _mav_put_uint8_t(buf, 6, n2_release_btn); + _mav_put_uint8_t(buf, 7, n2_detach_btn); + _mav_put_uint8_t(buf, 8, n2_quenching_btn); + _mav_put_uint8_t(buf, 9, n2_3way_btn); + _mav_put_uint8_t(buf, 10, tars_btn); + _mav_put_uint8_t(buf, 11, nitrogen_btn); + _mav_put_uint8_t(buf, 12, arm_switch); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN); #else mavlink_conrig_state_tc_t packet; packet.ignition_btn = ignition_btn; - packet.filling_valve_btn = filling_valve_btn; - packet.venting_valve_btn = venting_valve_btn; - packet.release_pressure_btn = release_pressure_btn; - packet.quick_connector_btn = quick_connector_btn; - packet.start_tars_btn = start_tars_btn; - packet.nitrogen_valve_btn = nitrogen_valve_btn; + packet.n2o_filling_btn = n2o_filling_btn; + packet.n2o_release_btn = n2o_release_btn; + packet.n2o_detach_btn = n2o_detach_btn; + packet.n2o_venting_btn = n2o_venting_btn; + packet.n2_filling_btn = n2_filling_btn; + packet.n2_release_btn = n2_release_btn; + packet.n2_detach_btn = n2_detach_btn; + packet.n2_quenching_btn = n2_quenching_btn; + packet.n2_3way_btn = n2_3way_btn; + packet.tars_btn = tars_btn; + packet.nitrogen_btn = nitrogen_btn; packet.arm_switch = arm_switch; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN); @@ -165,7 +210,7 @@ static inline uint16_t mavlink_msg_conrig_state_tc_pack_chan(uint8_t system_id, */ static inline uint16_t mavlink_msg_conrig_state_tc_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_conrig_state_tc_t* conrig_state_tc) { - return mavlink_msg_conrig_state_tc_pack(system_id, component_id, msg, conrig_state_tc->ignition_btn, conrig_state_tc->filling_valve_btn, conrig_state_tc->venting_valve_btn, conrig_state_tc->release_pressure_btn, conrig_state_tc->quick_connector_btn, conrig_state_tc->start_tars_btn, conrig_state_tc->nitrogen_valve_btn, conrig_state_tc->arm_switch); + return mavlink_msg_conrig_state_tc_pack(system_id, component_id, msg, conrig_state_tc->ignition_btn, conrig_state_tc->n2o_filling_btn, conrig_state_tc->n2o_release_btn, conrig_state_tc->n2o_detach_btn, conrig_state_tc->n2o_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->arm_switch); } /** @@ -179,47 +224,62 @@ static inline uint16_t mavlink_msg_conrig_state_tc_encode(uint8_t system_id, uin */ static inline uint16_t mavlink_msg_conrig_state_tc_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_conrig_state_tc_t* conrig_state_tc) { - return mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, chan, msg, conrig_state_tc->ignition_btn, conrig_state_tc->filling_valve_btn, conrig_state_tc->venting_valve_btn, conrig_state_tc->release_pressure_btn, conrig_state_tc->quick_connector_btn, conrig_state_tc->start_tars_btn, conrig_state_tc->nitrogen_valve_btn, conrig_state_tc->arm_switch); + return mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, chan, msg, conrig_state_tc->ignition_btn, conrig_state_tc->n2o_filling_btn, conrig_state_tc->n2o_release_btn, conrig_state_tc->n2o_detach_btn, conrig_state_tc->n2o_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->arm_switch); } /** * @brief Send a conrig_state_tc message * @param chan MAVLink channel to send the message * - * @param ignition_btn Ignition button pressed - * @param filling_valve_btn Open filling valve pressed - * @param venting_valve_btn Open venting valve pressed - * @param release_pressure_btn Release filling line pressure pressed - * @param quick_connector_btn Detach quick connector pressed - * @param start_tars_btn Startup TARS pressed - * @param nitrogen_valve_btn Open nitrogen valve pressed + * @param ignition_btn Ignition button state + * @param n2o_filling_btn N2O filling valve button state + * @param n2o_release_btn N2O release line pressure valve button state + * @param n2o_detach_btn N2O quick connector detach button state + * @param n2o_venting_btn N2O venting valve button state + * @param n2_filling_btn N2 filling valve button state + * @param n2_release_btn N2 release line pressure valve button state + * @param n2_detach_btn N2 quick connector detach button state + * @param n2_quenching_btn N2 quenching valve button state + * @param n2_3way_btn N2 3-way valve button state + * @param tars_btn TARS algorithm button state + * @param nitrogen_btn Nitrogen valve button state * @param arm_switch Arming switch state */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_conrig_state_tc_send(mavlink_channel_t chan, uint8_t ignition_btn, uint8_t filling_valve_btn, uint8_t venting_valve_btn, uint8_t release_pressure_btn, uint8_t quick_connector_btn, uint8_t start_tars_btn, uint8_t nitrogen_valve_btn, uint8_t arm_switch) +static inline void mavlink_msg_conrig_state_tc_send(mavlink_channel_t chan, uint8_t ignition_btn, uint8_t n2o_filling_btn, uint8_t n2o_release_btn, uint8_t n2o_detach_btn, uint8_t n2o_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars_btn, uint8_t nitrogen_btn, uint8_t arm_switch) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN]; _mav_put_uint8_t(buf, 0, ignition_btn); - _mav_put_uint8_t(buf, 1, filling_valve_btn); - _mav_put_uint8_t(buf, 2, venting_valve_btn); - _mav_put_uint8_t(buf, 3, release_pressure_btn); - _mav_put_uint8_t(buf, 4, quick_connector_btn); - _mav_put_uint8_t(buf, 5, start_tars_btn); - _mav_put_uint8_t(buf, 6, nitrogen_valve_btn); - _mav_put_uint8_t(buf, 7, arm_switch); + _mav_put_uint8_t(buf, 1, n2o_filling_btn); + _mav_put_uint8_t(buf, 2, n2o_release_btn); + _mav_put_uint8_t(buf, 3, n2o_detach_btn); + _mav_put_uint8_t(buf, 4, n2o_venting_btn); + _mav_put_uint8_t(buf, 5, n2_filling_btn); + _mav_put_uint8_t(buf, 6, n2_release_btn); + _mav_put_uint8_t(buf, 7, n2_detach_btn); + _mav_put_uint8_t(buf, 8, n2_quenching_btn); + _mav_put_uint8_t(buf, 9, n2_3way_btn); + _mav_put_uint8_t(buf, 10, tars_btn); + _mav_put_uint8_t(buf, 11, nitrogen_btn); + _mav_put_uint8_t(buf, 12, arm_switch); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC); #else mavlink_conrig_state_tc_t packet; packet.ignition_btn = ignition_btn; - packet.filling_valve_btn = filling_valve_btn; - packet.venting_valve_btn = venting_valve_btn; - packet.release_pressure_btn = release_pressure_btn; - packet.quick_connector_btn = quick_connector_btn; - packet.start_tars_btn = start_tars_btn; - packet.nitrogen_valve_btn = nitrogen_valve_btn; + packet.n2o_filling_btn = n2o_filling_btn; + packet.n2o_release_btn = n2o_release_btn; + packet.n2o_detach_btn = n2o_detach_btn; + packet.n2o_venting_btn = n2o_venting_btn; + packet.n2_filling_btn = n2_filling_btn; + packet.n2_release_btn = n2_release_btn; + packet.n2_detach_btn = n2_detach_btn; + packet.n2_quenching_btn = n2_quenching_btn; + packet.n2_3way_btn = n2_3way_btn; + packet.tars_btn = tars_btn; + packet.nitrogen_btn = nitrogen_btn; packet.arm_switch = arm_switch; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, (const char *)&packet, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC); @@ -234,7 +294,7 @@ static inline void mavlink_msg_conrig_state_tc_send(mavlink_channel_t chan, uint static inline void mavlink_msg_conrig_state_tc_send_struct(mavlink_channel_t chan, const mavlink_conrig_state_tc_t* conrig_state_tc) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS - mavlink_msg_conrig_state_tc_send(chan, conrig_state_tc->ignition_btn, conrig_state_tc->filling_valve_btn, conrig_state_tc->venting_valve_btn, conrig_state_tc->release_pressure_btn, conrig_state_tc->quick_connector_btn, conrig_state_tc->start_tars_btn, conrig_state_tc->nitrogen_valve_btn, conrig_state_tc->arm_switch); + mavlink_msg_conrig_state_tc_send(chan, conrig_state_tc->ignition_btn, conrig_state_tc->n2o_filling_btn, conrig_state_tc->n2o_release_btn, conrig_state_tc->n2o_detach_btn, conrig_state_tc->n2o_venting_btn, conrig_state_tc->n2_filling_btn, conrig_state_tc->n2_release_btn, conrig_state_tc->n2_detach_btn, conrig_state_tc->n2_quenching_btn, conrig_state_tc->n2_3way_btn, conrig_state_tc->tars_btn, conrig_state_tc->nitrogen_btn, conrig_state_tc->arm_switch); #else _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, (const char *)conrig_state_tc, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC); #endif @@ -248,29 +308,39 @@ static inline void mavlink_msg_conrig_state_tc_send_struct(mavlink_channel_t cha is usually the receive buffer for the channel, and allows a reply to an incoming message with minimum stack space usage. */ -static inline void mavlink_msg_conrig_state_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t ignition_btn, uint8_t filling_valve_btn, uint8_t venting_valve_btn, uint8_t release_pressure_btn, uint8_t quick_connector_btn, uint8_t start_tars_btn, uint8_t nitrogen_valve_btn, uint8_t arm_switch) +static inline void mavlink_msg_conrig_state_tc_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint8_t ignition_btn, uint8_t n2o_filling_btn, uint8_t n2o_release_btn, uint8_t n2o_detach_btn, uint8_t n2o_venting_btn, uint8_t n2_filling_btn, uint8_t n2_release_btn, uint8_t n2_detach_btn, uint8_t n2_quenching_btn, uint8_t n2_3way_btn, uint8_t tars_btn, uint8_t nitrogen_btn, uint8_t arm_switch) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; _mav_put_uint8_t(buf, 0, ignition_btn); - _mav_put_uint8_t(buf, 1, filling_valve_btn); - _mav_put_uint8_t(buf, 2, venting_valve_btn); - _mav_put_uint8_t(buf, 3, release_pressure_btn); - _mav_put_uint8_t(buf, 4, quick_connector_btn); - _mav_put_uint8_t(buf, 5, start_tars_btn); - _mav_put_uint8_t(buf, 6, nitrogen_valve_btn); - _mav_put_uint8_t(buf, 7, arm_switch); + _mav_put_uint8_t(buf, 1, n2o_filling_btn); + _mav_put_uint8_t(buf, 2, n2o_release_btn); + _mav_put_uint8_t(buf, 3, n2o_detach_btn); + _mav_put_uint8_t(buf, 4, n2o_venting_btn); + _mav_put_uint8_t(buf, 5, n2_filling_btn); + _mav_put_uint8_t(buf, 6, n2_release_btn); + _mav_put_uint8_t(buf, 7, n2_detach_btn); + _mav_put_uint8_t(buf, 8, n2_quenching_btn); + _mav_put_uint8_t(buf, 9, n2_3way_btn); + _mav_put_uint8_t(buf, 10, tars_btn); + _mav_put_uint8_t(buf, 11, nitrogen_btn); + _mav_put_uint8_t(buf, 12, arm_switch); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, buf, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC); #else mavlink_conrig_state_tc_t *packet = (mavlink_conrig_state_tc_t *)msgbuf; packet->ignition_btn = ignition_btn; - packet->filling_valve_btn = filling_valve_btn; - packet->venting_valve_btn = venting_valve_btn; - packet->release_pressure_btn = release_pressure_btn; - packet->quick_connector_btn = quick_connector_btn; - packet->start_tars_btn = start_tars_btn; - packet->nitrogen_valve_btn = nitrogen_valve_btn; + packet->n2o_filling_btn = n2o_filling_btn; + packet->n2o_release_btn = n2o_release_btn; + packet->n2o_detach_btn = n2o_detach_btn; + packet->n2o_venting_btn = n2o_venting_btn; + packet->n2_filling_btn = n2_filling_btn; + packet->n2_release_btn = n2_release_btn; + packet->n2_detach_btn = n2_detach_btn; + packet->n2_quenching_btn = n2_quenching_btn; + packet->n2_3way_btn = n2_3way_btn; + packet->tars_btn = tars_btn; + packet->nitrogen_btn = nitrogen_btn; packet->arm_switch = arm_switch; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONRIG_STATE_TC, (const char *)packet, MAVLINK_MSG_ID_CONRIG_STATE_TC_MIN_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN, MAVLINK_MSG_ID_CONRIG_STATE_TC_CRC); @@ -286,7 +356,7 @@ static inline void mavlink_msg_conrig_state_tc_send_buf(mavlink_message_t *msgbu /** * @brief Get field ignition_btn from conrig_state_tc message * - * @return Ignition button pressed + * @return Ignition button state */ static inline uint8_t mavlink_msg_conrig_state_tc_get_ignition_btn(const mavlink_message_t* msg) { @@ -294,65 +364,115 @@ static inline uint8_t mavlink_msg_conrig_state_tc_get_ignition_btn(const mavlink } /** - * @brief Get field filling_valve_btn from conrig_state_tc message + * @brief Get field n2o_filling_btn from conrig_state_tc message * - * @return Open filling valve pressed + * @return N2O filling valve button state */ -static inline uint8_t mavlink_msg_conrig_state_tc_get_filling_valve_btn(const mavlink_message_t* msg) +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_filling_btn(const mavlink_message_t* msg) { return _MAV_RETURN_uint8_t(msg, 1); } /** - * @brief Get field venting_valve_btn from conrig_state_tc message + * @brief Get field n2o_release_btn from conrig_state_tc message * - * @return Open venting valve pressed + * @return N2O release line pressure valve button state */ -static inline uint8_t mavlink_msg_conrig_state_tc_get_venting_valve_btn(const mavlink_message_t* msg) +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_release_btn(const mavlink_message_t* msg) { return _MAV_RETURN_uint8_t(msg, 2); } /** - * @brief Get field release_pressure_btn from conrig_state_tc message + * @brief Get field n2o_detach_btn from conrig_state_tc message * - * @return Release filling line pressure pressed + * @return N2O quick connector detach button state */ -static inline uint8_t mavlink_msg_conrig_state_tc_get_release_pressure_btn(const mavlink_message_t* msg) +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_detach_btn(const mavlink_message_t* msg) { return _MAV_RETURN_uint8_t(msg, 3); } /** - * @brief Get field quick_connector_btn from conrig_state_tc message + * @brief Get field n2o_venting_btn from conrig_state_tc message * - * @return Detach quick connector pressed + * @return N2O venting valve button state */ -static inline uint8_t mavlink_msg_conrig_state_tc_get_quick_connector_btn(const mavlink_message_t* msg) +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2o_venting_btn(const mavlink_message_t* msg) { return _MAV_RETURN_uint8_t(msg, 4); } /** - * @brief Get field start_tars_btn from conrig_state_tc message + * @brief Get field n2_filling_btn from conrig_state_tc message * - * @return Startup TARS pressed + * @return N2 filling valve button state */ -static inline uint8_t mavlink_msg_conrig_state_tc_get_start_tars_btn(const mavlink_message_t* msg) +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2_filling_btn(const mavlink_message_t* msg) { return _MAV_RETURN_uint8_t(msg, 5); } /** - * @brief Get field nitrogen_valve_btn from conrig_state_tc message + * @brief Get field n2_release_btn from conrig_state_tc message * - * @return Open nitrogen valve pressed + * @return N2 release line pressure valve button state */ -static inline uint8_t mavlink_msg_conrig_state_tc_get_nitrogen_valve_btn(const mavlink_message_t* msg) +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2_release_btn(const mavlink_message_t* msg) { return _MAV_RETURN_uint8_t(msg, 6); } +/** + * @brief Get field n2_detach_btn from conrig_state_tc message + * + * @return N2 quick connector detach button state + */ +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2_detach_btn(const mavlink_message_t* msg) +{ + return _MAV_RETURN_uint8_t(msg, 7); +} + +/** + * @brief Get field n2_quenching_btn from conrig_state_tc message + * + * @return N2 quenching valve button state + */ +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2_quenching_btn(const mavlink_message_t* msg) +{ + return _MAV_RETURN_uint8_t(msg, 8); +} + +/** + * @brief Get field n2_3way_btn from conrig_state_tc message + * + * @return N2 3-way valve button state + */ +static inline uint8_t mavlink_msg_conrig_state_tc_get_n2_3way_btn(const mavlink_message_t* msg) +{ + return _MAV_RETURN_uint8_t(msg, 9); +} + +/** + * @brief Get field tars_btn from conrig_state_tc message + * + * @return TARS algorithm button state + */ +static inline uint8_t mavlink_msg_conrig_state_tc_get_tars_btn(const mavlink_message_t* msg) +{ + return _MAV_RETURN_uint8_t(msg, 10); +} + +/** + * @brief Get field nitrogen_btn from conrig_state_tc message + * + * @return Nitrogen valve button state + */ +static inline uint8_t mavlink_msg_conrig_state_tc_get_nitrogen_btn(const mavlink_message_t* msg) +{ + return _MAV_RETURN_uint8_t(msg, 11); +} + /** * @brief Get field arm_switch from conrig_state_tc message * @@ -360,7 +480,7 @@ static inline uint8_t mavlink_msg_conrig_state_tc_get_nitrogen_valve_btn(const m */ static inline uint8_t mavlink_msg_conrig_state_tc_get_arm_switch(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 7); + return _MAV_RETURN_uint8_t(msg, 12); } /** @@ -373,12 +493,17 @@ static inline void mavlink_msg_conrig_state_tc_decode(const mavlink_message_t* m { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS conrig_state_tc->ignition_btn = mavlink_msg_conrig_state_tc_get_ignition_btn(msg); - conrig_state_tc->filling_valve_btn = mavlink_msg_conrig_state_tc_get_filling_valve_btn(msg); - conrig_state_tc->venting_valve_btn = mavlink_msg_conrig_state_tc_get_venting_valve_btn(msg); - conrig_state_tc->release_pressure_btn = mavlink_msg_conrig_state_tc_get_release_pressure_btn(msg); - conrig_state_tc->quick_connector_btn = mavlink_msg_conrig_state_tc_get_quick_connector_btn(msg); - conrig_state_tc->start_tars_btn = mavlink_msg_conrig_state_tc_get_start_tars_btn(msg); - conrig_state_tc->nitrogen_valve_btn = mavlink_msg_conrig_state_tc_get_nitrogen_valve_btn(msg); + conrig_state_tc->n2o_filling_btn = mavlink_msg_conrig_state_tc_get_n2o_filling_btn(msg); + conrig_state_tc->n2o_release_btn = mavlink_msg_conrig_state_tc_get_n2o_release_btn(msg); + conrig_state_tc->n2o_detach_btn = mavlink_msg_conrig_state_tc_get_n2o_detach_btn(msg); + conrig_state_tc->n2o_venting_btn = mavlink_msg_conrig_state_tc_get_n2o_venting_btn(msg); + conrig_state_tc->n2_filling_btn = mavlink_msg_conrig_state_tc_get_n2_filling_btn(msg); + conrig_state_tc->n2_release_btn = mavlink_msg_conrig_state_tc_get_n2_release_btn(msg); + conrig_state_tc->n2_detach_btn = mavlink_msg_conrig_state_tc_get_n2_detach_btn(msg); + conrig_state_tc->n2_quenching_btn = mavlink_msg_conrig_state_tc_get_n2_quenching_btn(msg); + conrig_state_tc->n2_3way_btn = mavlink_msg_conrig_state_tc_get_n2_3way_btn(msg); + conrig_state_tc->tars_btn = mavlink_msg_conrig_state_tc_get_tars_btn(msg); + conrig_state_tc->nitrogen_btn = mavlink_msg_conrig_state_tc_get_nitrogen_btn(msg); conrig_state_tc->arm_switch = mavlink_msg_conrig_state_tc_get_arm_switch(msg); #else uint8_t len = msg->len < MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN? msg->len : MAVLINK_MSG_ID_CONRIG_STATE_TC_LEN; diff --git a/mavlink_lib/orion/orion.h b/mavlink_lib/orion/orion.h index adf6b469b6ac1bd68484661985fc17a4671355a8..af0fda2cf590986301143f65bc136ff84f763483 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 2206683186881539724 +#define MAVLINK_THIS_XML_HASH 8590756781382699195 #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, 8, 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} +#define MAVLINK_MESSAGE_LENGTHS {0, 8, 1, 1, 1, 1, 5, 1, 1, 4, 4, 12, 16, 8, 2, 4, 8, 1, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 13, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 12, 12, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 74, 64, 32, 60, 32, 32, 32, 32, 56, 22, 5, 19, 36, 36, 36, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 46, 28, 20, 44, 53, 77, 29, 178, 158, 180, 170, 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, 223, 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} +#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, 225, 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 2206683186881539724 +#define MAVLINK_THIS_XML_HASH 8590756781382699195 #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 86b71889714d8bce69dcd6b22ad5581642b470fb..0d16e438d4769ea3aae686d3e85860623d729e54 100644 --- a/mavlink_lib/orion/testsuite.h +++ b/mavlink_lib/orion/testsuite.h @@ -1287,17 +1287,22 @@ static void mavlink_test_conrig_state_tc(uint8_t system_id, uint8_t component_id uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_conrig_state_tc_t packet_in = { - 5,72,139,206,17,84,151,218 + 5,72,139,206,17,84,151,218,29,96,163,230,41 }; mavlink_conrig_state_tc_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); packet1.ignition_btn = packet_in.ignition_btn; - packet1.filling_valve_btn = packet_in.filling_valve_btn; - packet1.venting_valve_btn = packet_in.venting_valve_btn; - packet1.release_pressure_btn = packet_in.release_pressure_btn; - packet1.quick_connector_btn = packet_in.quick_connector_btn; - packet1.start_tars_btn = packet_in.start_tars_btn; - packet1.nitrogen_valve_btn = packet_in.nitrogen_valve_btn; + packet1.n2o_filling_btn = packet_in.n2o_filling_btn; + packet1.n2o_release_btn = packet_in.n2o_release_btn; + packet1.n2o_detach_btn = packet_in.n2o_detach_btn; + packet1.n2o_venting_btn = packet_in.n2o_venting_btn; + packet1.n2_filling_btn = packet_in.n2_filling_btn; + packet1.n2_release_btn = packet_in.n2_release_btn; + packet1.n2_detach_btn = packet_in.n2_detach_btn; + packet1.n2_quenching_btn = packet_in.n2_quenching_btn; + packet1.n2_3way_btn = packet_in.n2_3way_btn; + packet1.tars_btn = packet_in.tars_btn; + packet1.nitrogen_btn = packet_in.nitrogen_btn; packet1.arm_switch = packet_in.arm_switch; @@ -1313,12 +1318,12 @@ static void mavlink_test_conrig_state_tc(uint8_t system_id, uint8_t component_id MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_conrig_state_tc_pack(system_id, component_id, &msg , packet1.ignition_btn , packet1.filling_valve_btn , packet1.venting_valve_btn , packet1.release_pressure_btn , packet1.quick_connector_btn , packet1.start_tars_btn , packet1.nitrogen_valve_btn , packet1.arm_switch ); + mavlink_msg_conrig_state_tc_pack(system_id, component_id, &msg , packet1.ignition_btn , packet1.n2o_filling_btn , packet1.n2o_release_btn , packet1.n2o_detach_btn , packet1.n2o_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars_btn , packet1.nitrogen_btn , packet1.arm_switch ); mavlink_msg_conrig_state_tc_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.ignition_btn , packet1.filling_valve_btn , packet1.venting_valve_btn , packet1.release_pressure_btn , packet1.quick_connector_btn , packet1.start_tars_btn , packet1.nitrogen_valve_btn , packet1.arm_switch ); + mavlink_msg_conrig_state_tc_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.ignition_btn , packet1.n2o_filling_btn , packet1.n2o_release_btn , packet1.n2o_detach_btn , packet1.n2o_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars_btn , packet1.nitrogen_btn , packet1.arm_switch ); mavlink_msg_conrig_state_tc_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -1331,7 +1336,7 @@ static void mavlink_test_conrig_state_tc(uint8_t system_id, uint8_t component_id MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_conrig_state_tc_send(MAVLINK_COMM_1 , packet1.ignition_btn , packet1.filling_valve_btn , packet1.venting_valve_btn , packet1.release_pressure_btn , packet1.quick_connector_btn , packet1.start_tars_btn , packet1.nitrogen_valve_btn , packet1.arm_switch ); + mavlink_msg_conrig_state_tc_send(MAVLINK_COMM_1 , packet1.ignition_btn , packet1.n2o_filling_btn , packet1.n2o_release_btn , packet1.n2o_detach_btn , packet1.n2o_venting_btn , packet1.n2_filling_btn , packet1.n2_release_btn , packet1.n2_detach_btn , packet1.n2_quenching_btn , packet1.n2_3way_btn , packet1.tars_btn , packet1.nitrogen_btn , packet1.arm_switch ); mavlink_msg_conrig_state_tc_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 c20a0165b1711b9900ebae04aee1f3717af7ba11..b9d54b78690ea1226cd61c17b8a904e268a30f11 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 "Tue Nov 19 2024" +#define MAVLINK_BUILD_DATE "Fri Nov 22 2024" #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 d02bd8cd035e18da7e85f0e465e0904b0b3a48f4..fa64e0f16dbc29b4f0c1f589b1849d50af06d659 100644 --- a/message_definitions/orion.xml +++ b/message_definitions/orion.xml @@ -371,14 +371,19 @@ <field name="maximum_aperture" type="float">Maximum aperture</field> </message> <message id="32" name="CONRIG_STATE_TC"> - <description>Send the state of the conrig buttons</description> - <field name="ignition_btn" type="uint8_t">Ignition button pressed</field> - <field name="filling_valve_btn" type="uint8_t">Open filling valve pressed</field> - <field name="venting_valve_btn" type="uint8_t">Open venting valve pressed</field> - <field name="release_pressure_btn" type="uint8_t">Release filling line pressure pressed</field> - <field name="quick_connector_btn" type="uint8_t">Detach quick connector pressed</field> - <field name="start_tars_btn" type="uint8_t">Startup TARS pressed</field> - <field name="nitrogen_valve_btn" type="uint8_t">Open nitrogen valve pressed</field> + <description>Send the state of the conRIG.</description> + <field name="n2o_filling_btn" type="uint8_t">N2O filling valve button state</field> + <field name="n2o_release_btn" type="uint8_t">N2O release line pressure valve button state</field> + <field name="n2o_detach_btn" type="uint8_t">N2O quick connector detach button state</field> + <field name="n2o_venting_btn" type="uint8_t">N2O venting valve button state</field> + <field name="n2_filling_btn" type="uint8_t">N2 filling valve button state</field> + <field name="n2_release_btn" type="uint8_t">N2 release line pressure valve button state</field> + <field name="n2_detach_btn" type="uint8_t">N2 quick connector detach button state</field> + <field name="n2_quenching_btn" type="uint8_t">N2 quenching valve button state</field> + <field name="n2_3way_btn" type="uint8_t">N2 3-way valve button state</field> + <field name="tars_btn" type="uint8_t">TARS algorithm button state</field> + <field name="nitrogen_btn" type="uint8_t">Nitrogen valve button state</field> + <field name="ignition_btn" type="uint8_t">Ignition button state</field> <field name="arm_switch" type="uint8_t">Arming switch state</field> </message> <message id="33" name="SET_IGNITION_TIME_TC">