diff --git a/mavlink_lib/pyxis/mavlink.h b/mavlink_lib/pyxis/mavlink.h index b13164696cb4e12fe89204999e687563ded8f05e..57b4b465280b75fc39720610010d6fba3757ba11 100644 --- a/mavlink_lib/pyxis/mavlink.h +++ b/mavlink_lib/pyxis/mavlink.h @@ -6,7 +6,7 @@ #ifndef MAVLINK_H #define MAVLINK_H -#define MAVLINK_PRIMARY_XML_HASH -5722975481846447299 +#define MAVLINK_PRIMARY_XML_HASH -671787516688891623 #ifndef MAVLINK_STX #define MAVLINK_STX 254 diff --git a/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h b/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h index 5ed2e6721e59733bc4c48630e1780227271165ae..aedfc75505bd968c182864d29a291fee8a231274 100644 --- a/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h +++ b/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h @@ -11,9 +11,7 @@ typedef struct __mavlink_payload_flight_tm_t { float pressure_static; /*< [Pa] Pressure from static port*/ float pressure_dpl; /*< [Pa] Pressure from deployment vane sensor*/ float airspeed_pitot; /*< [m/s] Pitot airspeed*/ - float msl_altitude; /*< [m] Altitude above mean sea level*/ - float ada_vert_speed; /*< [m/s] Vertical speed estimated by ADA*/ - float ada_vert_accel; /*< [m/s^2] Vertical acceleration estimated by ADA*/ + float altitude_agl; /*< [m] Altitude above ground level*/ float acc_x; /*< [m/s^2] Acceleration on X axis (body)*/ float acc_y; /*< [m/s^2] Acceleration on Y axis (body)*/ float acc_z; /*< [m/s^2] Acceleration on Z axis (body)*/ @@ -50,13 +48,13 @@ typedef struct __mavlink_payload_flight_tm_t { int8_t logger_error; /*< Logger error (0 = no error)*/ } mavlink_payload_flight_tm_t; -#define MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN 158 -#define MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_MIN_LEN 158 -#define MAVLINK_MSG_ID_209_LEN 158 -#define MAVLINK_MSG_ID_209_MIN_LEN 158 +#define MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN 150 +#define MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_MIN_LEN 150 +#define MAVLINK_MSG_ID_209_LEN 150 +#define MAVLINK_MSG_ID_209_MIN_LEN 150 -#define MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_CRC 61 -#define MAVLINK_MSG_ID_209_CRC 61 +#define MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_CRC 223 +#define MAVLINK_MSG_ID_209_CRC 223 @@ -64,99 +62,95 @@ typedef struct __mavlink_payload_flight_tm_t { #define MAVLINK_MESSAGE_INFO_PAYLOAD_FLIGHT_TM { \ 209, \ "PAYLOAD_FLIGHT_TM", \ - 43, \ + 41, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_flight_tm_t, timestamp) }, \ - { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 152, offsetof(mavlink_payload_flight_tm_t, ada_state) }, \ - { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 153, offsetof(mavlink_payload_flight_tm_t, fmm_state) }, \ - { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 154, offsetof(mavlink_payload_flight_tm_t, nas_state) }, \ + { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 144, offsetof(mavlink_payload_flight_tm_t, ada_state) }, \ + { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 145, offsetof(mavlink_payload_flight_tm_t, fmm_state) }, \ + { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 146, offsetof(mavlink_payload_flight_tm_t, nas_state) }, \ { "pressure_ada", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_payload_flight_tm_t, pressure_ada) }, \ { "pressure_digi", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_payload_flight_tm_t, pressure_digi) }, \ { "pressure_static", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_payload_flight_tm_t, pressure_static) }, \ { "pressure_dpl", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_payload_flight_tm_t, pressure_dpl) }, \ { "airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_payload_flight_tm_t, airspeed_pitot) }, \ - { "msl_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_payload_flight_tm_t, msl_altitude) }, \ - { "ada_vert_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_payload_flight_tm_t, ada_vert_speed) }, \ - { "ada_vert_accel", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_payload_flight_tm_t, ada_vert_accel) }, \ - { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_flight_tm_t, acc_x) }, \ - { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_flight_tm_t, acc_y) }, \ - { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_flight_tm_t, acc_z) }, \ - { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_flight_tm_t, gyro_x) }, \ - { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_flight_tm_t, gyro_y) }, \ - { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_flight_tm_t, gyro_z) }, \ - { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_flight_tm_t, mag_x) }, \ - { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_flight_tm_t, mag_y) }, \ - { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_payload_flight_tm_t, mag_z) }, \ - { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 155, offsetof(mavlink_payload_flight_tm_t, gps_fix) }, \ - { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_payload_flight_tm_t, gps_lat) }, \ - { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_flight_tm_t, gps_lon) }, \ - { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_flight_tm_t, gps_alt) }, \ - { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_payload_flight_tm_t, nas_n) }, \ - { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_payload_flight_tm_t, nas_e) }, \ - { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_payload_flight_tm_t, nas_d) }, \ - { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_payload_flight_tm_t, nas_vn) }, \ - { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_payload_flight_tm_t, nas_ve) }, \ - { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_payload_flight_tm_t, nas_vd) }, \ - { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_payload_flight_tm_t, nas_qx) }, \ - { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_payload_flight_tm_t, nas_qy) }, \ - { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_payload_flight_tm_t, nas_qz) }, \ - { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_payload_flight_tm_t, nas_qw) }, \ - { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_payload_flight_tm_t, nas_bias_x) }, \ - { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_payload_flight_tm_t, nas_bias_y) }, \ - { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_payload_flight_tm_t, nas_bias_z) }, \ - { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 156, offsetof(mavlink_payload_flight_tm_t, pin_nosecone) }, \ - { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_payload_flight_tm_t, vbat) }, \ - { "vsupply_5v", NULL, MAVLINK_TYPE_FLOAT, 0, 144, offsetof(mavlink_payload_flight_tm_t, vsupply_5v) }, \ - { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 148, offsetof(mavlink_payload_flight_tm_t, temperature) }, \ - { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 157, offsetof(mavlink_payload_flight_tm_t, logger_error) }, \ + { "altitude_agl", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_payload_flight_tm_t, altitude_agl) }, \ + { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_payload_flight_tm_t, acc_x) }, \ + { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_payload_flight_tm_t, acc_y) }, \ + { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_flight_tm_t, acc_z) }, \ + { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_flight_tm_t, gyro_x) }, \ + { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_flight_tm_t, gyro_y) }, \ + { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_flight_tm_t, gyro_z) }, \ + { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_flight_tm_t, mag_x) }, \ + { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_flight_tm_t, mag_y) }, \ + { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_flight_tm_t, mag_z) }, \ + { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 147, offsetof(mavlink_payload_flight_tm_t, gps_fix) }, \ + { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_flight_tm_t, gps_lat) }, \ + { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_payload_flight_tm_t, gps_lon) }, \ + { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_payload_flight_tm_t, gps_alt) }, \ + { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_flight_tm_t, nas_n) }, \ + { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_flight_tm_t, nas_e) }, \ + { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_payload_flight_tm_t, nas_d) }, \ + { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_payload_flight_tm_t, nas_vn) }, \ + { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_payload_flight_tm_t, nas_ve) }, \ + { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_payload_flight_tm_t, nas_vd) }, \ + { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_payload_flight_tm_t, nas_qx) }, \ + { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_payload_flight_tm_t, nas_qy) }, \ + { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_payload_flight_tm_t, nas_qz) }, \ + { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_payload_flight_tm_t, nas_qw) }, \ + { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_payload_flight_tm_t, nas_bias_x) }, \ + { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_payload_flight_tm_t, nas_bias_y) }, \ + { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_payload_flight_tm_t, nas_bias_z) }, \ + { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 148, offsetof(mavlink_payload_flight_tm_t, pin_nosecone) }, \ + { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_payload_flight_tm_t, vbat) }, \ + { "vsupply_5v", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_payload_flight_tm_t, vsupply_5v) }, \ + { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_payload_flight_tm_t, temperature) }, \ + { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 149, offsetof(mavlink_payload_flight_tm_t, logger_error) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_PAYLOAD_FLIGHT_TM { \ "PAYLOAD_FLIGHT_TM", \ - 43, \ + 41, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_flight_tm_t, timestamp) }, \ - { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 152, offsetof(mavlink_payload_flight_tm_t, ada_state) }, \ - { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 153, offsetof(mavlink_payload_flight_tm_t, fmm_state) }, \ - { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 154, offsetof(mavlink_payload_flight_tm_t, nas_state) }, \ + { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 144, offsetof(mavlink_payload_flight_tm_t, ada_state) }, \ + { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 145, offsetof(mavlink_payload_flight_tm_t, fmm_state) }, \ + { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 146, offsetof(mavlink_payload_flight_tm_t, nas_state) }, \ { "pressure_ada", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_payload_flight_tm_t, pressure_ada) }, \ { "pressure_digi", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_payload_flight_tm_t, pressure_digi) }, \ { "pressure_static", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_payload_flight_tm_t, pressure_static) }, \ { "pressure_dpl", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_payload_flight_tm_t, pressure_dpl) }, \ { "airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_payload_flight_tm_t, airspeed_pitot) }, \ - { "msl_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_payload_flight_tm_t, msl_altitude) }, \ - { "ada_vert_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_payload_flight_tm_t, ada_vert_speed) }, \ - { "ada_vert_accel", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_payload_flight_tm_t, ada_vert_accel) }, \ - { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_flight_tm_t, acc_x) }, \ - { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_flight_tm_t, acc_y) }, \ - { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_flight_tm_t, acc_z) }, \ - { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_flight_tm_t, gyro_x) }, \ - { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_flight_tm_t, gyro_y) }, \ - { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_flight_tm_t, gyro_z) }, \ - { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_flight_tm_t, mag_x) }, \ - { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_flight_tm_t, mag_y) }, \ - { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_payload_flight_tm_t, mag_z) }, \ - { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 155, offsetof(mavlink_payload_flight_tm_t, gps_fix) }, \ - { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_payload_flight_tm_t, gps_lat) }, \ - { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_flight_tm_t, gps_lon) }, \ - { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_flight_tm_t, gps_alt) }, \ - { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_payload_flight_tm_t, nas_n) }, \ - { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_payload_flight_tm_t, nas_e) }, \ - { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_payload_flight_tm_t, nas_d) }, \ - { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_payload_flight_tm_t, nas_vn) }, \ - { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_payload_flight_tm_t, nas_ve) }, \ - { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_payload_flight_tm_t, nas_vd) }, \ - { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_payload_flight_tm_t, nas_qx) }, \ - { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_payload_flight_tm_t, nas_qy) }, \ - { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_payload_flight_tm_t, nas_qz) }, \ - { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_payload_flight_tm_t, nas_qw) }, \ - { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_payload_flight_tm_t, nas_bias_x) }, \ - { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_payload_flight_tm_t, nas_bias_y) }, \ - { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_payload_flight_tm_t, nas_bias_z) }, \ - { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 156, offsetof(mavlink_payload_flight_tm_t, pin_nosecone) }, \ - { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_payload_flight_tm_t, vbat) }, \ - { "vsupply_5v", NULL, MAVLINK_TYPE_FLOAT, 0, 144, offsetof(mavlink_payload_flight_tm_t, vsupply_5v) }, \ - { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 148, offsetof(mavlink_payload_flight_tm_t, temperature) }, \ - { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 157, offsetof(mavlink_payload_flight_tm_t, logger_error) }, \ + { "altitude_agl", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_payload_flight_tm_t, altitude_agl) }, \ + { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_payload_flight_tm_t, acc_x) }, \ + { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_payload_flight_tm_t, acc_y) }, \ + { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_flight_tm_t, acc_z) }, \ + { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_flight_tm_t, gyro_x) }, \ + { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_flight_tm_t, gyro_y) }, \ + { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_flight_tm_t, gyro_z) }, \ + { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_flight_tm_t, mag_x) }, \ + { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_flight_tm_t, mag_y) }, \ + { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_flight_tm_t, mag_z) }, \ + { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 147, offsetof(mavlink_payload_flight_tm_t, gps_fix) }, \ + { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_flight_tm_t, gps_lat) }, \ + { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_payload_flight_tm_t, gps_lon) }, \ + { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_payload_flight_tm_t, gps_alt) }, \ + { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_flight_tm_t, nas_n) }, \ + { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_flight_tm_t, nas_e) }, \ + { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_payload_flight_tm_t, nas_d) }, \ + { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_payload_flight_tm_t, nas_vn) }, \ + { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_payload_flight_tm_t, nas_ve) }, \ + { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_payload_flight_tm_t, nas_vd) }, \ + { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_payload_flight_tm_t, nas_qx) }, \ + { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_payload_flight_tm_t, nas_qy) }, \ + { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_payload_flight_tm_t, nas_qz) }, \ + { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_payload_flight_tm_t, nas_qw) }, \ + { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_payload_flight_tm_t, nas_bias_x) }, \ + { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_payload_flight_tm_t, nas_bias_y) }, \ + { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_payload_flight_tm_t, nas_bias_z) }, \ + { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 148, offsetof(mavlink_payload_flight_tm_t, pin_nosecone) }, \ + { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_payload_flight_tm_t, vbat) }, \ + { "vsupply_5v", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_payload_flight_tm_t, vsupply_5v) }, \ + { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_payload_flight_tm_t, temperature) }, \ + { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 149, offsetof(mavlink_payload_flight_tm_t, logger_error) }, \ } \ } #endif @@ -176,9 +170,7 @@ typedef struct __mavlink_payload_flight_tm_t { * @param pressure_static [Pa] Pressure from static port * @param pressure_dpl [Pa] Pressure from deployment vane sensor * @param airspeed_pitot [m/s] Pitot airspeed - * @param msl_altitude [m] Altitude above mean sea level - * @param ada_vert_speed [m/s] Vertical speed estimated by ADA - * @param ada_vert_accel [m/s^2] Vertical acceleration estimated by ADA + * @param altitude_agl [m] Altitude above ground level * @param acc_x [m/s^2] Acceleration on X axis (body) * @param acc_y [m/s^2] Acceleration on Y axis (body) * @param acc_z [m/s^2] Acceleration on Z axis (body) @@ -213,7 +205,7 @@ typedef struct __mavlink_payload_flight_tm_t { * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float msl_altitude, float ada_vert_speed, float ada_vert_accel, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_nosecone, float vbat, float vsupply_5v, float temperature, int8_t logger_error) + uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float altitude_agl, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_nosecone, float vbat, float vsupply_5v, float temperature, int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN]; @@ -223,43 +215,41 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uin _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); - _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, nas_n); - _mav_put_float(buf, 92, nas_e); - _mav_put_float(buf, 96, nas_d); - _mav_put_float(buf, 100, nas_vn); - _mav_put_float(buf, 104, nas_ve); - _mav_put_float(buf, 108, nas_vd); - _mav_put_float(buf, 112, nas_qx); - _mav_put_float(buf, 116, nas_qy); - _mav_put_float(buf, 120, nas_qz); - _mav_put_float(buf, 124, nas_qw); - _mav_put_float(buf, 128, nas_bias_x); - _mav_put_float(buf, 132, nas_bias_y); - _mav_put_float(buf, 136, nas_bias_z); - _mav_put_float(buf, 140, vbat); - _mav_put_float(buf, 144, vsupply_5v); - _mav_put_float(buf, 148, temperature); - _mav_put_uint8_t(buf, 152, ada_state); - _mav_put_uint8_t(buf, 153, fmm_state); - _mav_put_uint8_t(buf, 154, nas_state); - _mav_put_uint8_t(buf, 155, gps_fix); - _mav_put_uint8_t(buf, 156, pin_nosecone); - _mav_put_int8_t(buf, 157, logger_error); + _mav_put_float(buf, 28, altitude_agl); + _mav_put_float(buf, 32, acc_x); + _mav_put_float(buf, 36, acc_y); + _mav_put_float(buf, 40, acc_z); + _mav_put_float(buf, 44, gyro_x); + _mav_put_float(buf, 48, gyro_y); + _mav_put_float(buf, 52, gyro_z); + _mav_put_float(buf, 56, mag_x); + _mav_put_float(buf, 60, mag_y); + _mav_put_float(buf, 64, mag_z); + _mav_put_float(buf, 68, gps_lat); + _mav_put_float(buf, 72, gps_lon); + _mav_put_float(buf, 76, gps_alt); + _mav_put_float(buf, 80, nas_n); + _mav_put_float(buf, 84, nas_e); + _mav_put_float(buf, 88, nas_d); + _mav_put_float(buf, 92, nas_vn); + _mav_put_float(buf, 96, nas_ve); + _mav_put_float(buf, 100, nas_vd); + _mav_put_float(buf, 104, nas_qx); + _mav_put_float(buf, 108, nas_qy); + _mav_put_float(buf, 112, nas_qz); + _mav_put_float(buf, 116, nas_qw); + _mav_put_float(buf, 120, nas_bias_x); + _mav_put_float(buf, 124, nas_bias_y); + _mav_put_float(buf, 128, nas_bias_z); + _mav_put_float(buf, 132, vbat); + _mav_put_float(buf, 136, vsupply_5v); + _mav_put_float(buf, 140, temperature); + _mav_put_uint8_t(buf, 144, ada_state); + _mav_put_uint8_t(buf, 145, fmm_state); + _mav_put_uint8_t(buf, 146, nas_state); + _mav_put_uint8_t(buf, 147, gps_fix); + _mav_put_uint8_t(buf, 148, pin_nosecone); + _mav_put_int8_t(buf, 149, logger_error); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN); #else @@ -270,9 +260,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uin packet.pressure_static = pressure_static; packet.pressure_dpl = pressure_dpl; packet.airspeed_pitot = airspeed_pitot; - packet.msl_altitude = msl_altitude; - packet.ada_vert_speed = ada_vert_speed; - packet.ada_vert_accel = ada_vert_accel; + packet.altitude_agl = altitude_agl; packet.acc_x = acc_x; packet.acc_y = acc_y; packet.acc_z = acc_z; @@ -330,9 +318,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uin * @param pressure_static [Pa] Pressure from static port * @param pressure_dpl [Pa] Pressure from deployment vane sensor * @param airspeed_pitot [m/s] Pitot airspeed - * @param msl_altitude [m] Altitude above mean sea level - * @param ada_vert_speed [m/s] Vertical speed estimated by ADA - * @param ada_vert_accel [m/s^2] Vertical acceleration estimated by ADA + * @param altitude_agl [m] Altitude above ground level * @param acc_x [m/s^2] Acceleration on X axis (body) * @param acc_y [m/s^2] Acceleration on Y axis (body) * @param acc_z [m/s^2] Acceleration on Z axis (body) @@ -368,7 +354,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uin */ static inline uint16_t mavlink_msg_payload_flight_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - uint64_t timestamp,uint8_t ada_state,uint8_t fmm_state,uint8_t nas_state,float pressure_ada,float pressure_digi,float pressure_static,float pressure_dpl,float airspeed_pitot,float msl_altitude,float ada_vert_speed,float ada_vert_accel,float acc_x,float acc_y,float acc_z,float gyro_x,float gyro_y,float gyro_z,float mag_x,float mag_y,float mag_z,uint8_t gps_fix,float gps_lat,float gps_lon,float gps_alt,float nas_n,float nas_e,float nas_d,float nas_vn,float nas_ve,float nas_vd,float nas_qx,float nas_qy,float nas_qz,float nas_qw,float nas_bias_x,float nas_bias_y,float nas_bias_z,uint8_t pin_nosecone,float vbat,float vsupply_5v,float temperature,int8_t logger_error) + uint64_t timestamp,uint8_t ada_state,uint8_t fmm_state,uint8_t nas_state,float pressure_ada,float pressure_digi,float pressure_static,float pressure_dpl,float airspeed_pitot,float altitude_agl,float acc_x,float acc_y,float acc_z,float gyro_x,float gyro_y,float gyro_z,float mag_x,float mag_y,float mag_z,uint8_t gps_fix,float gps_lat,float gps_lon,float gps_alt,float nas_n,float nas_e,float nas_d,float nas_vn,float nas_ve,float nas_vd,float nas_qx,float nas_qy,float nas_qz,float nas_qw,float nas_bias_x,float nas_bias_y,float nas_bias_z,uint8_t pin_nosecone,float vbat,float vsupply_5v,float temperature,int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN]; @@ -378,43 +364,41 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack_chan(uint8_t system_id _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); - _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, nas_n); - _mav_put_float(buf, 92, nas_e); - _mav_put_float(buf, 96, nas_d); - _mav_put_float(buf, 100, nas_vn); - _mav_put_float(buf, 104, nas_ve); - _mav_put_float(buf, 108, nas_vd); - _mav_put_float(buf, 112, nas_qx); - _mav_put_float(buf, 116, nas_qy); - _mav_put_float(buf, 120, nas_qz); - _mav_put_float(buf, 124, nas_qw); - _mav_put_float(buf, 128, nas_bias_x); - _mav_put_float(buf, 132, nas_bias_y); - _mav_put_float(buf, 136, nas_bias_z); - _mav_put_float(buf, 140, vbat); - _mav_put_float(buf, 144, vsupply_5v); - _mav_put_float(buf, 148, temperature); - _mav_put_uint8_t(buf, 152, ada_state); - _mav_put_uint8_t(buf, 153, fmm_state); - _mav_put_uint8_t(buf, 154, nas_state); - _mav_put_uint8_t(buf, 155, gps_fix); - _mav_put_uint8_t(buf, 156, pin_nosecone); - _mav_put_int8_t(buf, 157, logger_error); + _mav_put_float(buf, 28, altitude_agl); + _mav_put_float(buf, 32, acc_x); + _mav_put_float(buf, 36, acc_y); + _mav_put_float(buf, 40, acc_z); + _mav_put_float(buf, 44, gyro_x); + _mav_put_float(buf, 48, gyro_y); + _mav_put_float(buf, 52, gyro_z); + _mav_put_float(buf, 56, mag_x); + _mav_put_float(buf, 60, mag_y); + _mav_put_float(buf, 64, mag_z); + _mav_put_float(buf, 68, gps_lat); + _mav_put_float(buf, 72, gps_lon); + _mav_put_float(buf, 76, gps_alt); + _mav_put_float(buf, 80, nas_n); + _mav_put_float(buf, 84, nas_e); + _mav_put_float(buf, 88, nas_d); + _mav_put_float(buf, 92, nas_vn); + _mav_put_float(buf, 96, nas_ve); + _mav_put_float(buf, 100, nas_vd); + _mav_put_float(buf, 104, nas_qx); + _mav_put_float(buf, 108, nas_qy); + _mav_put_float(buf, 112, nas_qz); + _mav_put_float(buf, 116, nas_qw); + _mav_put_float(buf, 120, nas_bias_x); + _mav_put_float(buf, 124, nas_bias_y); + _mav_put_float(buf, 128, nas_bias_z); + _mav_put_float(buf, 132, vbat); + _mav_put_float(buf, 136, vsupply_5v); + _mav_put_float(buf, 140, temperature); + _mav_put_uint8_t(buf, 144, ada_state); + _mav_put_uint8_t(buf, 145, fmm_state); + _mav_put_uint8_t(buf, 146, nas_state); + _mav_put_uint8_t(buf, 147, gps_fix); + _mav_put_uint8_t(buf, 148, pin_nosecone); + _mav_put_int8_t(buf, 149, logger_error); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN); #else @@ -425,9 +409,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack_chan(uint8_t system_id packet.pressure_static = pressure_static; packet.pressure_dpl = pressure_dpl; packet.airspeed_pitot = airspeed_pitot; - packet.msl_altitude = msl_altitude; - packet.ada_vert_speed = ada_vert_speed; - packet.ada_vert_accel = ada_vert_accel; + packet.altitude_agl = altitude_agl; packet.acc_x = acc_x; packet.acc_y = acc_y; packet.acc_z = acc_z; @@ -480,7 +462,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack_chan(uint8_t system_id */ static inline uint16_t mavlink_msg_payload_flight_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_payload_flight_tm_t* payload_flight_tm) { - return mavlink_msg_payload_flight_tm_pack(system_id, component_id, msg, payload_flight_tm->timestamp, payload_flight_tm->ada_state, payload_flight_tm->fmm_state, payload_flight_tm->nas_state, payload_flight_tm->pressure_ada, payload_flight_tm->pressure_digi, payload_flight_tm->pressure_static, payload_flight_tm->pressure_dpl, payload_flight_tm->airspeed_pitot, payload_flight_tm->msl_altitude, payload_flight_tm->ada_vert_speed, payload_flight_tm->ada_vert_accel, payload_flight_tm->acc_x, payload_flight_tm->acc_y, payload_flight_tm->acc_z, payload_flight_tm->gyro_x, payload_flight_tm->gyro_y, payload_flight_tm->gyro_z, payload_flight_tm->mag_x, payload_flight_tm->mag_y, payload_flight_tm->mag_z, payload_flight_tm->gps_fix, payload_flight_tm->gps_lat, payload_flight_tm->gps_lon, payload_flight_tm->gps_alt, payload_flight_tm->nas_n, payload_flight_tm->nas_e, payload_flight_tm->nas_d, payload_flight_tm->nas_vn, payload_flight_tm->nas_ve, payload_flight_tm->nas_vd, payload_flight_tm->nas_qx, payload_flight_tm->nas_qy, payload_flight_tm->nas_qz, payload_flight_tm->nas_qw, payload_flight_tm->nas_bias_x, payload_flight_tm->nas_bias_y, payload_flight_tm->nas_bias_z, payload_flight_tm->pin_nosecone, payload_flight_tm->vbat, payload_flight_tm->vsupply_5v, payload_flight_tm->temperature, payload_flight_tm->logger_error); + return mavlink_msg_payload_flight_tm_pack(system_id, component_id, msg, payload_flight_tm->timestamp, payload_flight_tm->ada_state, payload_flight_tm->fmm_state, payload_flight_tm->nas_state, payload_flight_tm->pressure_ada, payload_flight_tm->pressure_digi, payload_flight_tm->pressure_static, payload_flight_tm->pressure_dpl, payload_flight_tm->airspeed_pitot, payload_flight_tm->altitude_agl, payload_flight_tm->acc_x, payload_flight_tm->acc_y, payload_flight_tm->acc_z, payload_flight_tm->gyro_x, payload_flight_tm->gyro_y, payload_flight_tm->gyro_z, payload_flight_tm->mag_x, payload_flight_tm->mag_y, payload_flight_tm->mag_z, payload_flight_tm->gps_fix, payload_flight_tm->gps_lat, payload_flight_tm->gps_lon, payload_flight_tm->gps_alt, payload_flight_tm->nas_n, payload_flight_tm->nas_e, payload_flight_tm->nas_d, payload_flight_tm->nas_vn, payload_flight_tm->nas_ve, payload_flight_tm->nas_vd, payload_flight_tm->nas_qx, payload_flight_tm->nas_qy, payload_flight_tm->nas_qz, payload_flight_tm->nas_qw, payload_flight_tm->nas_bias_x, payload_flight_tm->nas_bias_y, payload_flight_tm->nas_bias_z, payload_flight_tm->pin_nosecone, payload_flight_tm->vbat, payload_flight_tm->vsupply_5v, payload_flight_tm->temperature, payload_flight_tm->logger_error); } /** @@ -494,7 +476,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_encode(uint8_t system_id, u */ static inline uint16_t mavlink_msg_payload_flight_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_payload_flight_tm_t* payload_flight_tm) { - return mavlink_msg_payload_flight_tm_pack_chan(system_id, component_id, chan, msg, payload_flight_tm->timestamp, payload_flight_tm->ada_state, payload_flight_tm->fmm_state, payload_flight_tm->nas_state, payload_flight_tm->pressure_ada, payload_flight_tm->pressure_digi, payload_flight_tm->pressure_static, payload_flight_tm->pressure_dpl, payload_flight_tm->airspeed_pitot, payload_flight_tm->msl_altitude, payload_flight_tm->ada_vert_speed, payload_flight_tm->ada_vert_accel, payload_flight_tm->acc_x, payload_flight_tm->acc_y, payload_flight_tm->acc_z, payload_flight_tm->gyro_x, payload_flight_tm->gyro_y, payload_flight_tm->gyro_z, payload_flight_tm->mag_x, payload_flight_tm->mag_y, payload_flight_tm->mag_z, payload_flight_tm->gps_fix, payload_flight_tm->gps_lat, payload_flight_tm->gps_lon, payload_flight_tm->gps_alt, payload_flight_tm->nas_n, payload_flight_tm->nas_e, payload_flight_tm->nas_d, payload_flight_tm->nas_vn, payload_flight_tm->nas_ve, payload_flight_tm->nas_vd, payload_flight_tm->nas_qx, payload_flight_tm->nas_qy, payload_flight_tm->nas_qz, payload_flight_tm->nas_qw, payload_flight_tm->nas_bias_x, payload_flight_tm->nas_bias_y, payload_flight_tm->nas_bias_z, payload_flight_tm->pin_nosecone, payload_flight_tm->vbat, payload_flight_tm->vsupply_5v, payload_flight_tm->temperature, payload_flight_tm->logger_error); + return mavlink_msg_payload_flight_tm_pack_chan(system_id, component_id, chan, msg, payload_flight_tm->timestamp, payload_flight_tm->ada_state, payload_flight_tm->fmm_state, payload_flight_tm->nas_state, payload_flight_tm->pressure_ada, payload_flight_tm->pressure_digi, payload_flight_tm->pressure_static, payload_flight_tm->pressure_dpl, payload_flight_tm->airspeed_pitot, payload_flight_tm->altitude_agl, payload_flight_tm->acc_x, payload_flight_tm->acc_y, payload_flight_tm->acc_z, payload_flight_tm->gyro_x, payload_flight_tm->gyro_y, payload_flight_tm->gyro_z, payload_flight_tm->mag_x, payload_flight_tm->mag_y, payload_flight_tm->mag_z, payload_flight_tm->gps_fix, payload_flight_tm->gps_lat, payload_flight_tm->gps_lon, payload_flight_tm->gps_alt, payload_flight_tm->nas_n, payload_flight_tm->nas_e, payload_flight_tm->nas_d, payload_flight_tm->nas_vn, payload_flight_tm->nas_ve, payload_flight_tm->nas_vd, payload_flight_tm->nas_qx, payload_flight_tm->nas_qy, payload_flight_tm->nas_qz, payload_flight_tm->nas_qw, payload_flight_tm->nas_bias_x, payload_flight_tm->nas_bias_y, payload_flight_tm->nas_bias_z, payload_flight_tm->pin_nosecone, payload_flight_tm->vbat, payload_flight_tm->vsupply_5v, payload_flight_tm->temperature, payload_flight_tm->logger_error); } /** @@ -510,9 +492,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_encode_chan(uint8_t system_ * @param pressure_static [Pa] Pressure from static port * @param pressure_dpl [Pa] Pressure from deployment vane sensor * @param airspeed_pitot [m/s] Pitot airspeed - * @param msl_altitude [m] Altitude above mean sea level - * @param ada_vert_speed [m/s] Vertical speed estimated by ADA - * @param ada_vert_accel [m/s^2] Vertical acceleration estimated by ADA + * @param altitude_agl [m] Altitude above ground level * @param acc_x [m/s^2] Acceleration on X axis (body) * @param acc_y [m/s^2] Acceleration on Y axis (body) * @param acc_z [m/s^2] Acceleration on Z axis (body) @@ -547,7 +527,7 @@ static inline uint16_t mavlink_msg_payload_flight_tm_encode_chan(uint8_t system_ */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_payload_flight_tm_send(mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float msl_altitude, float ada_vert_speed, float ada_vert_accel, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_nosecone, float vbat, float vsupply_5v, float temperature, int8_t logger_error) +static inline void mavlink_msg_payload_flight_tm_send(mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float altitude_agl, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_nosecone, float vbat, float vsupply_5v, float temperature, int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN]; @@ -557,43 +537,41 @@ static inline void mavlink_msg_payload_flight_tm_send(mavlink_channel_t chan, ui _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); - _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, nas_n); - _mav_put_float(buf, 92, nas_e); - _mav_put_float(buf, 96, nas_d); - _mav_put_float(buf, 100, nas_vn); - _mav_put_float(buf, 104, nas_ve); - _mav_put_float(buf, 108, nas_vd); - _mav_put_float(buf, 112, nas_qx); - _mav_put_float(buf, 116, nas_qy); - _mav_put_float(buf, 120, nas_qz); - _mav_put_float(buf, 124, nas_qw); - _mav_put_float(buf, 128, nas_bias_x); - _mav_put_float(buf, 132, nas_bias_y); - _mav_put_float(buf, 136, nas_bias_z); - _mav_put_float(buf, 140, vbat); - _mav_put_float(buf, 144, vsupply_5v); - _mav_put_float(buf, 148, temperature); - _mav_put_uint8_t(buf, 152, ada_state); - _mav_put_uint8_t(buf, 153, fmm_state); - _mav_put_uint8_t(buf, 154, nas_state); - _mav_put_uint8_t(buf, 155, gps_fix); - _mav_put_uint8_t(buf, 156, pin_nosecone); - _mav_put_int8_t(buf, 157, logger_error); + _mav_put_float(buf, 28, altitude_agl); + _mav_put_float(buf, 32, acc_x); + _mav_put_float(buf, 36, acc_y); + _mav_put_float(buf, 40, acc_z); + _mav_put_float(buf, 44, gyro_x); + _mav_put_float(buf, 48, gyro_y); + _mav_put_float(buf, 52, gyro_z); + _mav_put_float(buf, 56, mag_x); + _mav_put_float(buf, 60, mag_y); + _mav_put_float(buf, 64, mag_z); + _mav_put_float(buf, 68, gps_lat); + _mav_put_float(buf, 72, gps_lon); + _mav_put_float(buf, 76, gps_alt); + _mav_put_float(buf, 80, nas_n); + _mav_put_float(buf, 84, nas_e); + _mav_put_float(buf, 88, nas_d); + _mav_put_float(buf, 92, nas_vn); + _mav_put_float(buf, 96, nas_ve); + _mav_put_float(buf, 100, nas_vd); + _mav_put_float(buf, 104, nas_qx); + _mav_put_float(buf, 108, nas_qy); + _mav_put_float(buf, 112, nas_qz); + _mav_put_float(buf, 116, nas_qw); + _mav_put_float(buf, 120, nas_bias_x); + _mav_put_float(buf, 124, nas_bias_y); + _mav_put_float(buf, 128, nas_bias_z); + _mav_put_float(buf, 132, vbat); + _mav_put_float(buf, 136, vsupply_5v); + _mav_put_float(buf, 140, temperature); + _mav_put_uint8_t(buf, 144, ada_state); + _mav_put_uint8_t(buf, 145, fmm_state); + _mav_put_uint8_t(buf, 146, nas_state); + _mav_put_uint8_t(buf, 147, gps_fix); + _mav_put_uint8_t(buf, 148, pin_nosecone); + _mav_put_int8_t(buf, 149, logger_error); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM, buf, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_CRC); #else @@ -604,9 +582,7 @@ static inline void mavlink_msg_payload_flight_tm_send(mavlink_channel_t chan, ui packet.pressure_static = pressure_static; packet.pressure_dpl = pressure_dpl; packet.airspeed_pitot = airspeed_pitot; - packet.msl_altitude = msl_altitude; - packet.ada_vert_speed = ada_vert_speed; - packet.ada_vert_accel = ada_vert_accel; + packet.altitude_agl = altitude_agl; packet.acc_x = acc_x; packet.acc_y = acc_y; packet.acc_z = acc_z; @@ -654,7 +630,7 @@ static inline void mavlink_msg_payload_flight_tm_send(mavlink_channel_t chan, ui static inline void mavlink_msg_payload_flight_tm_send_struct(mavlink_channel_t chan, const mavlink_payload_flight_tm_t* payload_flight_tm) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS - mavlink_msg_payload_flight_tm_send(chan, payload_flight_tm->timestamp, payload_flight_tm->ada_state, payload_flight_tm->fmm_state, payload_flight_tm->nas_state, payload_flight_tm->pressure_ada, payload_flight_tm->pressure_digi, payload_flight_tm->pressure_static, payload_flight_tm->pressure_dpl, payload_flight_tm->airspeed_pitot, payload_flight_tm->msl_altitude, payload_flight_tm->ada_vert_speed, payload_flight_tm->ada_vert_accel, payload_flight_tm->acc_x, payload_flight_tm->acc_y, payload_flight_tm->acc_z, payload_flight_tm->gyro_x, payload_flight_tm->gyro_y, payload_flight_tm->gyro_z, payload_flight_tm->mag_x, payload_flight_tm->mag_y, payload_flight_tm->mag_z, payload_flight_tm->gps_fix, payload_flight_tm->gps_lat, payload_flight_tm->gps_lon, payload_flight_tm->gps_alt, payload_flight_tm->nas_n, payload_flight_tm->nas_e, payload_flight_tm->nas_d, payload_flight_tm->nas_vn, payload_flight_tm->nas_ve, payload_flight_tm->nas_vd, payload_flight_tm->nas_qx, payload_flight_tm->nas_qy, payload_flight_tm->nas_qz, payload_flight_tm->nas_qw, payload_flight_tm->nas_bias_x, payload_flight_tm->nas_bias_y, payload_flight_tm->nas_bias_z, payload_flight_tm->pin_nosecone, payload_flight_tm->vbat, payload_flight_tm->vsupply_5v, payload_flight_tm->temperature, payload_flight_tm->logger_error); + mavlink_msg_payload_flight_tm_send(chan, payload_flight_tm->timestamp, payload_flight_tm->ada_state, payload_flight_tm->fmm_state, payload_flight_tm->nas_state, payload_flight_tm->pressure_ada, payload_flight_tm->pressure_digi, payload_flight_tm->pressure_static, payload_flight_tm->pressure_dpl, payload_flight_tm->airspeed_pitot, payload_flight_tm->altitude_agl, payload_flight_tm->acc_x, payload_flight_tm->acc_y, payload_flight_tm->acc_z, payload_flight_tm->gyro_x, payload_flight_tm->gyro_y, payload_flight_tm->gyro_z, payload_flight_tm->mag_x, payload_flight_tm->mag_y, payload_flight_tm->mag_z, payload_flight_tm->gps_fix, payload_flight_tm->gps_lat, payload_flight_tm->gps_lon, payload_flight_tm->gps_alt, payload_flight_tm->nas_n, payload_flight_tm->nas_e, payload_flight_tm->nas_d, payload_flight_tm->nas_vn, payload_flight_tm->nas_ve, payload_flight_tm->nas_vd, payload_flight_tm->nas_qx, payload_flight_tm->nas_qy, payload_flight_tm->nas_qz, payload_flight_tm->nas_qw, payload_flight_tm->nas_bias_x, payload_flight_tm->nas_bias_y, payload_flight_tm->nas_bias_z, payload_flight_tm->pin_nosecone, payload_flight_tm->vbat, payload_flight_tm->vsupply_5v, payload_flight_tm->temperature, payload_flight_tm->logger_error); #else _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM, (const char *)payload_flight_tm, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_CRC); #endif @@ -668,7 +644,7 @@ static inline void mavlink_msg_payload_flight_tm_send_struct(mavlink_channel_t c 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_payload_flight_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float msl_altitude, float ada_vert_speed, float ada_vert_accel, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_nosecone, float vbat, float vsupply_5v, float temperature, int8_t logger_error) +static inline void mavlink_msg_payload_flight_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float altitude_agl, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_nosecone, float vbat, float vsupply_5v, float temperature, int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; @@ -678,43 +654,41 @@ static inline void mavlink_msg_payload_flight_tm_send_buf(mavlink_message_t *msg _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); - _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, nas_n); - _mav_put_float(buf, 92, nas_e); - _mav_put_float(buf, 96, nas_d); - _mav_put_float(buf, 100, nas_vn); - _mav_put_float(buf, 104, nas_ve); - _mav_put_float(buf, 108, nas_vd); - _mav_put_float(buf, 112, nas_qx); - _mav_put_float(buf, 116, nas_qy); - _mav_put_float(buf, 120, nas_qz); - _mav_put_float(buf, 124, nas_qw); - _mav_put_float(buf, 128, nas_bias_x); - _mav_put_float(buf, 132, nas_bias_y); - _mav_put_float(buf, 136, nas_bias_z); - _mav_put_float(buf, 140, vbat); - _mav_put_float(buf, 144, vsupply_5v); - _mav_put_float(buf, 148, temperature); - _mav_put_uint8_t(buf, 152, ada_state); - _mav_put_uint8_t(buf, 153, fmm_state); - _mav_put_uint8_t(buf, 154, nas_state); - _mav_put_uint8_t(buf, 155, gps_fix); - _mav_put_uint8_t(buf, 156, pin_nosecone); - _mav_put_int8_t(buf, 157, logger_error); + _mav_put_float(buf, 28, altitude_agl); + _mav_put_float(buf, 32, acc_x); + _mav_put_float(buf, 36, acc_y); + _mav_put_float(buf, 40, acc_z); + _mav_put_float(buf, 44, gyro_x); + _mav_put_float(buf, 48, gyro_y); + _mav_put_float(buf, 52, gyro_z); + _mav_put_float(buf, 56, mag_x); + _mav_put_float(buf, 60, mag_y); + _mav_put_float(buf, 64, mag_z); + _mav_put_float(buf, 68, gps_lat); + _mav_put_float(buf, 72, gps_lon); + _mav_put_float(buf, 76, gps_alt); + _mav_put_float(buf, 80, nas_n); + _mav_put_float(buf, 84, nas_e); + _mav_put_float(buf, 88, nas_d); + _mav_put_float(buf, 92, nas_vn); + _mav_put_float(buf, 96, nas_ve); + _mav_put_float(buf, 100, nas_vd); + _mav_put_float(buf, 104, nas_qx); + _mav_put_float(buf, 108, nas_qy); + _mav_put_float(buf, 112, nas_qz); + _mav_put_float(buf, 116, nas_qw); + _mav_put_float(buf, 120, nas_bias_x); + _mav_put_float(buf, 124, nas_bias_y); + _mav_put_float(buf, 128, nas_bias_z); + _mav_put_float(buf, 132, vbat); + _mav_put_float(buf, 136, vsupply_5v); + _mav_put_float(buf, 140, temperature); + _mav_put_uint8_t(buf, 144, ada_state); + _mav_put_uint8_t(buf, 145, fmm_state); + _mav_put_uint8_t(buf, 146, nas_state); + _mav_put_uint8_t(buf, 147, gps_fix); + _mav_put_uint8_t(buf, 148, pin_nosecone); + _mav_put_int8_t(buf, 149, logger_error); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM, buf, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_CRC); #else @@ -725,9 +699,7 @@ static inline void mavlink_msg_payload_flight_tm_send_buf(mavlink_message_t *msg packet->pressure_static = pressure_static; packet->pressure_dpl = pressure_dpl; packet->airspeed_pitot = airspeed_pitot; - packet->msl_altitude = msl_altitude; - packet->ada_vert_speed = ada_vert_speed; - packet->ada_vert_accel = ada_vert_accel; + packet->altitude_agl = altitude_agl; packet->acc_x = acc_x; packet->acc_y = acc_y; packet->acc_z = acc_z; @@ -790,7 +762,7 @@ static inline uint64_t mavlink_msg_payload_flight_tm_get_timestamp(const mavlink */ static inline uint8_t mavlink_msg_payload_flight_tm_get_ada_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 152); + return _MAV_RETURN_uint8_t(msg, 144); } /** @@ -800,7 +772,7 @@ static inline uint8_t mavlink_msg_payload_flight_tm_get_ada_state(const mavlink_ */ static inline uint8_t mavlink_msg_payload_flight_tm_get_fmm_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 153); + return _MAV_RETURN_uint8_t(msg, 145); } /** @@ -810,7 +782,7 @@ static inline uint8_t mavlink_msg_payload_flight_tm_get_fmm_state(const mavlink_ */ static inline uint8_t mavlink_msg_payload_flight_tm_get_nas_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 154); + return _MAV_RETURN_uint8_t(msg, 146); } /** @@ -864,35 +836,15 @@ static inline float mavlink_msg_payload_flight_tm_get_airspeed_pitot(const mavli } /** - * @brief Get field msl_altitude from payload_flight_tm message + * @brief Get field altitude_agl from payload_flight_tm message * - * @return [m] Altitude above mean sea level + * @return [m] Altitude above ground level */ -static inline float mavlink_msg_payload_flight_tm_get_msl_altitude(const mavlink_message_t* msg) +static inline float mavlink_msg_payload_flight_tm_get_altitude_agl(const mavlink_message_t* msg) { return _MAV_RETURN_float(msg, 28); } -/** - * @brief Get field ada_vert_speed from payload_flight_tm message - * - * @return [m/s] Vertical speed estimated by ADA - */ -static inline float mavlink_msg_payload_flight_tm_get_ada_vert_speed(const mavlink_message_t* msg) -{ - return _MAV_RETURN_float(msg, 32); -} - -/** - * @brief Get field ada_vert_accel from payload_flight_tm message - * - * @return [m/s^2] Vertical acceleration estimated by ADA - */ -static inline float mavlink_msg_payload_flight_tm_get_ada_vert_accel(const mavlink_message_t* msg) -{ - return _MAV_RETURN_float(msg, 36); -} - /** * @brief Get field acc_x from payload_flight_tm message * @@ -900,7 +852,7 @@ static inline float mavlink_msg_payload_flight_tm_get_ada_vert_accel(const mavli */ static inline float mavlink_msg_payload_flight_tm_get_acc_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 40); + return _MAV_RETURN_float(msg, 32); } /** @@ -910,7 +862,7 @@ static inline float mavlink_msg_payload_flight_tm_get_acc_x(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_acc_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 44); + return _MAV_RETURN_float(msg, 36); } /** @@ -920,7 +872,7 @@ static inline float mavlink_msg_payload_flight_tm_get_acc_y(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_acc_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 48); + return _MAV_RETURN_float(msg, 40); } /** @@ -930,7 +882,7 @@ static inline float mavlink_msg_payload_flight_tm_get_acc_z(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_gyro_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 52); + return _MAV_RETURN_float(msg, 44); } /** @@ -940,7 +892,7 @@ static inline float mavlink_msg_payload_flight_tm_get_gyro_x(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_gyro_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 56); + return _MAV_RETURN_float(msg, 48); } /** @@ -950,7 +902,7 @@ static inline float mavlink_msg_payload_flight_tm_get_gyro_y(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_gyro_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 60); + return _MAV_RETURN_float(msg, 52); } /** @@ -960,7 +912,7 @@ static inline float mavlink_msg_payload_flight_tm_get_gyro_z(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_mag_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 64); + return _MAV_RETURN_float(msg, 56); } /** @@ -970,7 +922,7 @@ static inline float mavlink_msg_payload_flight_tm_get_mag_x(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_mag_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 68); + return _MAV_RETURN_float(msg, 60); } /** @@ -980,7 +932,7 @@ static inline float mavlink_msg_payload_flight_tm_get_mag_y(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_mag_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 72); + return _MAV_RETURN_float(msg, 64); } /** @@ -990,7 +942,7 @@ static inline float mavlink_msg_payload_flight_tm_get_mag_z(const mavlink_messag */ static inline uint8_t mavlink_msg_payload_flight_tm_get_gps_fix(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 155); + return _MAV_RETURN_uint8_t(msg, 147); } /** @@ -1000,7 +952,7 @@ static inline uint8_t mavlink_msg_payload_flight_tm_get_gps_fix(const mavlink_me */ static inline float mavlink_msg_payload_flight_tm_get_gps_lat(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 76); + return _MAV_RETURN_float(msg, 68); } /** @@ -1010,7 +962,7 @@ static inline float mavlink_msg_payload_flight_tm_get_gps_lat(const mavlink_mess */ static inline float mavlink_msg_payload_flight_tm_get_gps_lon(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 80); + return _MAV_RETURN_float(msg, 72); } /** @@ -1020,7 +972,7 @@ static inline float mavlink_msg_payload_flight_tm_get_gps_lon(const mavlink_mess */ static inline float mavlink_msg_payload_flight_tm_get_gps_alt(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 84); + return _MAV_RETURN_float(msg, 76); } /** @@ -1030,7 +982,7 @@ static inline float mavlink_msg_payload_flight_tm_get_gps_alt(const mavlink_mess */ static inline float mavlink_msg_payload_flight_tm_get_nas_n(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 88); + return _MAV_RETURN_float(msg, 80); } /** @@ -1040,7 +992,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_n(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_nas_e(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 92); + return _MAV_RETURN_float(msg, 84); } /** @@ -1050,7 +1002,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_e(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_nas_d(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 96); + return _MAV_RETURN_float(msg, 88); } /** @@ -1060,7 +1012,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_d(const mavlink_messag */ static inline float mavlink_msg_payload_flight_tm_get_nas_vn(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 100); + return _MAV_RETURN_float(msg, 92); } /** @@ -1070,7 +1022,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_vn(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_nas_ve(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 104); + return _MAV_RETURN_float(msg, 96); } /** @@ -1080,7 +1032,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_ve(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_nas_vd(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 108); + return _MAV_RETURN_float(msg, 100); } /** @@ -1090,7 +1042,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_vd(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_nas_qx(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 112); + return _MAV_RETURN_float(msg, 104); } /** @@ -1100,7 +1052,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_qx(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_nas_qy(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 116); + return _MAV_RETURN_float(msg, 108); } /** @@ -1110,7 +1062,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_qy(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_nas_qz(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 120); + return _MAV_RETURN_float(msg, 112); } /** @@ -1120,7 +1072,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_qz(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_nas_qw(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 124); + return _MAV_RETURN_float(msg, 116); } /** @@ -1130,7 +1082,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_qw(const mavlink_messa */ static inline float mavlink_msg_payload_flight_tm_get_nas_bias_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 128); + return _MAV_RETURN_float(msg, 120); } /** @@ -1140,7 +1092,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_bias_x(const mavlink_m */ static inline float mavlink_msg_payload_flight_tm_get_nas_bias_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 132); + return _MAV_RETURN_float(msg, 124); } /** @@ -1150,7 +1102,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_bias_y(const mavlink_m */ static inline float mavlink_msg_payload_flight_tm_get_nas_bias_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 136); + return _MAV_RETURN_float(msg, 128); } /** @@ -1160,7 +1112,7 @@ static inline float mavlink_msg_payload_flight_tm_get_nas_bias_z(const mavlink_m */ static inline uint8_t mavlink_msg_payload_flight_tm_get_pin_nosecone(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 156); + return _MAV_RETURN_uint8_t(msg, 148); } /** @@ -1170,7 +1122,7 @@ static inline uint8_t mavlink_msg_payload_flight_tm_get_pin_nosecone(const mavli */ static inline float mavlink_msg_payload_flight_tm_get_vbat(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 140); + return _MAV_RETURN_float(msg, 132); } /** @@ -1180,7 +1132,7 @@ static inline float mavlink_msg_payload_flight_tm_get_vbat(const mavlink_message */ static inline float mavlink_msg_payload_flight_tm_get_vsupply_5v(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 144); + return _MAV_RETURN_float(msg, 136); } /** @@ -1190,7 +1142,7 @@ static inline float mavlink_msg_payload_flight_tm_get_vsupply_5v(const mavlink_m */ static inline float mavlink_msg_payload_flight_tm_get_temperature(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 148); + return _MAV_RETURN_float(msg, 140); } /** @@ -1200,7 +1152,7 @@ static inline float mavlink_msg_payload_flight_tm_get_temperature(const mavlink_ */ static inline int8_t mavlink_msg_payload_flight_tm_get_logger_error(const mavlink_message_t* msg) { - return _MAV_RETURN_int8_t(msg, 157); + return _MAV_RETURN_int8_t(msg, 149); } /** @@ -1218,9 +1170,7 @@ static inline void mavlink_msg_payload_flight_tm_decode(const mavlink_message_t* payload_flight_tm->pressure_static = mavlink_msg_payload_flight_tm_get_pressure_static(msg); payload_flight_tm->pressure_dpl = mavlink_msg_payload_flight_tm_get_pressure_dpl(msg); payload_flight_tm->airspeed_pitot = mavlink_msg_payload_flight_tm_get_airspeed_pitot(msg); - payload_flight_tm->msl_altitude = mavlink_msg_payload_flight_tm_get_msl_altitude(msg); - payload_flight_tm->ada_vert_speed = mavlink_msg_payload_flight_tm_get_ada_vert_speed(msg); - payload_flight_tm->ada_vert_accel = mavlink_msg_payload_flight_tm_get_ada_vert_accel(msg); + payload_flight_tm->altitude_agl = mavlink_msg_payload_flight_tm_get_altitude_agl(msg); payload_flight_tm->acc_x = mavlink_msg_payload_flight_tm_get_acc_x(msg); payload_flight_tm->acc_y = mavlink_msg_payload_flight_tm_get_acc_y(msg); payload_flight_tm->acc_z = mavlink_msg_payload_flight_tm_get_acc_z(msg); diff --git a/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h b/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h index 86b980afde023af4b2b98d2727a562227a9c9cb1..e9c4b63552145f42329b67754c1ec74c5d9e9c47 100644 --- a/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h +++ b/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h @@ -11,9 +11,8 @@ typedef struct __mavlink_rocket_flight_tm_t { float pressure_static; /*< [Pa] Pressure from static port*/ float pressure_dpl; /*< [Pa] Pressure from deployment vane sensor*/ float airspeed_pitot; /*< [m/s] Pitot airspeed*/ - float msl_altitude; /*< [m] Altitude above mean sea level*/ + float altitude_agl; /*< [m] Altitude above ground level*/ float ada_vert_speed; /*< [m/s] Vertical speed estimated by ADA*/ - float ada_vert_accel; /*< [m/s^2] Vertical acceleration estimated by ADA*/ float acc_x; /*< [m/s^2] Acceleration on X axis (body)*/ float acc_y; /*< [m/s^2] Acceleration on Y axis (body)*/ float acc_z; /*< [m/s^2] Acceleration on Z axis (body)*/ @@ -51,17 +50,18 @@ typedef struct __mavlink_rocket_flight_tm_t { uint8_t gps_fix; /*< GPS fix (1 = fix, 0 = no fix)*/ uint8_t pin_launch; /*< Launch pin status (1 = connected, 0 = disconnected)*/ uint8_t pin_nosecone; /*< Nosecone pin status (1 = connected, 0 = disconnected)*/ - uint8_t servo_sensor; /*< Servo sensor status (1 = actuated, 0 = idle)*/ + uint8_t pin_expulsion; /*< Servo sensor status (1 = actuated, 0 = idle)*/ + uint8_t cutter_presence; /*< Cutter presence status (1 = present, 0 = missing)*/ int8_t logger_error; /*< Logger error (0 = no error, -1 otherwise)*/ } mavlink_rocket_flight_tm_t; -#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN 166 -#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_MIN_LEN 166 -#define MAVLINK_MSG_ID_208_LEN 166 -#define MAVLINK_MSG_ID_208_MIN_LEN 166 +#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN 163 +#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_MIN_LEN 163 +#define MAVLINK_MSG_ID_208_LEN 163 +#define MAVLINK_MSG_ID_208_MIN_LEN 163 -#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC 92 -#define MAVLINK_MSG_ID_208_CRC 92 +#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC 252 +#define MAVLINK_MSG_ID_208_CRC 252 @@ -71,53 +71,53 @@ typedef struct __mavlink_rocket_flight_tm_t { "ROCKET_FLIGHT_TM", \ 48, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_rocket_flight_tm_t, timestamp) }, \ - { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 156, offsetof(mavlink_rocket_flight_tm_t, ada_state) }, \ - { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 157, offsetof(mavlink_rocket_flight_tm_t, fmm_state) }, \ - { "dpl_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 158, offsetof(mavlink_rocket_flight_tm_t, dpl_state) }, \ - { "abk_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 159, offsetof(mavlink_rocket_flight_tm_t, abk_state) }, \ - { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 160, offsetof(mavlink_rocket_flight_tm_t, nas_state) }, \ + { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 152, offsetof(mavlink_rocket_flight_tm_t, ada_state) }, \ + { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 153, offsetof(mavlink_rocket_flight_tm_t, fmm_state) }, \ + { "dpl_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 154, offsetof(mavlink_rocket_flight_tm_t, dpl_state) }, \ + { "abk_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 155, offsetof(mavlink_rocket_flight_tm_t, abk_state) }, \ + { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 156, offsetof(mavlink_rocket_flight_tm_t, nas_state) }, \ { "pressure_ada", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_rocket_flight_tm_t, pressure_ada) }, \ { "pressure_digi", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_rocket_flight_tm_t, pressure_digi) }, \ { "pressure_static", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_rocket_flight_tm_t, pressure_static) }, \ { "pressure_dpl", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_rocket_flight_tm_t, pressure_dpl) }, \ { "airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_rocket_flight_tm_t, airspeed_pitot) }, \ - { "msl_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_rocket_flight_tm_t, msl_altitude) }, \ + { "altitude_agl", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_rocket_flight_tm_t, altitude_agl) }, \ { "ada_vert_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_rocket_flight_tm_t, ada_vert_speed) }, \ - { "ada_vert_accel", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_rocket_flight_tm_t, ada_vert_accel) }, \ - { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_rocket_flight_tm_t, acc_x) }, \ - { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_rocket_flight_tm_t, acc_y) }, \ - { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_flight_tm_t, acc_z) }, \ - { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_flight_tm_t, gyro_x) }, \ - { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_flight_tm_t, gyro_y) }, \ - { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_flight_tm_t, gyro_z) }, \ - { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_flight_tm_t, mag_x) }, \ - { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_flight_tm_t, mag_y) }, \ - { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_flight_tm_t, mag_z) }, \ - { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 161, offsetof(mavlink_rocket_flight_tm_t, gps_fix) }, \ - { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_flight_tm_t, gps_lat) }, \ - { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_flight_tm_t, gps_lon) }, \ - { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_flight_tm_t, gps_alt) }, \ - { "ab_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_flight_tm_t, ab_angle) }, \ - { "ab_estimated_cd", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_rocket_flight_tm_t, ab_estimated_cd) }, \ - { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_rocket_flight_tm_t, nas_n) }, \ - { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_rocket_flight_tm_t, nas_e) }, \ - { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_rocket_flight_tm_t, nas_d) }, \ - { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_rocket_flight_tm_t, nas_vn) }, \ - { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_rocket_flight_tm_t, nas_ve) }, \ - { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_rocket_flight_tm_t, nas_vd) }, \ - { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_rocket_flight_tm_t, nas_qx) }, \ - { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_rocket_flight_tm_t, nas_qy) }, \ - { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_rocket_flight_tm_t, nas_qz) }, \ - { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_rocket_flight_tm_t, nas_qw) }, \ - { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_rocket_flight_tm_t, nas_bias_x) }, \ - { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_rocket_flight_tm_t, nas_bias_y) }, \ - { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 144, offsetof(mavlink_rocket_flight_tm_t, nas_bias_z) }, \ - { "pin_launch", NULL, MAVLINK_TYPE_UINT8_T, 0, 162, offsetof(mavlink_rocket_flight_tm_t, pin_launch) }, \ - { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 163, offsetof(mavlink_rocket_flight_tm_t, pin_nosecone) }, \ - { "servo_sensor", NULL, MAVLINK_TYPE_UINT8_T, 0, 164, offsetof(mavlink_rocket_flight_tm_t, servo_sensor) }, \ - { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 148, offsetof(mavlink_rocket_flight_tm_t, vbat) }, \ - { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 152, offsetof(mavlink_rocket_flight_tm_t, temperature) }, \ - { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 165, offsetof(mavlink_rocket_flight_tm_t, logger_error) }, \ + { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_rocket_flight_tm_t, acc_x) }, \ + { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_rocket_flight_tm_t, acc_y) }, \ + { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_rocket_flight_tm_t, acc_z) }, \ + { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_flight_tm_t, gyro_x) }, \ + { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_flight_tm_t, gyro_y) }, \ + { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_flight_tm_t, gyro_z) }, \ + { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_flight_tm_t, mag_x) }, \ + { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_flight_tm_t, mag_y) }, \ + { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_flight_tm_t, mag_z) }, \ + { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 157, offsetof(mavlink_rocket_flight_tm_t, gps_fix) }, \ + { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_flight_tm_t, gps_lat) }, \ + { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_flight_tm_t, gps_lon) }, \ + { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_flight_tm_t, gps_alt) }, \ + { "ab_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_flight_tm_t, ab_angle) }, \ + { "ab_estimated_cd", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_flight_tm_t, ab_estimated_cd) }, \ + { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_rocket_flight_tm_t, nas_n) }, \ + { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_rocket_flight_tm_t, nas_e) }, \ + { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_rocket_flight_tm_t, nas_d) }, \ + { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_rocket_flight_tm_t, nas_vn) }, \ + { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_rocket_flight_tm_t, nas_ve) }, \ + { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_rocket_flight_tm_t, nas_vd) }, \ + { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_rocket_flight_tm_t, nas_qx) }, \ + { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_rocket_flight_tm_t, nas_qy) }, \ + { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_rocket_flight_tm_t, nas_qz) }, \ + { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_rocket_flight_tm_t, nas_qw) }, \ + { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_rocket_flight_tm_t, nas_bias_x) }, \ + { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_rocket_flight_tm_t, nas_bias_y) }, \ + { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_rocket_flight_tm_t, nas_bias_z) }, \ + { "pin_launch", NULL, MAVLINK_TYPE_UINT8_T, 0, 158, offsetof(mavlink_rocket_flight_tm_t, pin_launch) }, \ + { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 159, offsetof(mavlink_rocket_flight_tm_t, pin_nosecone) }, \ + { "pin_expulsion", NULL, MAVLINK_TYPE_UINT8_T, 0, 160, offsetof(mavlink_rocket_flight_tm_t, pin_expulsion) }, \ + { "cutter_presence", NULL, MAVLINK_TYPE_UINT8_T, 0, 161, offsetof(mavlink_rocket_flight_tm_t, cutter_presence) }, \ + { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 144, offsetof(mavlink_rocket_flight_tm_t, vbat) }, \ + { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 148, offsetof(mavlink_rocket_flight_tm_t, temperature) }, \ + { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 162, offsetof(mavlink_rocket_flight_tm_t, logger_error) }, \ } \ } #else @@ -125,53 +125,53 @@ typedef struct __mavlink_rocket_flight_tm_t { "ROCKET_FLIGHT_TM", \ 48, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_rocket_flight_tm_t, timestamp) }, \ - { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 156, offsetof(mavlink_rocket_flight_tm_t, ada_state) }, \ - { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 157, offsetof(mavlink_rocket_flight_tm_t, fmm_state) }, \ - { "dpl_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 158, offsetof(mavlink_rocket_flight_tm_t, dpl_state) }, \ - { "abk_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 159, offsetof(mavlink_rocket_flight_tm_t, abk_state) }, \ - { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 160, offsetof(mavlink_rocket_flight_tm_t, nas_state) }, \ + { "ada_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 152, offsetof(mavlink_rocket_flight_tm_t, ada_state) }, \ + { "fmm_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 153, offsetof(mavlink_rocket_flight_tm_t, fmm_state) }, \ + { "dpl_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 154, offsetof(mavlink_rocket_flight_tm_t, dpl_state) }, \ + { "abk_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 155, offsetof(mavlink_rocket_flight_tm_t, abk_state) }, \ + { "nas_state", NULL, MAVLINK_TYPE_UINT8_T, 0, 156, offsetof(mavlink_rocket_flight_tm_t, nas_state) }, \ { "pressure_ada", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_rocket_flight_tm_t, pressure_ada) }, \ { "pressure_digi", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_rocket_flight_tm_t, pressure_digi) }, \ { "pressure_static", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_rocket_flight_tm_t, pressure_static) }, \ { "pressure_dpl", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_rocket_flight_tm_t, pressure_dpl) }, \ { "airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_rocket_flight_tm_t, airspeed_pitot) }, \ - { "msl_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_rocket_flight_tm_t, msl_altitude) }, \ + { "altitude_agl", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_rocket_flight_tm_t, altitude_agl) }, \ { "ada_vert_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_rocket_flight_tm_t, ada_vert_speed) }, \ - { "ada_vert_accel", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_rocket_flight_tm_t, ada_vert_accel) }, \ - { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_rocket_flight_tm_t, acc_x) }, \ - { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_rocket_flight_tm_t, acc_y) }, \ - { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_flight_tm_t, acc_z) }, \ - { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_flight_tm_t, gyro_x) }, \ - { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_flight_tm_t, gyro_y) }, \ - { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_flight_tm_t, gyro_z) }, \ - { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_flight_tm_t, mag_x) }, \ - { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_flight_tm_t, mag_y) }, \ - { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_flight_tm_t, mag_z) }, \ - { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 161, offsetof(mavlink_rocket_flight_tm_t, gps_fix) }, \ - { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_flight_tm_t, gps_lat) }, \ - { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_flight_tm_t, gps_lon) }, \ - { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_flight_tm_t, gps_alt) }, \ - { "ab_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_flight_tm_t, ab_angle) }, \ - { "ab_estimated_cd", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_rocket_flight_tm_t, ab_estimated_cd) }, \ - { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_rocket_flight_tm_t, nas_n) }, \ - { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_rocket_flight_tm_t, nas_e) }, \ - { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_rocket_flight_tm_t, nas_d) }, \ - { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_rocket_flight_tm_t, nas_vn) }, \ - { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_rocket_flight_tm_t, nas_ve) }, \ - { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_rocket_flight_tm_t, nas_vd) }, \ - { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_rocket_flight_tm_t, nas_qx) }, \ - { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_rocket_flight_tm_t, nas_qy) }, \ - { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_rocket_flight_tm_t, nas_qz) }, \ - { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_rocket_flight_tm_t, nas_qw) }, \ - { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_rocket_flight_tm_t, nas_bias_x) }, \ - { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_rocket_flight_tm_t, nas_bias_y) }, \ - { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 144, offsetof(mavlink_rocket_flight_tm_t, nas_bias_z) }, \ - { "pin_launch", NULL, MAVLINK_TYPE_UINT8_T, 0, 162, offsetof(mavlink_rocket_flight_tm_t, pin_launch) }, \ - { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 163, offsetof(mavlink_rocket_flight_tm_t, pin_nosecone) }, \ - { "servo_sensor", NULL, MAVLINK_TYPE_UINT8_T, 0, 164, offsetof(mavlink_rocket_flight_tm_t, servo_sensor) }, \ - { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 148, offsetof(mavlink_rocket_flight_tm_t, vbat) }, \ - { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 152, offsetof(mavlink_rocket_flight_tm_t, temperature) }, \ - { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 165, offsetof(mavlink_rocket_flight_tm_t, logger_error) }, \ + { "acc_x", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_rocket_flight_tm_t, acc_x) }, \ + { "acc_y", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_rocket_flight_tm_t, acc_y) }, \ + { "acc_z", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_rocket_flight_tm_t, acc_z) }, \ + { "gyro_x", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_flight_tm_t, gyro_x) }, \ + { "gyro_y", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_flight_tm_t, gyro_y) }, \ + { "gyro_z", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_flight_tm_t, gyro_z) }, \ + { "mag_x", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_flight_tm_t, mag_x) }, \ + { "mag_y", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_flight_tm_t, mag_y) }, \ + { "mag_z", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_flight_tm_t, mag_z) }, \ + { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 157, offsetof(mavlink_rocket_flight_tm_t, gps_fix) }, \ + { "gps_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_flight_tm_t, gps_lat) }, \ + { "gps_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_flight_tm_t, gps_lon) }, \ + { "gps_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_flight_tm_t, gps_alt) }, \ + { "ab_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_flight_tm_t, ab_angle) }, \ + { "ab_estimated_cd", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_flight_tm_t, ab_estimated_cd) }, \ + { "nas_n", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_rocket_flight_tm_t, nas_n) }, \ + { "nas_e", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_rocket_flight_tm_t, nas_e) }, \ + { "nas_d", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_rocket_flight_tm_t, nas_d) }, \ + { "nas_vn", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_rocket_flight_tm_t, nas_vn) }, \ + { "nas_ve", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_rocket_flight_tm_t, nas_ve) }, \ + { "nas_vd", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_rocket_flight_tm_t, nas_vd) }, \ + { "nas_qx", NULL, MAVLINK_TYPE_FLOAT, 0, 116, offsetof(mavlink_rocket_flight_tm_t, nas_qx) }, \ + { "nas_qy", NULL, MAVLINK_TYPE_FLOAT, 0, 120, offsetof(mavlink_rocket_flight_tm_t, nas_qy) }, \ + { "nas_qz", NULL, MAVLINK_TYPE_FLOAT, 0, 124, offsetof(mavlink_rocket_flight_tm_t, nas_qz) }, \ + { "nas_qw", NULL, MAVLINK_TYPE_FLOAT, 0, 128, offsetof(mavlink_rocket_flight_tm_t, nas_qw) }, \ + { "nas_bias_x", NULL, MAVLINK_TYPE_FLOAT, 0, 132, offsetof(mavlink_rocket_flight_tm_t, nas_bias_x) }, \ + { "nas_bias_y", NULL, MAVLINK_TYPE_FLOAT, 0, 136, offsetof(mavlink_rocket_flight_tm_t, nas_bias_y) }, \ + { "nas_bias_z", NULL, MAVLINK_TYPE_FLOAT, 0, 140, offsetof(mavlink_rocket_flight_tm_t, nas_bias_z) }, \ + { "pin_launch", NULL, MAVLINK_TYPE_UINT8_T, 0, 158, offsetof(mavlink_rocket_flight_tm_t, pin_launch) }, \ + { "pin_nosecone", NULL, MAVLINK_TYPE_UINT8_T, 0, 159, offsetof(mavlink_rocket_flight_tm_t, pin_nosecone) }, \ + { "pin_expulsion", NULL, MAVLINK_TYPE_UINT8_T, 0, 160, offsetof(mavlink_rocket_flight_tm_t, pin_expulsion) }, \ + { "cutter_presence", NULL, MAVLINK_TYPE_UINT8_T, 0, 161, offsetof(mavlink_rocket_flight_tm_t, cutter_presence) }, \ + { "vbat", NULL, MAVLINK_TYPE_FLOAT, 0, 144, offsetof(mavlink_rocket_flight_tm_t, vbat) }, \ + { "temperature", NULL, MAVLINK_TYPE_FLOAT, 0, 148, offsetof(mavlink_rocket_flight_tm_t, temperature) }, \ + { "logger_error", NULL, MAVLINK_TYPE_INT8_T, 0, 162, offsetof(mavlink_rocket_flight_tm_t, logger_error) }, \ } \ } #endif @@ -193,9 +193,8 @@ typedef struct __mavlink_rocket_flight_tm_t { * @param pressure_static [Pa] Pressure from static port * @param pressure_dpl [Pa] Pressure from deployment vane sensor * @param airspeed_pitot [m/s] Pitot airspeed - * @param msl_altitude [m] Altitude above mean sea level + * @param altitude_agl [m] Altitude above ground level * @param ada_vert_speed [m/s] Vertical speed estimated by ADA - * @param ada_vert_accel [m/s^2] Vertical acceleration estimated by ADA * @param acc_x [m/s^2] Acceleration on X axis (body) * @param acc_y [m/s^2] Acceleration on Y axis (body) * @param acc_z [m/s^2] Acceleration on Z axis (body) @@ -226,14 +225,15 @@ typedef struct __mavlink_rocket_flight_tm_t { * @param nas_bias_z Navigation system gyroscope bias on x axis * @param pin_launch Launch pin status (1 = connected, 0 = disconnected) * @param pin_nosecone Nosecone pin status (1 = connected, 0 = disconnected) - * @param servo_sensor Servo sensor status (1 = actuated, 0 = idle) + * @param pin_expulsion Servo sensor status (1 = actuated, 0 = idle) + * @param cutter_presence Cutter presence status (1 = present, 0 = missing) * @param vbat [V] Battery voltage * @param temperature [degC] Temperature * @param logger_error Logger error (0 = no error, -1 otherwise) * @return length of the message in bytes (excluding serial stream start sign) */ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, - uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t dpl_state, uint8_t abk_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float msl_altitude, float ada_vert_speed, float ada_vert_accel, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float ab_angle, float ab_estimated_cd, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_launch, uint8_t pin_nosecone, uint8_t servo_sensor, float vbat, float temperature, int8_t logger_error) + uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t dpl_state, uint8_t abk_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float altitude_agl, float ada_vert_speed, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float ab_angle, float ab_estimated_cd, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_launch, uint8_t pin_nosecone, uint8_t pin_expulsion, uint8_t cutter_presence, float vbat, float temperature, int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN]; @@ -243,48 +243,48 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); + _mav_put_float(buf, 28, altitude_agl); _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, ab_angle); - _mav_put_float(buf, 92, ab_estimated_cd); - _mav_put_float(buf, 96, nas_n); - _mav_put_float(buf, 100, nas_e); - _mav_put_float(buf, 104, nas_d); - _mav_put_float(buf, 108, nas_vn); - _mav_put_float(buf, 112, nas_ve); - _mav_put_float(buf, 116, nas_vd); - _mav_put_float(buf, 120, nas_qx); - _mav_put_float(buf, 124, nas_qy); - _mav_put_float(buf, 128, nas_qz); - _mav_put_float(buf, 132, nas_qw); - _mav_put_float(buf, 136, nas_bias_x); - _mav_put_float(buf, 140, nas_bias_y); - _mav_put_float(buf, 144, nas_bias_z); - _mav_put_float(buf, 148, vbat); - _mav_put_float(buf, 152, temperature); - _mav_put_uint8_t(buf, 156, ada_state); - _mav_put_uint8_t(buf, 157, fmm_state); - _mav_put_uint8_t(buf, 158, dpl_state); - _mav_put_uint8_t(buf, 159, abk_state); - _mav_put_uint8_t(buf, 160, nas_state); - _mav_put_uint8_t(buf, 161, gps_fix); - _mav_put_uint8_t(buf, 162, pin_launch); - _mav_put_uint8_t(buf, 163, pin_nosecone); - _mav_put_uint8_t(buf, 164, servo_sensor); - _mav_put_int8_t(buf, 165, logger_error); + _mav_put_float(buf, 36, acc_x); + _mav_put_float(buf, 40, acc_y); + _mav_put_float(buf, 44, acc_z); + _mav_put_float(buf, 48, gyro_x); + _mav_put_float(buf, 52, gyro_y); + _mav_put_float(buf, 56, gyro_z); + _mav_put_float(buf, 60, mag_x); + _mav_put_float(buf, 64, mag_y); + _mav_put_float(buf, 68, mag_z); + _mav_put_float(buf, 72, gps_lat); + _mav_put_float(buf, 76, gps_lon); + _mav_put_float(buf, 80, gps_alt); + _mav_put_float(buf, 84, ab_angle); + _mav_put_float(buf, 88, ab_estimated_cd); + _mav_put_float(buf, 92, nas_n); + _mav_put_float(buf, 96, nas_e); + _mav_put_float(buf, 100, nas_d); + _mav_put_float(buf, 104, nas_vn); + _mav_put_float(buf, 108, nas_ve); + _mav_put_float(buf, 112, nas_vd); + _mav_put_float(buf, 116, nas_qx); + _mav_put_float(buf, 120, nas_qy); + _mav_put_float(buf, 124, nas_qz); + _mav_put_float(buf, 128, nas_qw); + _mav_put_float(buf, 132, nas_bias_x); + _mav_put_float(buf, 136, nas_bias_y); + _mav_put_float(buf, 140, nas_bias_z); + _mav_put_float(buf, 144, vbat); + _mav_put_float(buf, 148, temperature); + _mav_put_uint8_t(buf, 152, ada_state); + _mav_put_uint8_t(buf, 153, fmm_state); + _mav_put_uint8_t(buf, 154, dpl_state); + _mav_put_uint8_t(buf, 155, abk_state); + _mav_put_uint8_t(buf, 156, nas_state); + _mav_put_uint8_t(buf, 157, gps_fix); + _mav_put_uint8_t(buf, 158, pin_launch); + _mav_put_uint8_t(buf, 159, pin_nosecone); + _mav_put_uint8_t(buf, 160, pin_expulsion); + _mav_put_uint8_t(buf, 161, cutter_presence); + _mav_put_int8_t(buf, 162, logger_error); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN); #else @@ -295,9 +295,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint packet.pressure_static = pressure_static; packet.pressure_dpl = pressure_dpl; packet.airspeed_pitot = airspeed_pitot; - packet.msl_altitude = msl_altitude; + packet.altitude_agl = altitude_agl; packet.ada_vert_speed = ada_vert_speed; - packet.ada_vert_accel = ada_vert_accel; packet.acc_x = acc_x; packet.acc_y = acc_y; packet.acc_z = acc_z; @@ -335,7 +334,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint packet.gps_fix = gps_fix; packet.pin_launch = pin_launch; packet.pin_nosecone = pin_nosecone; - packet.servo_sensor = servo_sensor; + packet.pin_expulsion = pin_expulsion; + packet.cutter_presence = cutter_presence; packet.logger_error = logger_error; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN); @@ -362,9 +362,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint * @param pressure_static [Pa] Pressure from static port * @param pressure_dpl [Pa] Pressure from deployment vane sensor * @param airspeed_pitot [m/s] Pitot airspeed - * @param msl_altitude [m] Altitude above mean sea level + * @param altitude_agl [m] Altitude above ground level * @param ada_vert_speed [m/s] Vertical speed estimated by ADA - * @param ada_vert_accel [m/s^2] Vertical acceleration estimated by ADA * @param acc_x [m/s^2] Acceleration on X axis (body) * @param acc_y [m/s^2] Acceleration on Y axis (body) * @param acc_z [m/s^2] Acceleration on Z axis (body) @@ -395,7 +394,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint * @param nas_bias_z Navigation system gyroscope bias on x axis * @param pin_launch Launch pin status (1 = connected, 0 = disconnected) * @param pin_nosecone Nosecone pin status (1 = connected, 0 = disconnected) - * @param servo_sensor Servo sensor status (1 = actuated, 0 = idle) + * @param pin_expulsion Servo sensor status (1 = actuated, 0 = idle) + * @param cutter_presence Cutter presence status (1 = present, 0 = missing) * @param vbat [V] Battery voltage * @param temperature [degC] Temperature * @param logger_error Logger error (0 = no error, -1 otherwise) @@ -403,7 +403,7 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint */ static inline uint16_t mavlink_msg_rocket_flight_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, - uint64_t timestamp,uint8_t ada_state,uint8_t fmm_state,uint8_t dpl_state,uint8_t abk_state,uint8_t nas_state,float pressure_ada,float pressure_digi,float pressure_static,float pressure_dpl,float airspeed_pitot,float msl_altitude,float ada_vert_speed,float ada_vert_accel,float acc_x,float acc_y,float acc_z,float gyro_x,float gyro_y,float gyro_z,float mag_x,float mag_y,float mag_z,uint8_t gps_fix,float gps_lat,float gps_lon,float gps_alt,float ab_angle,float ab_estimated_cd,float nas_n,float nas_e,float nas_d,float nas_vn,float nas_ve,float nas_vd,float nas_qx,float nas_qy,float nas_qz,float nas_qw,float nas_bias_x,float nas_bias_y,float nas_bias_z,uint8_t pin_launch,uint8_t pin_nosecone,uint8_t servo_sensor,float vbat,float temperature,int8_t logger_error) + uint64_t timestamp,uint8_t ada_state,uint8_t fmm_state,uint8_t dpl_state,uint8_t abk_state,uint8_t nas_state,float pressure_ada,float pressure_digi,float pressure_static,float pressure_dpl,float airspeed_pitot,float altitude_agl,float ada_vert_speed,float acc_x,float acc_y,float acc_z,float gyro_x,float gyro_y,float gyro_z,float mag_x,float mag_y,float mag_z,uint8_t gps_fix,float gps_lat,float gps_lon,float gps_alt,float ab_angle,float ab_estimated_cd,float nas_n,float nas_e,float nas_d,float nas_vn,float nas_ve,float nas_vd,float nas_qx,float nas_qy,float nas_qz,float nas_qw,float nas_bias_x,float nas_bias_y,float nas_bias_z,uint8_t pin_launch,uint8_t pin_nosecone,uint8_t pin_expulsion,uint8_t cutter_presence,float vbat,float temperature,int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN]; @@ -413,48 +413,48 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack_chan(uint8_t system_id, _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); + _mav_put_float(buf, 28, altitude_agl); _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, ab_angle); - _mav_put_float(buf, 92, ab_estimated_cd); - _mav_put_float(buf, 96, nas_n); - _mav_put_float(buf, 100, nas_e); - _mav_put_float(buf, 104, nas_d); - _mav_put_float(buf, 108, nas_vn); - _mav_put_float(buf, 112, nas_ve); - _mav_put_float(buf, 116, nas_vd); - _mav_put_float(buf, 120, nas_qx); - _mav_put_float(buf, 124, nas_qy); - _mav_put_float(buf, 128, nas_qz); - _mav_put_float(buf, 132, nas_qw); - _mav_put_float(buf, 136, nas_bias_x); - _mav_put_float(buf, 140, nas_bias_y); - _mav_put_float(buf, 144, nas_bias_z); - _mav_put_float(buf, 148, vbat); - _mav_put_float(buf, 152, temperature); - _mav_put_uint8_t(buf, 156, ada_state); - _mav_put_uint8_t(buf, 157, fmm_state); - _mav_put_uint8_t(buf, 158, dpl_state); - _mav_put_uint8_t(buf, 159, abk_state); - _mav_put_uint8_t(buf, 160, nas_state); - _mav_put_uint8_t(buf, 161, gps_fix); - _mav_put_uint8_t(buf, 162, pin_launch); - _mav_put_uint8_t(buf, 163, pin_nosecone); - _mav_put_uint8_t(buf, 164, servo_sensor); - _mav_put_int8_t(buf, 165, logger_error); + _mav_put_float(buf, 36, acc_x); + _mav_put_float(buf, 40, acc_y); + _mav_put_float(buf, 44, acc_z); + _mav_put_float(buf, 48, gyro_x); + _mav_put_float(buf, 52, gyro_y); + _mav_put_float(buf, 56, gyro_z); + _mav_put_float(buf, 60, mag_x); + _mav_put_float(buf, 64, mag_y); + _mav_put_float(buf, 68, mag_z); + _mav_put_float(buf, 72, gps_lat); + _mav_put_float(buf, 76, gps_lon); + _mav_put_float(buf, 80, gps_alt); + _mav_put_float(buf, 84, ab_angle); + _mav_put_float(buf, 88, ab_estimated_cd); + _mav_put_float(buf, 92, nas_n); + _mav_put_float(buf, 96, nas_e); + _mav_put_float(buf, 100, nas_d); + _mav_put_float(buf, 104, nas_vn); + _mav_put_float(buf, 108, nas_ve); + _mav_put_float(buf, 112, nas_vd); + _mav_put_float(buf, 116, nas_qx); + _mav_put_float(buf, 120, nas_qy); + _mav_put_float(buf, 124, nas_qz); + _mav_put_float(buf, 128, nas_qw); + _mav_put_float(buf, 132, nas_bias_x); + _mav_put_float(buf, 136, nas_bias_y); + _mav_put_float(buf, 140, nas_bias_z); + _mav_put_float(buf, 144, vbat); + _mav_put_float(buf, 148, temperature); + _mav_put_uint8_t(buf, 152, ada_state); + _mav_put_uint8_t(buf, 153, fmm_state); + _mav_put_uint8_t(buf, 154, dpl_state); + _mav_put_uint8_t(buf, 155, abk_state); + _mav_put_uint8_t(buf, 156, nas_state); + _mav_put_uint8_t(buf, 157, gps_fix); + _mav_put_uint8_t(buf, 158, pin_launch); + _mav_put_uint8_t(buf, 159, pin_nosecone); + _mav_put_uint8_t(buf, 160, pin_expulsion); + _mav_put_uint8_t(buf, 161, cutter_presence); + _mav_put_int8_t(buf, 162, logger_error); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN); #else @@ -465,9 +465,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack_chan(uint8_t system_id, packet.pressure_static = pressure_static; packet.pressure_dpl = pressure_dpl; packet.airspeed_pitot = airspeed_pitot; - packet.msl_altitude = msl_altitude; + packet.altitude_agl = altitude_agl; packet.ada_vert_speed = ada_vert_speed; - packet.ada_vert_accel = ada_vert_accel; packet.acc_x = acc_x; packet.acc_y = acc_y; packet.acc_z = acc_z; @@ -505,7 +504,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack_chan(uint8_t system_id, packet.gps_fix = gps_fix; packet.pin_launch = pin_launch; packet.pin_nosecone = pin_nosecone; - packet.servo_sensor = servo_sensor; + packet.pin_expulsion = pin_expulsion; + packet.cutter_presence = cutter_presence; packet.logger_error = logger_error; memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN); @@ -525,7 +525,7 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack_chan(uint8_t system_id, */ static inline uint16_t mavlink_msg_rocket_flight_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_rocket_flight_tm_t* rocket_flight_tm) { - return mavlink_msg_rocket_flight_tm_pack(system_id, component_id, msg, rocket_flight_tm->timestamp, rocket_flight_tm->ada_state, rocket_flight_tm->fmm_state, rocket_flight_tm->dpl_state, rocket_flight_tm->abk_state, rocket_flight_tm->nas_state, rocket_flight_tm->pressure_ada, rocket_flight_tm->pressure_digi, rocket_flight_tm->pressure_static, rocket_flight_tm->pressure_dpl, rocket_flight_tm->airspeed_pitot, rocket_flight_tm->msl_altitude, rocket_flight_tm->ada_vert_speed, rocket_flight_tm->ada_vert_accel, rocket_flight_tm->acc_x, rocket_flight_tm->acc_y, rocket_flight_tm->acc_z, rocket_flight_tm->gyro_x, rocket_flight_tm->gyro_y, rocket_flight_tm->gyro_z, rocket_flight_tm->mag_x, rocket_flight_tm->mag_y, rocket_flight_tm->mag_z, rocket_flight_tm->gps_fix, rocket_flight_tm->gps_lat, rocket_flight_tm->gps_lon, rocket_flight_tm->gps_alt, rocket_flight_tm->ab_angle, rocket_flight_tm->ab_estimated_cd, rocket_flight_tm->nas_n, rocket_flight_tm->nas_e, rocket_flight_tm->nas_d, rocket_flight_tm->nas_vn, rocket_flight_tm->nas_ve, rocket_flight_tm->nas_vd, rocket_flight_tm->nas_qx, rocket_flight_tm->nas_qy, rocket_flight_tm->nas_qz, rocket_flight_tm->nas_qw, rocket_flight_tm->nas_bias_x, rocket_flight_tm->nas_bias_y, rocket_flight_tm->nas_bias_z, rocket_flight_tm->pin_launch, rocket_flight_tm->pin_nosecone, rocket_flight_tm->servo_sensor, rocket_flight_tm->vbat, rocket_flight_tm->temperature, rocket_flight_tm->logger_error); + return mavlink_msg_rocket_flight_tm_pack(system_id, component_id, msg, rocket_flight_tm->timestamp, rocket_flight_tm->ada_state, rocket_flight_tm->fmm_state, rocket_flight_tm->dpl_state, rocket_flight_tm->abk_state, rocket_flight_tm->nas_state, rocket_flight_tm->pressure_ada, rocket_flight_tm->pressure_digi, rocket_flight_tm->pressure_static, rocket_flight_tm->pressure_dpl, rocket_flight_tm->airspeed_pitot, rocket_flight_tm->altitude_agl, rocket_flight_tm->ada_vert_speed, rocket_flight_tm->acc_x, rocket_flight_tm->acc_y, rocket_flight_tm->acc_z, rocket_flight_tm->gyro_x, rocket_flight_tm->gyro_y, rocket_flight_tm->gyro_z, rocket_flight_tm->mag_x, rocket_flight_tm->mag_y, rocket_flight_tm->mag_z, rocket_flight_tm->gps_fix, rocket_flight_tm->gps_lat, rocket_flight_tm->gps_lon, rocket_flight_tm->gps_alt, rocket_flight_tm->ab_angle, rocket_flight_tm->ab_estimated_cd, rocket_flight_tm->nas_n, rocket_flight_tm->nas_e, rocket_flight_tm->nas_d, rocket_flight_tm->nas_vn, rocket_flight_tm->nas_ve, rocket_flight_tm->nas_vd, rocket_flight_tm->nas_qx, rocket_flight_tm->nas_qy, rocket_flight_tm->nas_qz, rocket_flight_tm->nas_qw, rocket_flight_tm->nas_bias_x, rocket_flight_tm->nas_bias_y, rocket_flight_tm->nas_bias_z, rocket_flight_tm->pin_launch, rocket_flight_tm->pin_nosecone, rocket_flight_tm->pin_expulsion, rocket_flight_tm->cutter_presence, rocket_flight_tm->vbat, rocket_flight_tm->temperature, rocket_flight_tm->logger_error); } /** @@ -539,7 +539,7 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_encode(uint8_t system_id, ui */ static inline uint16_t mavlink_msg_rocket_flight_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_rocket_flight_tm_t* rocket_flight_tm) { - return mavlink_msg_rocket_flight_tm_pack_chan(system_id, component_id, chan, msg, rocket_flight_tm->timestamp, rocket_flight_tm->ada_state, rocket_flight_tm->fmm_state, rocket_flight_tm->dpl_state, rocket_flight_tm->abk_state, rocket_flight_tm->nas_state, rocket_flight_tm->pressure_ada, rocket_flight_tm->pressure_digi, rocket_flight_tm->pressure_static, rocket_flight_tm->pressure_dpl, rocket_flight_tm->airspeed_pitot, rocket_flight_tm->msl_altitude, rocket_flight_tm->ada_vert_speed, rocket_flight_tm->ada_vert_accel, rocket_flight_tm->acc_x, rocket_flight_tm->acc_y, rocket_flight_tm->acc_z, rocket_flight_tm->gyro_x, rocket_flight_tm->gyro_y, rocket_flight_tm->gyro_z, rocket_flight_tm->mag_x, rocket_flight_tm->mag_y, rocket_flight_tm->mag_z, rocket_flight_tm->gps_fix, rocket_flight_tm->gps_lat, rocket_flight_tm->gps_lon, rocket_flight_tm->gps_alt, rocket_flight_tm->ab_angle, rocket_flight_tm->ab_estimated_cd, rocket_flight_tm->nas_n, rocket_flight_tm->nas_e, rocket_flight_tm->nas_d, rocket_flight_tm->nas_vn, rocket_flight_tm->nas_ve, rocket_flight_tm->nas_vd, rocket_flight_tm->nas_qx, rocket_flight_tm->nas_qy, rocket_flight_tm->nas_qz, rocket_flight_tm->nas_qw, rocket_flight_tm->nas_bias_x, rocket_flight_tm->nas_bias_y, rocket_flight_tm->nas_bias_z, rocket_flight_tm->pin_launch, rocket_flight_tm->pin_nosecone, rocket_flight_tm->servo_sensor, rocket_flight_tm->vbat, rocket_flight_tm->temperature, rocket_flight_tm->logger_error); + return mavlink_msg_rocket_flight_tm_pack_chan(system_id, component_id, chan, msg, rocket_flight_tm->timestamp, rocket_flight_tm->ada_state, rocket_flight_tm->fmm_state, rocket_flight_tm->dpl_state, rocket_flight_tm->abk_state, rocket_flight_tm->nas_state, rocket_flight_tm->pressure_ada, rocket_flight_tm->pressure_digi, rocket_flight_tm->pressure_static, rocket_flight_tm->pressure_dpl, rocket_flight_tm->airspeed_pitot, rocket_flight_tm->altitude_agl, rocket_flight_tm->ada_vert_speed, rocket_flight_tm->acc_x, rocket_flight_tm->acc_y, rocket_flight_tm->acc_z, rocket_flight_tm->gyro_x, rocket_flight_tm->gyro_y, rocket_flight_tm->gyro_z, rocket_flight_tm->mag_x, rocket_flight_tm->mag_y, rocket_flight_tm->mag_z, rocket_flight_tm->gps_fix, rocket_flight_tm->gps_lat, rocket_flight_tm->gps_lon, rocket_flight_tm->gps_alt, rocket_flight_tm->ab_angle, rocket_flight_tm->ab_estimated_cd, rocket_flight_tm->nas_n, rocket_flight_tm->nas_e, rocket_flight_tm->nas_d, rocket_flight_tm->nas_vn, rocket_flight_tm->nas_ve, rocket_flight_tm->nas_vd, rocket_flight_tm->nas_qx, rocket_flight_tm->nas_qy, rocket_flight_tm->nas_qz, rocket_flight_tm->nas_qw, rocket_flight_tm->nas_bias_x, rocket_flight_tm->nas_bias_y, rocket_flight_tm->nas_bias_z, rocket_flight_tm->pin_launch, rocket_flight_tm->pin_nosecone, rocket_flight_tm->pin_expulsion, rocket_flight_tm->cutter_presence, rocket_flight_tm->vbat, rocket_flight_tm->temperature, rocket_flight_tm->logger_error); } /** @@ -557,9 +557,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_encode_chan(uint8_t system_i * @param pressure_static [Pa] Pressure from static port * @param pressure_dpl [Pa] Pressure from deployment vane sensor * @param airspeed_pitot [m/s] Pitot airspeed - * @param msl_altitude [m] Altitude above mean sea level + * @param altitude_agl [m] Altitude above ground level * @param ada_vert_speed [m/s] Vertical speed estimated by ADA - * @param ada_vert_accel [m/s^2] Vertical acceleration estimated by ADA * @param acc_x [m/s^2] Acceleration on X axis (body) * @param acc_y [m/s^2] Acceleration on Y axis (body) * @param acc_z [m/s^2] Acceleration on Z axis (body) @@ -590,14 +589,15 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_encode_chan(uint8_t system_i * @param nas_bias_z Navigation system gyroscope bias on x axis * @param pin_launch Launch pin status (1 = connected, 0 = disconnected) * @param pin_nosecone Nosecone pin status (1 = connected, 0 = disconnected) - * @param servo_sensor Servo sensor status (1 = actuated, 0 = idle) + * @param pin_expulsion Servo sensor status (1 = actuated, 0 = idle) + * @param cutter_presence Cutter presence status (1 = present, 0 = missing) * @param vbat [V] Battery voltage * @param temperature [degC] Temperature * @param logger_error Logger error (0 = no error, -1 otherwise) */ #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS -static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t dpl_state, uint8_t abk_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float msl_altitude, float ada_vert_speed, float ada_vert_accel, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float ab_angle, float ab_estimated_cd, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_launch, uint8_t pin_nosecone, uint8_t servo_sensor, float vbat, float temperature, int8_t logger_error) +static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t dpl_state, uint8_t abk_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float altitude_agl, float ada_vert_speed, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float ab_angle, float ab_estimated_cd, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_launch, uint8_t pin_nosecone, uint8_t pin_expulsion, uint8_t cutter_presence, float vbat, float temperature, int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char buf[MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN]; @@ -607,48 +607,48 @@ static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uin _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); + _mav_put_float(buf, 28, altitude_agl); _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, ab_angle); - _mav_put_float(buf, 92, ab_estimated_cd); - _mav_put_float(buf, 96, nas_n); - _mav_put_float(buf, 100, nas_e); - _mav_put_float(buf, 104, nas_d); - _mav_put_float(buf, 108, nas_vn); - _mav_put_float(buf, 112, nas_ve); - _mav_put_float(buf, 116, nas_vd); - _mav_put_float(buf, 120, nas_qx); - _mav_put_float(buf, 124, nas_qy); - _mav_put_float(buf, 128, nas_qz); - _mav_put_float(buf, 132, nas_qw); - _mav_put_float(buf, 136, nas_bias_x); - _mav_put_float(buf, 140, nas_bias_y); - _mav_put_float(buf, 144, nas_bias_z); - _mav_put_float(buf, 148, vbat); - _mav_put_float(buf, 152, temperature); - _mav_put_uint8_t(buf, 156, ada_state); - _mav_put_uint8_t(buf, 157, fmm_state); - _mav_put_uint8_t(buf, 158, dpl_state); - _mav_put_uint8_t(buf, 159, abk_state); - _mav_put_uint8_t(buf, 160, nas_state); - _mav_put_uint8_t(buf, 161, gps_fix); - _mav_put_uint8_t(buf, 162, pin_launch); - _mav_put_uint8_t(buf, 163, pin_nosecone); - _mav_put_uint8_t(buf, 164, servo_sensor); - _mav_put_int8_t(buf, 165, logger_error); + _mav_put_float(buf, 36, acc_x); + _mav_put_float(buf, 40, acc_y); + _mav_put_float(buf, 44, acc_z); + _mav_put_float(buf, 48, gyro_x); + _mav_put_float(buf, 52, gyro_y); + _mav_put_float(buf, 56, gyro_z); + _mav_put_float(buf, 60, mag_x); + _mav_put_float(buf, 64, mag_y); + _mav_put_float(buf, 68, mag_z); + _mav_put_float(buf, 72, gps_lat); + _mav_put_float(buf, 76, gps_lon); + _mav_put_float(buf, 80, gps_alt); + _mav_put_float(buf, 84, ab_angle); + _mav_put_float(buf, 88, ab_estimated_cd); + _mav_put_float(buf, 92, nas_n); + _mav_put_float(buf, 96, nas_e); + _mav_put_float(buf, 100, nas_d); + _mav_put_float(buf, 104, nas_vn); + _mav_put_float(buf, 108, nas_ve); + _mav_put_float(buf, 112, nas_vd); + _mav_put_float(buf, 116, nas_qx); + _mav_put_float(buf, 120, nas_qy); + _mav_put_float(buf, 124, nas_qz); + _mav_put_float(buf, 128, nas_qw); + _mav_put_float(buf, 132, nas_bias_x); + _mav_put_float(buf, 136, nas_bias_y); + _mav_put_float(buf, 140, nas_bias_z); + _mav_put_float(buf, 144, vbat); + _mav_put_float(buf, 148, temperature); + _mav_put_uint8_t(buf, 152, ada_state); + _mav_put_uint8_t(buf, 153, fmm_state); + _mav_put_uint8_t(buf, 154, dpl_state); + _mav_put_uint8_t(buf, 155, abk_state); + _mav_put_uint8_t(buf, 156, nas_state); + _mav_put_uint8_t(buf, 157, gps_fix); + _mav_put_uint8_t(buf, 158, pin_launch); + _mav_put_uint8_t(buf, 159, pin_nosecone); + _mav_put_uint8_t(buf, 160, pin_expulsion); + _mav_put_uint8_t(buf, 161, cutter_presence); + _mav_put_int8_t(buf, 162, logger_error); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM, buf, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC); #else @@ -659,9 +659,8 @@ static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uin packet.pressure_static = pressure_static; packet.pressure_dpl = pressure_dpl; packet.airspeed_pitot = airspeed_pitot; - packet.msl_altitude = msl_altitude; + packet.altitude_agl = altitude_agl; packet.ada_vert_speed = ada_vert_speed; - packet.ada_vert_accel = ada_vert_accel; packet.acc_x = acc_x; packet.acc_y = acc_y; packet.acc_z = acc_z; @@ -699,7 +698,8 @@ static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uin packet.gps_fix = gps_fix; packet.pin_launch = pin_launch; packet.pin_nosecone = pin_nosecone; - packet.servo_sensor = servo_sensor; + packet.pin_expulsion = pin_expulsion; + packet.cutter_presence = cutter_presence; packet.logger_error = logger_error; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM, (const char *)&packet, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC); @@ -714,7 +714,7 @@ static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uin static inline void mavlink_msg_rocket_flight_tm_send_struct(mavlink_channel_t chan, const mavlink_rocket_flight_tm_t* rocket_flight_tm) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS - mavlink_msg_rocket_flight_tm_send(chan, rocket_flight_tm->timestamp, rocket_flight_tm->ada_state, rocket_flight_tm->fmm_state, rocket_flight_tm->dpl_state, rocket_flight_tm->abk_state, rocket_flight_tm->nas_state, rocket_flight_tm->pressure_ada, rocket_flight_tm->pressure_digi, rocket_flight_tm->pressure_static, rocket_flight_tm->pressure_dpl, rocket_flight_tm->airspeed_pitot, rocket_flight_tm->msl_altitude, rocket_flight_tm->ada_vert_speed, rocket_flight_tm->ada_vert_accel, rocket_flight_tm->acc_x, rocket_flight_tm->acc_y, rocket_flight_tm->acc_z, rocket_flight_tm->gyro_x, rocket_flight_tm->gyro_y, rocket_flight_tm->gyro_z, rocket_flight_tm->mag_x, rocket_flight_tm->mag_y, rocket_flight_tm->mag_z, rocket_flight_tm->gps_fix, rocket_flight_tm->gps_lat, rocket_flight_tm->gps_lon, rocket_flight_tm->gps_alt, rocket_flight_tm->ab_angle, rocket_flight_tm->ab_estimated_cd, rocket_flight_tm->nas_n, rocket_flight_tm->nas_e, rocket_flight_tm->nas_d, rocket_flight_tm->nas_vn, rocket_flight_tm->nas_ve, rocket_flight_tm->nas_vd, rocket_flight_tm->nas_qx, rocket_flight_tm->nas_qy, rocket_flight_tm->nas_qz, rocket_flight_tm->nas_qw, rocket_flight_tm->nas_bias_x, rocket_flight_tm->nas_bias_y, rocket_flight_tm->nas_bias_z, rocket_flight_tm->pin_launch, rocket_flight_tm->pin_nosecone, rocket_flight_tm->servo_sensor, rocket_flight_tm->vbat, rocket_flight_tm->temperature, rocket_flight_tm->logger_error); + mavlink_msg_rocket_flight_tm_send(chan, rocket_flight_tm->timestamp, rocket_flight_tm->ada_state, rocket_flight_tm->fmm_state, rocket_flight_tm->dpl_state, rocket_flight_tm->abk_state, rocket_flight_tm->nas_state, rocket_flight_tm->pressure_ada, rocket_flight_tm->pressure_digi, rocket_flight_tm->pressure_static, rocket_flight_tm->pressure_dpl, rocket_flight_tm->airspeed_pitot, rocket_flight_tm->altitude_agl, rocket_flight_tm->ada_vert_speed, rocket_flight_tm->acc_x, rocket_flight_tm->acc_y, rocket_flight_tm->acc_z, rocket_flight_tm->gyro_x, rocket_flight_tm->gyro_y, rocket_flight_tm->gyro_z, rocket_flight_tm->mag_x, rocket_flight_tm->mag_y, rocket_flight_tm->mag_z, rocket_flight_tm->gps_fix, rocket_flight_tm->gps_lat, rocket_flight_tm->gps_lon, rocket_flight_tm->gps_alt, rocket_flight_tm->ab_angle, rocket_flight_tm->ab_estimated_cd, rocket_flight_tm->nas_n, rocket_flight_tm->nas_e, rocket_flight_tm->nas_d, rocket_flight_tm->nas_vn, rocket_flight_tm->nas_ve, rocket_flight_tm->nas_vd, rocket_flight_tm->nas_qx, rocket_flight_tm->nas_qy, rocket_flight_tm->nas_qz, rocket_flight_tm->nas_qw, rocket_flight_tm->nas_bias_x, rocket_flight_tm->nas_bias_y, rocket_flight_tm->nas_bias_z, rocket_flight_tm->pin_launch, rocket_flight_tm->pin_nosecone, rocket_flight_tm->pin_expulsion, rocket_flight_tm->cutter_presence, rocket_flight_tm->vbat, rocket_flight_tm->temperature, rocket_flight_tm->logger_error); #else _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM, (const char *)rocket_flight_tm, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC); #endif @@ -728,7 +728,7 @@ static inline void mavlink_msg_rocket_flight_tm_send_struct(mavlink_channel_t ch 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_rocket_flight_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t dpl_state, uint8_t abk_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float msl_altitude, float ada_vert_speed, float ada_vert_accel, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float ab_angle, float ab_estimated_cd, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_launch, uint8_t pin_nosecone, uint8_t servo_sensor, float vbat, float temperature, int8_t logger_error) +static inline void mavlink_msg_rocket_flight_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan, uint64_t timestamp, uint8_t ada_state, uint8_t fmm_state, uint8_t dpl_state, uint8_t abk_state, uint8_t nas_state, float pressure_ada, float pressure_digi, float pressure_static, float pressure_dpl, float airspeed_pitot, float altitude_agl, float ada_vert_speed, float acc_x, float acc_y, float acc_z, float gyro_x, float gyro_y, float gyro_z, float mag_x, float mag_y, float mag_z, uint8_t gps_fix, float gps_lat, float gps_lon, float gps_alt, float ab_angle, float ab_estimated_cd, float nas_n, float nas_e, float nas_d, float nas_vn, float nas_ve, float nas_vd, float nas_qx, float nas_qy, float nas_qz, float nas_qw, float nas_bias_x, float nas_bias_y, float nas_bias_z, uint8_t pin_launch, uint8_t pin_nosecone, uint8_t pin_expulsion, uint8_t cutter_presence, float vbat, float temperature, int8_t logger_error) { #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS char *buf = (char *)msgbuf; @@ -738,48 +738,48 @@ static inline void mavlink_msg_rocket_flight_tm_send_buf(mavlink_message_t *msgb _mav_put_float(buf, 16, pressure_static); _mav_put_float(buf, 20, pressure_dpl); _mav_put_float(buf, 24, airspeed_pitot); - _mav_put_float(buf, 28, msl_altitude); + _mav_put_float(buf, 28, altitude_agl); _mav_put_float(buf, 32, ada_vert_speed); - _mav_put_float(buf, 36, ada_vert_accel); - _mav_put_float(buf, 40, acc_x); - _mav_put_float(buf, 44, acc_y); - _mav_put_float(buf, 48, acc_z); - _mav_put_float(buf, 52, gyro_x); - _mav_put_float(buf, 56, gyro_y); - _mav_put_float(buf, 60, gyro_z); - _mav_put_float(buf, 64, mag_x); - _mav_put_float(buf, 68, mag_y); - _mav_put_float(buf, 72, mag_z); - _mav_put_float(buf, 76, gps_lat); - _mav_put_float(buf, 80, gps_lon); - _mav_put_float(buf, 84, gps_alt); - _mav_put_float(buf, 88, ab_angle); - _mav_put_float(buf, 92, ab_estimated_cd); - _mav_put_float(buf, 96, nas_n); - _mav_put_float(buf, 100, nas_e); - _mav_put_float(buf, 104, nas_d); - _mav_put_float(buf, 108, nas_vn); - _mav_put_float(buf, 112, nas_ve); - _mav_put_float(buf, 116, nas_vd); - _mav_put_float(buf, 120, nas_qx); - _mav_put_float(buf, 124, nas_qy); - _mav_put_float(buf, 128, nas_qz); - _mav_put_float(buf, 132, nas_qw); - _mav_put_float(buf, 136, nas_bias_x); - _mav_put_float(buf, 140, nas_bias_y); - _mav_put_float(buf, 144, nas_bias_z); - _mav_put_float(buf, 148, vbat); - _mav_put_float(buf, 152, temperature); - _mav_put_uint8_t(buf, 156, ada_state); - _mav_put_uint8_t(buf, 157, fmm_state); - _mav_put_uint8_t(buf, 158, dpl_state); - _mav_put_uint8_t(buf, 159, abk_state); - _mav_put_uint8_t(buf, 160, nas_state); - _mav_put_uint8_t(buf, 161, gps_fix); - _mav_put_uint8_t(buf, 162, pin_launch); - _mav_put_uint8_t(buf, 163, pin_nosecone); - _mav_put_uint8_t(buf, 164, servo_sensor); - _mav_put_int8_t(buf, 165, logger_error); + _mav_put_float(buf, 36, acc_x); + _mav_put_float(buf, 40, acc_y); + _mav_put_float(buf, 44, acc_z); + _mav_put_float(buf, 48, gyro_x); + _mav_put_float(buf, 52, gyro_y); + _mav_put_float(buf, 56, gyro_z); + _mav_put_float(buf, 60, mag_x); + _mav_put_float(buf, 64, mag_y); + _mav_put_float(buf, 68, mag_z); + _mav_put_float(buf, 72, gps_lat); + _mav_put_float(buf, 76, gps_lon); + _mav_put_float(buf, 80, gps_alt); + _mav_put_float(buf, 84, ab_angle); + _mav_put_float(buf, 88, ab_estimated_cd); + _mav_put_float(buf, 92, nas_n); + _mav_put_float(buf, 96, nas_e); + _mav_put_float(buf, 100, nas_d); + _mav_put_float(buf, 104, nas_vn); + _mav_put_float(buf, 108, nas_ve); + _mav_put_float(buf, 112, nas_vd); + _mav_put_float(buf, 116, nas_qx); + _mav_put_float(buf, 120, nas_qy); + _mav_put_float(buf, 124, nas_qz); + _mav_put_float(buf, 128, nas_qw); + _mav_put_float(buf, 132, nas_bias_x); + _mav_put_float(buf, 136, nas_bias_y); + _mav_put_float(buf, 140, nas_bias_z); + _mav_put_float(buf, 144, vbat); + _mav_put_float(buf, 148, temperature); + _mav_put_uint8_t(buf, 152, ada_state); + _mav_put_uint8_t(buf, 153, fmm_state); + _mav_put_uint8_t(buf, 154, dpl_state); + _mav_put_uint8_t(buf, 155, abk_state); + _mav_put_uint8_t(buf, 156, nas_state); + _mav_put_uint8_t(buf, 157, gps_fix); + _mav_put_uint8_t(buf, 158, pin_launch); + _mav_put_uint8_t(buf, 159, pin_nosecone); + _mav_put_uint8_t(buf, 160, pin_expulsion); + _mav_put_uint8_t(buf, 161, cutter_presence); + _mav_put_int8_t(buf, 162, logger_error); _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM, buf, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC); #else @@ -790,9 +790,8 @@ static inline void mavlink_msg_rocket_flight_tm_send_buf(mavlink_message_t *msgb packet->pressure_static = pressure_static; packet->pressure_dpl = pressure_dpl; packet->airspeed_pitot = airspeed_pitot; - packet->msl_altitude = msl_altitude; + packet->altitude_agl = altitude_agl; packet->ada_vert_speed = ada_vert_speed; - packet->ada_vert_accel = ada_vert_accel; packet->acc_x = acc_x; packet->acc_y = acc_y; packet->acc_z = acc_z; @@ -830,7 +829,8 @@ static inline void mavlink_msg_rocket_flight_tm_send_buf(mavlink_message_t *msgb packet->gps_fix = gps_fix; packet->pin_launch = pin_launch; packet->pin_nosecone = pin_nosecone; - packet->servo_sensor = servo_sensor; + packet->pin_expulsion = pin_expulsion; + packet->cutter_presence = cutter_presence; packet->logger_error = logger_error; _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM, (const char *)packet, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN, MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC); @@ -860,7 +860,7 @@ static inline uint64_t mavlink_msg_rocket_flight_tm_get_timestamp(const mavlink_ */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_ada_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 156); + return _MAV_RETURN_uint8_t(msg, 152); } /** @@ -870,7 +870,7 @@ static inline uint8_t mavlink_msg_rocket_flight_tm_get_ada_state(const mavlink_m */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_fmm_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 157); + return _MAV_RETURN_uint8_t(msg, 153); } /** @@ -880,7 +880,7 @@ static inline uint8_t mavlink_msg_rocket_flight_tm_get_fmm_state(const mavlink_m */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_dpl_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 158); + return _MAV_RETURN_uint8_t(msg, 154); } /** @@ -890,7 +890,7 @@ static inline uint8_t mavlink_msg_rocket_flight_tm_get_dpl_state(const mavlink_m */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_abk_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 159); + return _MAV_RETURN_uint8_t(msg, 155); } /** @@ -900,7 +900,7 @@ static inline uint8_t mavlink_msg_rocket_flight_tm_get_abk_state(const mavlink_m */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_nas_state(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 160); + return _MAV_RETURN_uint8_t(msg, 156); } /** @@ -954,11 +954,11 @@ static inline float mavlink_msg_rocket_flight_tm_get_airspeed_pitot(const mavlin } /** - * @brief Get field msl_altitude from rocket_flight_tm message + * @brief Get field altitude_agl from rocket_flight_tm message * - * @return [m] Altitude above mean sea level + * @return [m] Altitude above ground level */ -static inline float mavlink_msg_rocket_flight_tm_get_msl_altitude(const mavlink_message_t* msg) +static inline float mavlink_msg_rocket_flight_tm_get_altitude_agl(const mavlink_message_t* msg) { return _MAV_RETURN_float(msg, 28); } @@ -973,16 +973,6 @@ static inline float mavlink_msg_rocket_flight_tm_get_ada_vert_speed(const mavlin return _MAV_RETURN_float(msg, 32); } -/** - * @brief Get field ada_vert_accel from rocket_flight_tm message - * - * @return [m/s^2] Vertical acceleration estimated by ADA - */ -static inline float mavlink_msg_rocket_flight_tm_get_ada_vert_accel(const mavlink_message_t* msg) -{ - return _MAV_RETURN_float(msg, 36); -} - /** * @brief Get field acc_x from rocket_flight_tm message * @@ -990,7 +980,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_ada_vert_accel(const mavlin */ static inline float mavlink_msg_rocket_flight_tm_get_acc_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 40); + return _MAV_RETURN_float(msg, 36); } /** @@ -1000,7 +990,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_acc_x(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_acc_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 44); + return _MAV_RETURN_float(msg, 40); } /** @@ -1010,7 +1000,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_acc_y(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_acc_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 48); + return _MAV_RETURN_float(msg, 44); } /** @@ -1020,7 +1010,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_acc_z(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_gyro_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 52); + return _MAV_RETURN_float(msg, 48); } /** @@ -1030,7 +1020,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_gyro_x(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_gyro_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 56); + return _MAV_RETURN_float(msg, 52); } /** @@ -1040,7 +1030,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_gyro_y(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_gyro_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 60); + return _MAV_RETURN_float(msg, 56); } /** @@ -1050,7 +1040,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_gyro_z(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_mag_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 64); + return _MAV_RETURN_float(msg, 60); } /** @@ -1060,7 +1050,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_mag_x(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_mag_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 68); + return _MAV_RETURN_float(msg, 64); } /** @@ -1070,7 +1060,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_mag_y(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_mag_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 72); + return _MAV_RETURN_float(msg, 68); } /** @@ -1080,7 +1070,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_mag_z(const mavlink_message */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_gps_fix(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 161); + return _MAV_RETURN_uint8_t(msg, 157); } /** @@ -1090,7 +1080,7 @@ static inline uint8_t mavlink_msg_rocket_flight_tm_get_gps_fix(const mavlink_mes */ static inline float mavlink_msg_rocket_flight_tm_get_gps_lat(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 76); + return _MAV_RETURN_float(msg, 72); } /** @@ -1100,7 +1090,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_gps_lat(const mavlink_messa */ static inline float mavlink_msg_rocket_flight_tm_get_gps_lon(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 80); + return _MAV_RETURN_float(msg, 76); } /** @@ -1110,7 +1100,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_gps_lon(const mavlink_messa */ static inline float mavlink_msg_rocket_flight_tm_get_gps_alt(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 84); + return _MAV_RETURN_float(msg, 80); } /** @@ -1120,7 +1110,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_gps_alt(const mavlink_messa */ static inline float mavlink_msg_rocket_flight_tm_get_ab_angle(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 88); + return _MAV_RETURN_float(msg, 84); } /** @@ -1130,7 +1120,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_ab_angle(const mavlink_mess */ static inline float mavlink_msg_rocket_flight_tm_get_ab_estimated_cd(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 92); + return _MAV_RETURN_float(msg, 88); } /** @@ -1140,7 +1130,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_ab_estimated_cd(const mavli */ static inline float mavlink_msg_rocket_flight_tm_get_nas_n(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 96); + return _MAV_RETURN_float(msg, 92); } /** @@ -1150,7 +1140,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_n(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_nas_e(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 100); + return _MAV_RETURN_float(msg, 96); } /** @@ -1160,7 +1150,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_e(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_nas_d(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 104); + return _MAV_RETURN_float(msg, 100); } /** @@ -1170,7 +1160,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_d(const mavlink_message */ static inline float mavlink_msg_rocket_flight_tm_get_nas_vn(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 108); + return _MAV_RETURN_float(msg, 104); } /** @@ -1180,7 +1170,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_vn(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_nas_ve(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 112); + return _MAV_RETURN_float(msg, 108); } /** @@ -1190,7 +1180,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_ve(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_nas_vd(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 116); + return _MAV_RETURN_float(msg, 112); } /** @@ -1200,7 +1190,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_vd(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_nas_qx(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 120); + return _MAV_RETURN_float(msg, 116); } /** @@ -1210,7 +1200,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_qx(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_nas_qy(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 124); + return _MAV_RETURN_float(msg, 120); } /** @@ -1220,7 +1210,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_qy(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_nas_qz(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 128); + return _MAV_RETURN_float(msg, 124); } /** @@ -1230,7 +1220,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_qz(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_nas_qw(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 132); + return _MAV_RETURN_float(msg, 128); } /** @@ -1240,7 +1230,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_qw(const mavlink_messag */ static inline float mavlink_msg_rocket_flight_tm_get_nas_bias_x(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 136); + return _MAV_RETURN_float(msg, 132); } /** @@ -1250,7 +1240,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_bias_x(const mavlink_me */ static inline float mavlink_msg_rocket_flight_tm_get_nas_bias_y(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 140); + return _MAV_RETURN_float(msg, 136); } /** @@ -1260,7 +1250,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_bias_y(const mavlink_me */ static inline float mavlink_msg_rocket_flight_tm_get_nas_bias_z(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 144); + return _MAV_RETURN_float(msg, 140); } /** @@ -1270,7 +1260,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_nas_bias_z(const mavlink_me */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_pin_launch(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 162); + return _MAV_RETURN_uint8_t(msg, 158); } /** @@ -1280,17 +1270,27 @@ static inline uint8_t mavlink_msg_rocket_flight_tm_get_pin_launch(const mavlink_ */ static inline uint8_t mavlink_msg_rocket_flight_tm_get_pin_nosecone(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 163); + return _MAV_RETURN_uint8_t(msg, 159); } /** - * @brief Get field servo_sensor from rocket_flight_tm message + * @brief Get field pin_expulsion from rocket_flight_tm message * * @return Servo sensor status (1 = actuated, 0 = idle) */ -static inline uint8_t mavlink_msg_rocket_flight_tm_get_servo_sensor(const mavlink_message_t* msg) +static inline uint8_t mavlink_msg_rocket_flight_tm_get_pin_expulsion(const mavlink_message_t* msg) +{ + return _MAV_RETURN_uint8_t(msg, 160); +} + +/** + * @brief Get field cutter_presence from rocket_flight_tm message + * + * @return Cutter presence status (1 = present, 0 = missing) + */ +static inline uint8_t mavlink_msg_rocket_flight_tm_get_cutter_presence(const mavlink_message_t* msg) { - return _MAV_RETURN_uint8_t(msg, 164); + return _MAV_RETURN_uint8_t(msg, 161); } /** @@ -1300,7 +1300,7 @@ static inline uint8_t mavlink_msg_rocket_flight_tm_get_servo_sensor(const mavlin */ static inline float mavlink_msg_rocket_flight_tm_get_vbat(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 148); + return _MAV_RETURN_float(msg, 144); } /** @@ -1310,7 +1310,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_vbat(const mavlink_message_ */ static inline float mavlink_msg_rocket_flight_tm_get_temperature(const mavlink_message_t* msg) { - return _MAV_RETURN_float(msg, 152); + return _MAV_RETURN_float(msg, 148); } /** @@ -1320,7 +1320,7 @@ static inline float mavlink_msg_rocket_flight_tm_get_temperature(const mavlink_m */ static inline int8_t mavlink_msg_rocket_flight_tm_get_logger_error(const mavlink_message_t* msg) { - return _MAV_RETURN_int8_t(msg, 165); + return _MAV_RETURN_int8_t(msg, 162); } /** @@ -1338,9 +1338,8 @@ static inline void mavlink_msg_rocket_flight_tm_decode(const mavlink_message_t* rocket_flight_tm->pressure_static = mavlink_msg_rocket_flight_tm_get_pressure_static(msg); rocket_flight_tm->pressure_dpl = mavlink_msg_rocket_flight_tm_get_pressure_dpl(msg); rocket_flight_tm->airspeed_pitot = mavlink_msg_rocket_flight_tm_get_airspeed_pitot(msg); - rocket_flight_tm->msl_altitude = mavlink_msg_rocket_flight_tm_get_msl_altitude(msg); + rocket_flight_tm->altitude_agl = mavlink_msg_rocket_flight_tm_get_altitude_agl(msg); rocket_flight_tm->ada_vert_speed = mavlink_msg_rocket_flight_tm_get_ada_vert_speed(msg); - rocket_flight_tm->ada_vert_accel = mavlink_msg_rocket_flight_tm_get_ada_vert_accel(msg); rocket_flight_tm->acc_x = mavlink_msg_rocket_flight_tm_get_acc_x(msg); rocket_flight_tm->acc_y = mavlink_msg_rocket_flight_tm_get_acc_y(msg); rocket_flight_tm->acc_z = mavlink_msg_rocket_flight_tm_get_acc_z(msg); @@ -1378,7 +1377,8 @@ static inline void mavlink_msg_rocket_flight_tm_decode(const mavlink_message_t* rocket_flight_tm->gps_fix = mavlink_msg_rocket_flight_tm_get_gps_fix(msg); rocket_flight_tm->pin_launch = mavlink_msg_rocket_flight_tm_get_pin_launch(msg); rocket_flight_tm->pin_nosecone = mavlink_msg_rocket_flight_tm_get_pin_nosecone(msg); - rocket_flight_tm->servo_sensor = mavlink_msg_rocket_flight_tm_get_servo_sensor(msg); + rocket_flight_tm->pin_expulsion = mavlink_msg_rocket_flight_tm_get_pin_expulsion(msg); + rocket_flight_tm->cutter_presence = mavlink_msg_rocket_flight_tm_get_cutter_presence(msg); rocket_flight_tm->logger_error = mavlink_msg_rocket_flight_tm_get_logger_error(msg); #else uint8_t len = msg->len < MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN? msg->len : MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_LEN; diff --git a/mavlink_lib/pyxis/pyxis.h b/mavlink_lib/pyxis/pyxis.h index a7d92378a0e145b57e122bb134e1e5fa0d758996..1db94a9c0e210eff9bbd52d5c45f77a2bfe2df6e 100644 --- a/mavlink_lib/pyxis/pyxis.h +++ b/mavlink_lib/pyxis/pyxis.h @@ -11,7 +11,7 @@ #endif #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH -5722975481846447299 +#define MAVLINK_THIS_XML_HASH -671787516688891623 #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, 8, 2, 4, 8, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 2, 74, 64, 32, 44, 32, 32, 32, 56, 21, 5, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 46, 28, 27, 49, 77, 30, 166, 158, 120, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 8, 2, 4, 8, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 2, 74, 64, 32, 44, 32, 32, 32, 56, 21, 5, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 46, 28, 27, 49, 77, 30, 163, 150, 120, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 103, 184, 215, 160, 226, 113, 38, 71, 67, 218, 44, 81, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 146, 39, 178, 239, 104, 222, 128, 233, 170, 42, 87, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 183, 69, 142, 108, 133, 79, 66, 169, 92, 61, 169, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 103, 184, 215, 160, 226, 113, 38, 71, 67, 218, 44, 81, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 146, 39, 178, 239, 104, 222, 128, 233, 170, 42, 87, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 183, 69, 142, 108, 133, 79, 66, 169, 252, 223, 169, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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" @@ -186,7 +186,7 @@ typedef enum PinsList #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH -5722975481846447299 +#define MAVLINK_THIS_XML_HASH -671787516688891623 #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_WIGGLE_SERVO_TC, MAVLINK_MESSAGE_INFO_RESET_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_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, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"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_GPS_TM, MAVLINK_MESSAGE_INFO_IMU_TM, MAVLINK_MESSAGE_INFO_PRESSURE_TM, MAVLINK_MESSAGE_INFO_ADC_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, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"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_FSM_TM, MAVLINK_MESSAGE_INFO_LOGGER_TM, MAVLINK_MESSAGE_INFO_MAVLINK_STATS_TM, MAVLINK_MESSAGE_INFO_TASK_STATS_TM, MAVLINK_MESSAGE_INFO_ADA_TM, MAVLINK_MESSAGE_INFO_NAS_TM, MAVLINK_MESSAGE_INFO_CAN_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, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"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/pyxis/testsuite.h b/mavlink_lib/pyxis/testsuite.h index edb56c6571c4c5bcb67d416210cec73db1be708f..7ac6786d9ecf0ab3b1e3d2db6acfd6b389901568 100644 --- a/mavlink_lib/pyxis/testsuite.h +++ b/mavlink_lib/pyxis/testsuite.h @@ -2351,7 +2351,7 @@ static void mavlink_test_rocket_flight_tm(uint8_t system_id, uint8_t component_i uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_rocket_flight_tm_t packet_in = { - 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,297.0,325.0,353.0,381.0,409.0,437.0,465.0,493.0,521.0,549.0,577.0,605.0,633.0,661.0,689.0,717.0,745.0,773.0,801.0,829.0,857.0,885.0,913.0,941.0,969.0,997.0,1025.0,1053.0,1081.0,217,28,95,162,229,40,107,174,241,52 + 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,297.0,325.0,353.0,381.0,409.0,437.0,465.0,493.0,521.0,549.0,577.0,605.0,633.0,661.0,689.0,717.0,745.0,773.0,801.0,829.0,857.0,885.0,913.0,941.0,969.0,997.0,1025.0,1053.0,205,16,83,150,217,28,95,162,229,40,107 }; mavlink_rocket_flight_tm_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); @@ -2361,9 +2361,8 @@ static void mavlink_test_rocket_flight_tm(uint8_t system_id, uint8_t component_i packet1.pressure_static = packet_in.pressure_static; packet1.pressure_dpl = packet_in.pressure_dpl; packet1.airspeed_pitot = packet_in.airspeed_pitot; - packet1.msl_altitude = packet_in.msl_altitude; + packet1.altitude_agl = packet_in.altitude_agl; packet1.ada_vert_speed = packet_in.ada_vert_speed; - packet1.ada_vert_accel = packet_in.ada_vert_accel; packet1.acc_x = packet_in.acc_x; packet1.acc_y = packet_in.acc_y; packet1.acc_z = packet_in.acc_z; @@ -2401,7 +2400,8 @@ static void mavlink_test_rocket_flight_tm(uint8_t system_id, uint8_t component_i packet1.gps_fix = packet_in.gps_fix; packet1.pin_launch = packet_in.pin_launch; packet1.pin_nosecone = packet_in.pin_nosecone; - packet1.servo_sensor = packet_in.servo_sensor; + packet1.pin_expulsion = packet_in.pin_expulsion; + packet1.cutter_presence = packet_in.cutter_presence; packet1.logger_error = packet_in.logger_error; @@ -2417,12 +2417,12 @@ static void mavlink_test_rocket_flight_tm(uint8_t system_id, uint8_t component_i MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_rocket_flight_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.dpl_state , packet1.abk_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.msl_altitude , packet1.ada_vert_speed , packet1.ada_vert_accel , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.ab_angle , packet1.ab_estimated_cd , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_launch , packet1.pin_nosecone , packet1.servo_sensor , packet1.vbat , packet1.temperature , packet1.logger_error ); + mavlink_msg_rocket_flight_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.dpl_state , packet1.abk_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.altitude_agl , packet1.ada_vert_speed , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.ab_angle , packet1.ab_estimated_cd , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_launch , packet1.pin_nosecone , packet1.pin_expulsion , packet1.cutter_presence , packet1.vbat , packet1.temperature , packet1.logger_error ); mavlink_msg_rocket_flight_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_rocket_flight_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.dpl_state , packet1.abk_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.msl_altitude , packet1.ada_vert_speed , packet1.ada_vert_accel , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.ab_angle , packet1.ab_estimated_cd , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_launch , packet1.pin_nosecone , packet1.servo_sensor , packet1.vbat , packet1.temperature , packet1.logger_error ); + mavlink_msg_rocket_flight_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.dpl_state , packet1.abk_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.altitude_agl , packet1.ada_vert_speed , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.ab_angle , packet1.ab_estimated_cd , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_launch , packet1.pin_nosecone , packet1.pin_expulsion , packet1.cutter_presence , packet1.vbat , packet1.temperature , packet1.logger_error ); mavlink_msg_rocket_flight_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -2435,7 +2435,7 @@ static void mavlink_test_rocket_flight_tm(uint8_t system_id, uint8_t component_i MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_rocket_flight_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.dpl_state , packet1.abk_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.msl_altitude , packet1.ada_vert_speed , packet1.ada_vert_accel , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.ab_angle , packet1.ab_estimated_cd , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_launch , packet1.pin_nosecone , packet1.servo_sensor , packet1.vbat , packet1.temperature , packet1.logger_error ); + mavlink_msg_rocket_flight_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.dpl_state , packet1.abk_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.altitude_agl , packet1.ada_vert_speed , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.ab_angle , packet1.ab_estimated_cd , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_launch , packet1.pin_nosecone , packet1.pin_expulsion , packet1.cutter_presence , packet1.vbat , packet1.temperature , packet1.logger_error ); mavlink_msg_rocket_flight_tm_decode(last_msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -2457,7 +2457,7 @@ static void mavlink_test_payload_flight_tm(uint8_t system_id, uint8_t component_ uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint16_t i; mavlink_payload_flight_tm_t packet_in = { - 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,297.0,325.0,353.0,381.0,409.0,437.0,465.0,493.0,521.0,549.0,577.0,605.0,633.0,661.0,689.0,717.0,745.0,773.0,801.0,829.0,857.0,885.0,913.0,941.0,969.0,997.0,1025.0,1053.0,205,16,83,150,217,28 + 93372036854775807ULL,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,297.0,325.0,353.0,381.0,409.0,437.0,465.0,493.0,521.0,549.0,577.0,605.0,633.0,661.0,689.0,717.0,745.0,773.0,801.0,829.0,857.0,885.0,913.0,941.0,969.0,997.0,181,248,59,126,193,4 }; mavlink_payload_flight_tm_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); @@ -2467,9 +2467,7 @@ static void mavlink_test_payload_flight_tm(uint8_t system_id, uint8_t component_ packet1.pressure_static = packet_in.pressure_static; packet1.pressure_dpl = packet_in.pressure_dpl; packet1.airspeed_pitot = packet_in.airspeed_pitot; - packet1.msl_altitude = packet_in.msl_altitude; - packet1.ada_vert_speed = packet_in.ada_vert_speed; - packet1.ada_vert_accel = packet_in.ada_vert_accel; + packet1.altitude_agl = packet_in.altitude_agl; packet1.acc_x = packet_in.acc_x; packet1.acc_y = packet_in.acc_y; packet1.acc_z = packet_in.acc_z; @@ -2518,12 +2516,12 @@ static void mavlink_test_payload_flight_tm(uint8_t system_id, uint8_t component_ MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_payload_flight_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.msl_altitude , packet1.ada_vert_speed , packet1.ada_vert_accel , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_nosecone , packet1.vbat , packet1.vsupply_5v , packet1.temperature , packet1.logger_error ); + mavlink_msg_payload_flight_tm_pack(system_id, component_id, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.altitude_agl , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_nosecone , packet1.vbat , packet1.vsupply_5v , packet1.temperature , packet1.logger_error ); mavlink_msg_payload_flight_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_payload_flight_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.msl_altitude , packet1.ada_vert_speed , packet1.ada_vert_accel , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_nosecone , packet1.vbat , packet1.vsupply_5v , packet1.temperature , packet1.logger_error ); + mavlink_msg_payload_flight_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.altitude_agl , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_nosecone , packet1.vbat , packet1.vsupply_5v , packet1.temperature , packet1.logger_error ); mavlink_msg_payload_flight_tm_decode(&msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); @@ -2536,7 +2534,7 @@ static void mavlink_test_payload_flight_tm(uint8_t system_id, uint8_t component_ MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); memset(&packet2, 0, sizeof(packet2)); - mavlink_msg_payload_flight_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.msl_altitude , packet1.ada_vert_speed , packet1.ada_vert_accel , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_nosecone , packet1.vbat , packet1.vsupply_5v , packet1.temperature , packet1.logger_error ); + mavlink_msg_payload_flight_tm_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.ada_state , packet1.fmm_state , packet1.nas_state , packet1.pressure_ada , packet1.pressure_digi , packet1.pressure_static , packet1.pressure_dpl , packet1.airspeed_pitot , packet1.altitude_agl , packet1.acc_x , packet1.acc_y , packet1.acc_z , packet1.gyro_x , packet1.gyro_y , packet1.gyro_z , packet1.mag_x , packet1.mag_y , packet1.mag_z , packet1.gps_fix , packet1.gps_lat , packet1.gps_lon , packet1.gps_alt , packet1.nas_n , packet1.nas_e , packet1.nas_d , packet1.nas_vn , packet1.nas_ve , packet1.nas_vd , packet1.nas_qx , packet1.nas_qy , packet1.nas_qz , packet1.nas_qw , packet1.nas_bias_x , packet1.nas_bias_y , packet1.nas_bias_z , packet1.pin_nosecone , packet1.vbat , packet1.vsupply_5v , packet1.temperature , packet1.logger_error ); mavlink_msg_payload_flight_tm_decode(last_msg, &packet2); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); diff --git a/mavlink_lib/pyxis/version.h b/mavlink_lib/pyxis/version.h index 95e660c7b3fd54aa317c39cdd94a9b9d99d02bd2..54b0327df5b31ddad4c5f5776e263c1bfaf3d2d8 100644 --- a/mavlink_lib/pyxis/version.h +++ b/mavlink_lib/pyxis/version.h @@ -7,8 +7,8 @@ #ifndef MAVLINK_VERSION_H #define MAVLINK_VERSION_H -#define MAVLINK_BUILD_DATE "Sun Aug 14 2022" +#define MAVLINK_BUILD_DATE "Wed Aug 24 2022" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" -#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 166 +#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 163 #endif // MAVLINK_VERSION_H diff --git a/message_definitions/pyxis.xml b/message_definitions/pyxis.xml index 2903ab9fd361f4cf365b8f4c2319d58b1e12f219..a037a75649066264b30b8b9c1dbf2c7e414d1745 100644 --- a/message_definitions/pyxis.xml +++ b/message_definitions/pyxis.xml @@ -455,9 +455,8 @@ <field name="pressure_static" type="float" units="Pa">Pressure from static port</field> <field name="pressure_dpl" type="float" units="Pa">Pressure from deployment vane sensor</field> <field name="airspeed_pitot" type="float" units="m/s">Pitot airspeed</field> - <field name="msl_altitude" type="float" units="m">Altitude above mean sea level</field> + <field name="altitude_agl" type="float" units="m">Altitude above ground level</field> <field name="ada_vert_speed" type="float" units="m/s">Vertical speed estimated by ADA</field> - <field name="ada_vert_accel" type="float" units="m/s^2">Vertical acceleration estimated by ADA</field> <field name="acc_x" type="float" units="m/s^2">Acceleration on X axis (body)</field> <field name="acc_y" type="float" units="m/s^2">Acceleration on Y axis (body)</field> <field name="acc_z" type="float" units="m/s^2">Acceleration on Z axis (body)</field> @@ -488,7 +487,8 @@ <field name="nas_bias_z" type="float">Navigation system gyroscope bias on x axis</field> <field name="pin_launch" type="uint8_t">Launch pin status (1 = connected, 0 = disconnected)</field> <field name="pin_nosecone" type="uint8_t">Nosecone pin status (1 = connected, 0 = disconnected)</field> - <field name="servo_sensor" type="uint8_t">Servo sensor status (1 = actuated, 0 = idle)</field> + <field name="pin_expulsion" type="uint8_t">Servo sensor status (1 = actuated, 0 = idle)</field> + <field name="cutter_presence" type="uint8_t">Cutter presence status (1 = present, 0 = missing)</field> <field name="vbat" type="float" units="V">Battery voltage</field> <field name="temperature" type="float" units="degC">Temperature</field> <field name="logger_error" type="int8_t">Logger error (0 = no error, -1 otherwise)</field> @@ -505,9 +505,7 @@ <field name="pressure_static" type="float" units="Pa">Pressure from static port</field> <field name="pressure_dpl" type="float" units="Pa">Pressure from deployment vane sensor</field> <!-- TODO: RENAME --> <field name="airspeed_pitot" type="float" units="m/s">Pitot airspeed</field> - <field name="msl_altitude" type="float" units="m">Altitude above mean sea level</field> - <field name="ada_vert_speed" type="float" units="m/s">Vertical speed estimated by ADA</field> - <field name="ada_vert_accel" type="float" units="m/s^2">Vertical acceleration estimated by ADA</field> + <field name="altitude_agl" type="float" units="m">Altitude above ground level</field> <field name="acc_x" type="float" units="m/s^2">Acceleration on X axis (body)</field> <field name="acc_y" type="float" units="m/s^2">Acceleration on Y axis (body)</field> <field name="acc_z" type="float" units="m/s^2">Acceleration on Z axis (body)</field>