From 1d4094f921b69ebb000cfd2615f3b102198c1232 Mon Sep 17 00:00:00 2001 From: Alberto Nidasio <alberto.nidasio@skywarder.eu> Date: Mon, 5 Sep 2022 00:03:42 +0200 Subject: [PATCH] [Pyxis] Updated servo motors parameters --- mavlink_lib/pyxis/mavlink.h | 2 +- mavlink_lib/pyxis/mavlink_msg_fsm_tm.h | 10 +- .../pyxis/mavlink_msg_payload_flight_tm.h | 388 ++++++++++-------- .../pyxis/mavlink_msg_rocket_flight_tm.h | 88 ++-- mavlink_lib/pyxis/pyxis.h | 14 +- mavlink_lib/pyxis/testsuite.h | 20 +- mavlink_lib/pyxis/version.h | 2 +- message_definitions/pyxis.xml | 14 +- 8 files changed, 296 insertions(+), 242 deletions(-) diff --git a/mavlink_lib/pyxis/mavlink.h b/mavlink_lib/pyxis/mavlink.h index 4959e01..ca3096c 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 7385479015685416320 +#define MAVLINK_PRIMARY_XML_HASH 5995035090138037098 #ifndef MAVLINK_STX #define MAVLINK_STX 254 diff --git a/mavlink_lib/pyxis/mavlink_msg_fsm_tm.h b/mavlink_lib/pyxis/mavlink_msg_fsm_tm.h index 099f3a7..b64c9f6 100644 --- a/mavlink_lib/pyxis/mavlink_msg_fsm_tm.h +++ b/mavlink_lib/pyxis/mavlink_msg_fsm_tm.h @@ -7,7 +7,7 @@ typedef struct __mavlink_fsm_tm_t { uint64_t timestamp; /*< [us] Timestamp*/ uint8_t ada_state; /*< Apogee Detection Algorithm state*/ - uint8_t abk_state; /*< AirBrakes state*/ + uint8_t abk_state; /*< Air Brakes state*/ uint8_t dpl_state; /*< Deployment state*/ uint8_t fmm_state; /*< Flight Mode Manager state*/ uint8_t fsr_state; /*< Flight Stats Recorder state*/ @@ -61,7 +61,7 @@ typedef struct __mavlink_fsm_tm_t { * * @param timestamp [us] Timestamp * @param ada_state Apogee Detection Algorithm state - * @param abk_state AirBrakes state + * @param abk_state Air Brakes state * @param dpl_state Deployment state * @param fmm_state Flight Mode Manager state * @param fsr_state Flight Stats Recorder state @@ -107,7 +107,7 @@ static inline uint16_t mavlink_msg_fsm_tm_pack(uint8_t system_id, uint8_t compon * @param msg The MAVLink message to compress the data into * @param timestamp [us] Timestamp * @param ada_state Apogee Detection Algorithm state - * @param abk_state AirBrakes state + * @param abk_state Air Brakes state * @param dpl_state Deployment state * @param fmm_state Flight Mode Manager state * @param fsr_state Flight Stats Recorder state @@ -179,7 +179,7 @@ static inline uint16_t mavlink_msg_fsm_tm_encode_chan(uint8_t system_id, uint8_t * * @param timestamp [us] Timestamp * @param ada_state Apogee Detection Algorithm state - * @param abk_state AirBrakes state + * @param abk_state Air Brakes state * @param dpl_state Deployment state * @param fmm_state Flight Mode Manager state * @param fsr_state Flight Stats Recorder state @@ -292,7 +292,7 @@ static inline uint8_t mavlink_msg_fsm_tm_get_ada_state(const mavlink_message_t* /** * @brief Get field abk_state from fsm_tm message * - * @return AirBrakes state + * @return Air Brakes state */ static inline uint8_t mavlink_msg_fsm_tm_get_abk_state(const mavlink_message_t* msg) { diff --git a/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h b/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h index 3370efb..46afea6 100644 --- a/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h +++ b/mavlink_lib/pyxis/mavlink_msg_payload_flight_tm.h @@ -24,6 +24,8 @@ typedef struct __mavlink_payload_flight_tm_t { float gps_lat; /*< [deg] Latitude*/ float gps_lon; /*< [deg] Longitude*/ float gps_alt; /*< [m] GPS Altitude*/ + float left_servo_angle; /*< [deg] Left servo motor angle*/ + float right_servo_angle; /*< [deg] Right servo motor angle*/ float nas_n; /*< [deg] Navigation system estimated noth position*/ float nas_e; /*< [deg] Navigation system estimated east position*/ float nas_d; /*< [m] Navigation system estimated down position*/ @@ -48,13 +50,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 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_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_CRC 223 -#define MAVLINK_MSG_ID_209_CRC 223 +#define MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_CRC 193 +#define MAVLINK_MSG_ID_209_CRC 193 @@ -62,11 +64,11 @@ typedef struct __mavlink_payload_flight_tm_t { #define MAVLINK_MESSAGE_INFO_PAYLOAD_FLIGHT_TM { \ 209, \ "PAYLOAD_FLIGHT_TM", \ - 41, \ + 43, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_flight_tm_t, timestamp) }, \ - { "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) }, \ + { "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) }, \ { "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) }, \ @@ -82,38 +84,40 @@ typedef struct __mavlink_payload_flight_tm_t { { "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_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 155, 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) }, \ + { "left_servo_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_flight_tm_t, left_servo_angle) }, \ + { "right_servo_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_flight_tm_t, right_servo_angle) }, \ + { "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) }, \ } \ } #else #define MAVLINK_MESSAGE_INFO_PAYLOAD_FLIGHT_TM { \ "PAYLOAD_FLIGHT_TM", \ - 41, \ + 43, \ { { "timestamp", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_flight_tm_t, timestamp) }, \ - { "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) }, \ + { "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) }, \ { "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) }, \ @@ -129,28 +133,30 @@ typedef struct __mavlink_payload_flight_tm_t { { "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_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 155, 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) }, \ + { "left_servo_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_flight_tm_t, left_servo_angle) }, \ + { "right_servo_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_flight_tm_t, right_servo_angle) }, \ + { "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) }, \ } \ } #endif @@ -184,6 +190,8 @@ typedef struct __mavlink_payload_flight_tm_t { * @param gps_lat [deg] Latitude * @param gps_lon [deg] Longitude * @param gps_alt [m] GPS Altitude + * @param left_servo_angle [deg] Left servo motor angle + * @param right_servo_angle [deg] Right servo motor angle * @param nas_n [deg] Navigation system estimated noth position * @param nas_e [deg] Navigation system estimated east position * @param nas_d [m] Navigation system estimated down position @@ -205,7 +213,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 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) + 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 left_servo_angle, float right_servo_angle, 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]; @@ -228,28 +236,30 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uin _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_put_float(buf, 80, left_servo_angle); + _mav_put_float(buf, 84, right_servo_angle); + _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); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN); #else @@ -273,6 +283,8 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uin packet.gps_lat = gps_lat; packet.gps_lon = gps_lon; packet.gps_alt = gps_alt; + packet.left_servo_angle = left_servo_angle; + packet.right_servo_angle = right_servo_angle; packet.nas_n = nas_n; packet.nas_e = nas_e; packet.nas_d = nas_d; @@ -332,6 +344,8 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack(uint8_t system_id, uin * @param gps_lat [deg] Latitude * @param gps_lon [deg] Longitude * @param gps_alt [m] GPS Altitude + * @param left_servo_angle [deg] Left servo motor angle + * @param right_servo_angle [deg] Right servo motor angle * @param nas_n [deg] Navigation system estimated noth position * @param nas_e [deg] Navigation system estimated east position * @param nas_d [m] Navigation system estimated down position @@ -354,7 +368,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 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) + 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 left_servo_angle,float right_servo_angle,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]; @@ -377,28 +391,30 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack_chan(uint8_t system_id _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_put_float(buf, 80, left_servo_angle); + _mav_put_float(buf, 84, right_servo_angle); + _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); memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PAYLOAD_FLIGHT_TM_LEN); #else @@ -422,6 +438,8 @@ static inline uint16_t mavlink_msg_payload_flight_tm_pack_chan(uint8_t system_id packet.gps_lat = gps_lat; packet.gps_lon = gps_lon; packet.gps_alt = gps_alt; + packet.left_servo_angle = left_servo_angle; + packet.right_servo_angle = right_servo_angle; packet.nas_n = nas_n; packet.nas_e = nas_e; packet.nas_d = nas_d; @@ -462,7 +480,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->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); + 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->left_servo_angle, payload_flight_tm->right_servo_angle, 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); } /** @@ -476,7 +494,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->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); + 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->left_servo_angle, payload_flight_tm->right_servo_angle, 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); } /** @@ -506,6 +524,8 @@ static inline uint16_t mavlink_msg_payload_flight_tm_encode_chan(uint8_t system_ * @param gps_lat [deg] Latitude * @param gps_lon [deg] Longitude * @param gps_alt [m] GPS Altitude + * @param left_servo_angle [deg] Left servo motor angle + * @param right_servo_angle [deg] Right servo motor angle * @param nas_n [deg] Navigation system estimated noth position * @param nas_e [deg] Navigation system estimated east position * @param nas_d [m] Navigation system estimated down position @@ -527,7 +547,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 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) +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 left_servo_angle, float right_servo_angle, 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]; @@ -550,28 +570,30 @@ static inline void mavlink_msg_payload_flight_tm_send(mavlink_channel_t chan, ui _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_put_float(buf, 80, left_servo_angle); + _mav_put_float(buf, 84, right_servo_angle); + _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_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 @@ -595,6 +617,8 @@ static inline void mavlink_msg_payload_flight_tm_send(mavlink_channel_t chan, ui packet.gps_lat = gps_lat; packet.gps_lon = gps_lon; packet.gps_alt = gps_alt; + packet.left_servo_angle = left_servo_angle; + packet.right_servo_angle = right_servo_angle; packet.nas_n = nas_n; packet.nas_e = nas_e; packet.nas_d = nas_d; @@ -630,7 +654,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->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); + 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->left_servo_angle, payload_flight_tm->right_servo_angle, 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 @@ -644,7 +668,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 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) +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 left_servo_angle, float right_servo_angle, 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; @@ -667,28 +691,30 @@ static inline void mavlink_msg_payload_flight_tm_send_buf(mavlink_message_t *msg _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_put_float(buf, 80, left_servo_angle); + _mav_put_float(buf, 84, right_servo_angle); + _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_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 @@ -712,6 +738,8 @@ static inline void mavlink_msg_payload_flight_tm_send_buf(mavlink_message_t *msg packet->gps_lat = gps_lat; packet->gps_lon = gps_lon; packet->gps_alt = gps_alt; + packet->left_servo_angle = left_servo_angle; + packet->right_servo_angle = right_servo_angle; packet->nas_n = nas_n; packet->nas_e = nas_e; packet->nas_d = nas_d; @@ -762,7 +790,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, 144); + return _MAV_RETURN_uint8_t(msg, 152); } /** @@ -772,7 +800,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, 145); + return _MAV_RETURN_uint8_t(msg, 153); } /** @@ -782,7 +810,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, 146); + return _MAV_RETURN_uint8_t(msg, 154); } /** @@ -942,7 +970,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, 147); + return _MAV_RETURN_uint8_t(msg, 155); } /** @@ -975,6 +1003,26 @@ static inline float mavlink_msg_payload_flight_tm_get_gps_alt(const mavlink_mess return _MAV_RETURN_float(msg, 76); } +/** + * @brief Get field left_servo_angle from payload_flight_tm message + * + * @return [deg] Left servo motor angle + */ +static inline float mavlink_msg_payload_flight_tm_get_left_servo_angle(const mavlink_message_t* msg) +{ + return _MAV_RETURN_float(msg, 80); +} + +/** + * @brief Get field right_servo_angle from payload_flight_tm message + * + * @return [deg] Right servo motor angle + */ +static inline float mavlink_msg_payload_flight_tm_get_right_servo_angle(const mavlink_message_t* msg) +{ + return _MAV_RETURN_float(msg, 84); +} + /** * @brief Get field nas_n from payload_flight_tm message * @@ -982,7 +1030,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, 80); + return _MAV_RETURN_float(msg, 88); } /** @@ -992,7 +1040,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, 84); + return _MAV_RETURN_float(msg, 92); } /** @@ -1002,7 +1050,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, 88); + return _MAV_RETURN_float(msg, 96); } /** @@ -1012,7 +1060,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, 92); + return _MAV_RETURN_float(msg, 100); } /** @@ -1022,7 +1070,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, 96); + return _MAV_RETURN_float(msg, 104); } /** @@ -1032,7 +1080,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, 100); + return _MAV_RETURN_float(msg, 108); } /** @@ -1042,7 +1090,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, 104); + return _MAV_RETURN_float(msg, 112); } /** @@ -1052,7 +1100,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, 108); + return _MAV_RETURN_float(msg, 116); } /** @@ -1062,7 +1110,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, 112); + return _MAV_RETURN_float(msg, 120); } /** @@ -1072,7 +1120,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, 116); + return _MAV_RETURN_float(msg, 124); } /** @@ -1082,7 +1130,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, 120); + return _MAV_RETURN_float(msg, 128); } /** @@ -1092,7 +1140,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, 124); + return _MAV_RETURN_float(msg, 132); } /** @@ -1102,7 +1150,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, 128); + return _MAV_RETURN_float(msg, 136); } /** @@ -1112,7 +1160,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, 148); + return _MAV_RETURN_uint8_t(msg, 156); } /** @@ -1122,7 +1170,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, 132); + return _MAV_RETURN_float(msg, 140); } /** @@ -1132,7 +1180,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, 136); + return _MAV_RETURN_float(msg, 144); } /** @@ -1142,7 +1190,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, 140); + return _MAV_RETURN_float(msg, 148); } /** @@ -1152,7 +1200,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, 149); + return _MAV_RETURN_int8_t(msg, 157); } /** @@ -1183,6 +1231,8 @@ static inline void mavlink_msg_payload_flight_tm_decode(const mavlink_message_t* payload_flight_tm->gps_lat = mavlink_msg_payload_flight_tm_get_gps_lat(msg); payload_flight_tm->gps_lon = mavlink_msg_payload_flight_tm_get_gps_lon(msg); payload_flight_tm->gps_alt = mavlink_msg_payload_flight_tm_get_gps_alt(msg); + payload_flight_tm->left_servo_angle = mavlink_msg_payload_flight_tm_get_left_servo_angle(msg); + payload_flight_tm->right_servo_angle = mavlink_msg_payload_flight_tm_get_right_servo_angle(msg); payload_flight_tm->nas_n = mavlink_msg_payload_flight_tm_get_nas_n(msg); payload_flight_tm->nas_e = mavlink_msg_payload_flight_tm_get_nas_e(msg); payload_flight_tm->nas_d = mavlink_msg_payload_flight_tm_get_nas_d(msg); diff --git a/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h b/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h index 088796d..f838fb4 100644 --- a/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h +++ b/mavlink_lib/pyxis/mavlink_msg_rocket_flight_tm.h @@ -25,8 +25,8 @@ typedef struct __mavlink_rocket_flight_tm_t { float gps_lat; /*< [deg] Latitude*/ float gps_lon; /*< [deg] Longitude*/ float gps_alt; /*< [m] GPS Altitude*/ - float ab_angle; /*< [deg] Airbrakes angle*/ - float ab_estimated_cd; /*< Estimated drag coefficient*/ + float abk_angle; /*< [deg] Air Brakes angle*/ + float abk_estimated_cd; /*< Estimated drag coefficient*/ float nas_n; /*< [deg] Navigation system estimated noth position*/ float nas_e; /*< [deg] Navigation system estimated east position*/ float nas_d; /*< [m] Navigation system estimated down position*/ @@ -60,8 +60,8 @@ typedef struct __mavlink_rocket_flight_tm_t { #define MAVLINK_MSG_ID_208_LEN 163 #define MAVLINK_MSG_ID_208_MIN_LEN 163 -#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC 252 -#define MAVLINK_MSG_ID_208_CRC 252 +#define MAVLINK_MSG_ID_ROCKET_FLIGHT_TM_CRC 189 +#define MAVLINK_MSG_ID_208_CRC 189 @@ -96,8 +96,8 @@ typedef struct __mavlink_rocket_flight_tm_t { { "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) }, \ + { "abk_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_flight_tm_t, abk_angle) }, \ + { "abk_estimated_cd", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_flight_tm_t, abk_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) }, \ @@ -150,8 +150,8 @@ typedef struct __mavlink_rocket_flight_tm_t { { "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) }, \ + { "abk_angle", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_flight_tm_t, abk_angle) }, \ + { "abk_estimated_cd", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_flight_tm_t, abk_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) }, \ @@ -208,8 +208,8 @@ typedef struct __mavlink_rocket_flight_tm_t { * @param gps_lat [deg] Latitude * @param gps_lon [deg] Longitude * @param gps_alt [m] GPS Altitude - * @param ab_angle [deg] Airbrakes angle - * @param ab_estimated_cd Estimated drag coefficient + * @param abk_angle [deg] Air Brakes angle + * @param abk_estimated_cd Estimated drag coefficient * @param nas_n [deg] Navigation system estimated noth position * @param nas_e [deg] Navigation system estimated east position * @param nas_d [m] Navigation system estimated down position @@ -233,7 +233,7 @@ typedef struct __mavlink_rocket_flight_tm_t { * @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 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) + 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 abk_angle, float abk_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]; @@ -257,8 +257,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint _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, 84, abk_angle); + _mav_put_float(buf, 88, abk_estimated_cd); _mav_put_float(buf, 92, nas_n); _mav_put_float(buf, 96, nas_e); _mav_put_float(buf, 100, nas_d); @@ -309,8 +309,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint packet.gps_lat = gps_lat; packet.gps_lon = gps_lon; packet.gps_alt = gps_alt; - packet.ab_angle = ab_angle; - packet.ab_estimated_cd = ab_estimated_cd; + packet.abk_angle = abk_angle; + packet.abk_estimated_cd = abk_estimated_cd; packet.nas_n = nas_n; packet.nas_e = nas_e; packet.nas_d = nas_d; @@ -377,8 +377,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack(uint8_t system_id, uint * @param gps_lat [deg] Latitude * @param gps_lon [deg] Longitude * @param gps_alt [m] GPS Altitude - * @param ab_angle [deg] Airbrakes angle - * @param ab_estimated_cd Estimated drag coefficient + * @param abk_angle [deg] Air Brakes angle + * @param abk_estimated_cd Estimated drag coefficient * @param nas_n [deg] Navigation system estimated noth position * @param nas_e [deg] Navigation system estimated east position * @param nas_d [m] Navigation system estimated down position @@ -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 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) + 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 abk_angle,float abk_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]; @@ -427,8 +427,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack_chan(uint8_t system_id, _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, 84, abk_angle); + _mav_put_float(buf, 88, abk_estimated_cd); _mav_put_float(buf, 92, nas_n); _mav_put_float(buf, 96, nas_e); _mav_put_float(buf, 100, nas_d); @@ -479,8 +479,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_pack_chan(uint8_t system_id, packet.gps_lat = gps_lat; packet.gps_lon = gps_lon; packet.gps_alt = gps_alt; - packet.ab_angle = ab_angle; - packet.ab_estimated_cd = ab_estimated_cd; + packet.abk_angle = abk_angle; + packet.abk_estimated_cd = abk_estimated_cd; packet.nas_n = nas_n; packet.nas_e = nas_e; packet.nas_d = nas_d; @@ -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->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); + 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->abk_angle, rocket_flight_tm->abk_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->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); + 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->abk_angle, rocket_flight_tm->abk_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); } /** @@ -572,8 +572,8 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_encode_chan(uint8_t system_i * @param gps_lat [deg] Latitude * @param gps_lon [deg] Longitude * @param gps_alt [m] GPS Altitude - * @param ab_angle [deg] Airbrakes angle - * @param ab_estimated_cd Estimated drag coefficient + * @param abk_angle [deg] Air Brakes angle + * @param abk_estimated_cd Estimated drag coefficient * @param nas_n [deg] Navigation system estimated noth position * @param nas_e [deg] Navigation system estimated east position * @param nas_d [m] Navigation system estimated down position @@ -597,7 +597,7 @@ static inline uint16_t mavlink_msg_rocket_flight_tm_encode_chan(uint8_t system_i */ #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 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) +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 abk_angle, float abk_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]; @@ -621,8 +621,8 @@ static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uin _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, 84, abk_angle); + _mav_put_float(buf, 88, abk_estimated_cd); _mav_put_float(buf, 92, nas_n); _mav_put_float(buf, 96, nas_e); _mav_put_float(buf, 100, nas_d); @@ -673,8 +673,8 @@ static inline void mavlink_msg_rocket_flight_tm_send(mavlink_channel_t chan, uin packet.gps_lat = gps_lat; packet.gps_lon = gps_lon; packet.gps_alt = gps_alt; - packet.ab_angle = ab_angle; - packet.ab_estimated_cd = ab_estimated_cd; + packet.abk_angle = abk_angle; + packet.abk_estimated_cd = abk_estimated_cd; packet.nas_n = nas_n; packet.nas_e = nas_e; packet.nas_d = nas_d; @@ -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->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); + 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->abk_angle, rocket_flight_tm->abk_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 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) +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 abk_angle, float abk_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; @@ -752,8 +752,8 @@ static inline void mavlink_msg_rocket_flight_tm_send_buf(mavlink_message_t *msgb _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, 84, abk_angle); + _mav_put_float(buf, 88, abk_estimated_cd); _mav_put_float(buf, 92, nas_n); _mav_put_float(buf, 96, nas_e); _mav_put_float(buf, 100, nas_d); @@ -804,8 +804,8 @@ static inline void mavlink_msg_rocket_flight_tm_send_buf(mavlink_message_t *msgb packet->gps_lat = gps_lat; packet->gps_lon = gps_lon; packet->gps_alt = gps_alt; - packet->ab_angle = ab_angle; - packet->ab_estimated_cd = ab_estimated_cd; + packet->abk_angle = abk_angle; + packet->abk_estimated_cd = abk_estimated_cd; packet->nas_n = nas_n; packet->nas_e = nas_e; packet->nas_d = nas_d; @@ -1104,21 +1104,21 @@ static inline float mavlink_msg_rocket_flight_tm_get_gps_alt(const mavlink_messa } /** - * @brief Get field ab_angle from rocket_flight_tm message + * @brief Get field abk_angle from rocket_flight_tm message * - * @return [deg] Airbrakes angle + * @return [deg] Air Brakes angle */ -static inline float mavlink_msg_rocket_flight_tm_get_ab_angle(const mavlink_message_t* msg) +static inline float mavlink_msg_rocket_flight_tm_get_abk_angle(const mavlink_message_t* msg) { return _MAV_RETURN_float(msg, 84); } /** - * @brief Get field ab_estimated_cd from rocket_flight_tm message + * @brief Get field abk_estimated_cd from rocket_flight_tm message * * @return Estimated drag coefficient */ -static inline float mavlink_msg_rocket_flight_tm_get_ab_estimated_cd(const mavlink_message_t* msg) +static inline float mavlink_msg_rocket_flight_tm_get_abk_estimated_cd(const mavlink_message_t* msg) { return _MAV_RETURN_float(msg, 88); } @@ -1352,8 +1352,8 @@ static inline void mavlink_msg_rocket_flight_tm_decode(const mavlink_message_t* rocket_flight_tm->gps_lat = mavlink_msg_rocket_flight_tm_get_gps_lat(msg); rocket_flight_tm->gps_lon = mavlink_msg_rocket_flight_tm_get_gps_lon(msg); rocket_flight_tm->gps_alt = mavlink_msg_rocket_flight_tm_get_gps_alt(msg); - rocket_flight_tm->ab_angle = mavlink_msg_rocket_flight_tm_get_ab_angle(msg); - rocket_flight_tm->ab_estimated_cd = mavlink_msg_rocket_flight_tm_get_ab_estimated_cd(msg); + rocket_flight_tm->abk_angle = mavlink_msg_rocket_flight_tm_get_abk_angle(msg); + rocket_flight_tm->abk_estimated_cd = mavlink_msg_rocket_flight_tm_get_abk_estimated_cd(msg); rocket_flight_tm->nas_n = mavlink_msg_rocket_flight_tm_get_nas_n(msg); rocket_flight_tm->nas_e = mavlink_msg_rocket_flight_tm_get_nas_e(msg); rocket_flight_tm->nas_d = mavlink_msg_rocket_flight_tm_get_nas_d(msg); diff --git a/mavlink_lib/pyxis/pyxis.h b/mavlink_lib/pyxis/pyxis.h index 58561dd..b9e70eb 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 7385479015685416320 +#define MAVLINK_THIS_XML_HASH 5995035090138037098 #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, 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, 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} +#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, 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, 14, 14, 46, 28, 27, 49, 77, 30, 163, 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} #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, 175, 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, 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} +#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, 175, 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, 183, 69, 142, 108, 133, 79, 66, 169, 189, 193, 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" @@ -108,10 +108,10 @@ typedef enum MavCommandList #define HAVE_ENUM_ServosList typedef enum ServosList { - AIRBRAKES_SERVO=1, /* | */ + AIR_BRAKES_SERVO=1, /* | */ EXPULSION_SERVO=2, /* | */ - PARAFOIL_SERVO1=3, /* | */ - PARAFOIL_SERVO2=4, /* | */ + PARAFOIL_LEFT_SERVO=3, /* | */ + PARAFOIL_RIGHT_SERVO=4, /* | */ ServosList_ENUM_END=5, /* | */ } ServosList; #endif @@ -187,7 +187,7 @@ typedef enum PinsList #undef MAVLINK_THIS_XML_HASH -#define MAVLINK_THIS_XML_HASH 7385479015685416320 +#define MAVLINK_THIS_XML_HASH 5995035090138037098 #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_VOLTAGE_TM, MAVLINK_MESSAGE_INFO_CURRENT_TM, MAVLINK_MESSAGE_INFO_TEMP_TM, MAVLINK_MESSAGE_INFO_LOAD_TM, MAVLINK_MESSAGE_INFO_ATTITUDE_TM, MAVLINK_MESSAGE_INFO_SENSOR_STATE_TM, MAVLINK_MESSAGE_INFO_SERVO_TM, MAVLINK_MESSAGE_INFO_PIN_TM, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"EMPTY",0,{{"","",MAVLINK_TYPE_CHAR,0,0,0}}}, {"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 5e6d5e2..5f19e5f 100644 --- a/mavlink_lib/pyxis/testsuite.h +++ b/mavlink_lib/pyxis/testsuite.h @@ -2436,8 +2436,8 @@ static void mavlink_test_rocket_flight_tm(uint8_t system_id, uint8_t component_i packet1.gps_lat = packet_in.gps_lat; packet1.gps_lon = packet_in.gps_lon; packet1.gps_alt = packet_in.gps_alt; - packet1.ab_angle = packet_in.ab_angle; - packet1.ab_estimated_cd = packet_in.ab_estimated_cd; + packet1.abk_angle = packet_in.abk_angle; + packet1.abk_estimated_cd = packet_in.abk_estimated_cd; packet1.nas_n = packet_in.nas_n; packet1.nas_e = packet_in.nas_e; packet1.nas_d = packet_in.nas_d; @@ -2478,12 +2478,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.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_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.abk_angle , packet1.abk_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.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_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.abk_angle , packet1.abk_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); @@ -2496,7 +2496,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.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_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.abk_angle , packet1.abk_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); @@ -2518,7 +2518,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,181,248,59,126,193,4 + 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 }; mavlink_payload_flight_tm_t packet1, packet2; memset(&packet1, 0, sizeof(packet1)); @@ -2541,6 +2541,8 @@ static void mavlink_test_payload_flight_tm(uint8_t system_id, uint8_t component_ packet1.gps_lat = packet_in.gps_lat; packet1.gps_lon = packet_in.gps_lon; packet1.gps_alt = packet_in.gps_alt; + packet1.left_servo_angle = packet_in.left_servo_angle; + packet1.right_servo_angle = packet_in.right_servo_angle; packet1.nas_n = packet_in.nas_n; packet1.nas_e = packet_in.nas_e; packet1.nas_d = packet_in.nas_d; @@ -2577,12 +2579,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.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_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.left_servo_angle , packet1.right_servo_angle , 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.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_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.left_servo_angle , packet1.right_servo_angle , 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); @@ -2595,7 +2597,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.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_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.left_servo_angle , packet1.right_servo_angle , 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 954da11..1d8905d 100644 --- a/mavlink_lib/pyxis/version.h +++ b/mavlink_lib/pyxis/version.h @@ -7,7 +7,7 @@ #ifndef MAVLINK_VERSION_H #define MAVLINK_VERSION_H -#define MAVLINK_BUILD_DATE "Sun Sep 04 2022" +#define MAVLINK_BUILD_DATE "Mon Sep 05 2022" #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0" #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 163 diff --git a/message_definitions/pyxis.xml b/message_definitions/pyxis.xml index 33b6b34..68107bd 100644 --- a/message_definitions/pyxis.xml +++ b/message_definitions/pyxis.xml @@ -139,10 +139,10 @@ </enum> <enum name="ServosList"> <description>Enum of all the servos used on Pyxis</description> - <entry name="AIRBRAKES_SERVO" value="1"></entry> + <entry name="AIR_BRAKES_SERVO" value="1"></entry> <entry name="EXPULSION_SERVO" value="2"></entry> - <entry name="PARAFOIL_SERVO1" value="3"></entry> - <entry name="PARAFOIL_SERVO2" value="4"></entry> + <entry name="PARAFOIL_LEFT_SERVO" value="3"></entry> + <entry name="PARAFOIL_RIGHT_SERVO" value="4"></entry> </enum> <enum name="PinsList"> <description>Enum of all the pins used on Pyxis</description> @@ -352,7 +352,7 @@ <description>Flight State Machine status telemetry</description> <field name="timestamp" type="uint64_t" units="us">Timestamp</field> <field name="ada_state" type="uint8_t">Apogee Detection Algorithm state</field> - <field name="abk_state" type="uint8_t">AirBrakes state</field> + <field name="abk_state" type="uint8_t">Air Brakes state</field> <field name="dpl_state" type="uint8_t">Deployment state</field> <field name="fmm_state" type="uint8_t">Flight Mode Manager state</field> <field name="fsr_state" type="uint8_t">Flight Stats Recorder state</field> @@ -476,8 +476,8 @@ <field name="gps_lat" type="float" units="deg">Latitude</field> <field name="gps_lon" type="float" units="deg">Longitude</field> <field name="gps_alt" type="float" units="m">GPS Altitude</field> - <field name="ab_angle" type="float" units="deg">Airbrakes angle</field> - <field name="ab_estimated_cd" type="float">Estimated drag coefficient</field> + <field name="abk_angle" type="float" units="deg">Air Brakes angle</field> + <field name="abk_estimated_cd" type="float">Estimated drag coefficient</field> <field name="nas_n" type="float" units="deg">Navigation system estimated noth position</field> <field name="nas_e" type="float" units="deg">Navigation system estimated east position</field> <field name="nas_d" type="float" units="m">Navigation system estimated down position</field> @@ -525,6 +525,8 @@ <field name="gps_lat" type="float" units="deg">Latitude</field> <field name="gps_lon" type="float" units="deg">Longitude</field> <field name="gps_alt" type="float" units="m">GPS Altitude</field> + <field name="left_servo_angle" type="float" units="deg">Left servo motor angle</field> + <field name="right_servo_angle" type="float" units="deg">Right servo motor angle</field> <field name="nas_n" type="float" units="deg">Navigation system estimated noth position</field> <field name="nas_e" type="float" units="deg">Navigation system estimated east position</field> <field name="nas_d" type="float" units="m">Navigation system estimated down position</field> -- GitLab