From 20bfb50c4199e6699e4108a6a6e6b3a744504912 Mon Sep 17 00:00:00 2001
From: Matteo Pignataro <matteo.pignataro@skywarder.eu>
Date: Thu, 8 Sep 2022 10:10:52 +0200
Subject: [PATCH] [Mavlink] changed rocket and payload stats

---
 mavlink_lib/pyxis/mavlink.h                   |   2 +-
 .../pyxis/mavlink_msg_payload_stats_tm.h      | 426 ++++++--------
 .../pyxis/mavlink_msg_rocket_stats_tm.h       | 522 +++++++-----------
 mavlink_lib/pyxis/pyxis.h                     |   8 +-
 mavlink_lib/pyxis/testsuite.h                 |  42 +-
 mavlink_lib/pyxis/version.h                   |   2 +-
 message_definitions/pyxis.xml                 |  26 +-
 7 files changed, 379 insertions(+), 649 deletions(-)

diff --git a/mavlink_lib/pyxis/mavlink.h b/mavlink_lib/pyxis/mavlink.h
index ca3096c..3269282 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 5995035090138037098
+#define MAVLINK_PRIMARY_XML_HASH -1786394334196858732
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 254
diff --git a/mavlink_lib/pyxis/mavlink_msg_payload_stats_tm.h b/mavlink_lib/pyxis/mavlink_msg_payload_stats_tm.h
index 9a226a3..c0b40b0 100644
--- a/mavlink_lib/pyxis/mavlink_msg_payload_stats_tm.h
+++ b/mavlink_lib/pyxis/mavlink_msg_payload_stats_tm.h
@@ -5,34 +5,30 @@
 
 
 typedef struct __mavlink_payload_stats_tm_t {
- uint64_t liftoff_ts; /*< [us] System clock at liftoff*/
  uint64_t liftoff_max_acc_ts; /*< [us] System clock at the maximum liftoff acceleration*/
+ uint64_t dpl_ts; /*< [us] System clock at drouge deployment*/
  uint64_t max_z_speed_ts; /*< [us] System clock at ADA max vertical speed*/
  uint64_t apogee_ts; /*< [us] System clock at apogee*/
- uint64_t drogue_dpl_ts; /*< [us] System clock at drouge deployment*/
  float liftoff_max_acc; /*< [m/s2] Maximum liftoff acceleration*/
+ float dpl_max_acc; /*< [m/s2] Max acceleration during drouge deployment*/
  float max_z_speed; /*< [m/s] Max measured vertical speed - ADA*/
  float max_airspeed_pitot; /*< [m/s] Max speed read by the pitot tube*/
  float max_speed_altitude; /*< [m] Altitude at max speed*/
  float apogee_lat; /*< [deg] Apogee latitude*/
  float apogee_lon; /*< [deg] Apogee longitude*/
- float static_min_pressure; /*< [Pa] Apogee pressure - Static ports*/
- float digital_min_pressure; /*< [Pa] Apogee pressure - Digital barometer*/
- float ada_min_pressure; /*< [Pa] Apogee pressure - ADA filtered*/
- float baro_max_altitude; /*< [m] Apogee altitude - Digital barometer*/
- float gps_max_altitude; /*< [m] Apogee altitude - GPS*/
- float drogue_dpl_max_acc; /*< [m/s2] Max acceleration during drouge deployment*/
+ float apogee_alt; /*< [m] Apogee altitude*/
+ float min_pressure; /*< [Pa] Apogee pressure - Digital barometer*/
  float cpu_load; /*<  CPU load in percentage*/
  uint32_t free_heap; /*<  Amount of available heap in memory*/
 } mavlink_payload_stats_tm_t;
 
-#define MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN 96
-#define MAVLINK_MSG_ID_PAYLOAD_STATS_TM_MIN_LEN 96
-#define MAVLINK_MSG_ID_211_LEN 96
-#define MAVLINK_MSG_ID_211_MIN_LEN 96
+#define MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN 76
+#define MAVLINK_MSG_ID_PAYLOAD_STATS_TM_MIN_LEN 76
+#define MAVLINK_MSG_ID_211_LEN 76
+#define MAVLINK_MSG_ID_211_MIN_LEN 76
 
-#define MAVLINK_MSG_ID_PAYLOAD_STATS_TM_CRC 155
-#define MAVLINK_MSG_ID_211_CRC 155
+#define MAVLINK_MSG_ID_PAYLOAD_STATS_TM_CRC 115
+#define MAVLINK_MSG_ID_211_CRC 115
 
 
 
@@ -40,51 +36,43 @@ typedef struct __mavlink_payload_stats_tm_t {
 #define MAVLINK_MESSAGE_INFO_PAYLOAD_STATS_TM { \
     211, \
     "PAYLOAD_STATS_TM", \
-    19, \
-    {  { "liftoff_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_stats_tm_t, liftoff_ts) }, \
-         { "liftoff_max_acc_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc_ts) }, \
-         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc) }, \
+    15, \
+    {  { "liftoff_max_acc_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc_ts) }, \
+         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc) }, \
+         { "dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_payload_stats_tm_t, dpl_ts) }, \
+         { "dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_payload_stats_tm_t, dpl_max_acc) }, \
          { "max_z_speed_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_payload_stats_tm_t, max_z_speed_ts) }, \
-         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_stats_tm_t, max_z_speed) }, \
-         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_stats_tm_t, max_airspeed_pitot) }, \
-         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_stats_tm_t, max_speed_altitude) }, \
+         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_stats_tm_t, max_z_speed) }, \
+         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_stats_tm_t, max_airspeed_pitot) }, \
+         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_stats_tm_t, max_speed_altitude) }, \
          { "apogee_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 24, offsetof(mavlink_payload_stats_tm_t, apogee_ts) }, \
-         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_stats_tm_t, apogee_lat) }, \
-         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_stats_tm_t, apogee_lon) }, \
-         { "static_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_stats_tm_t, static_min_pressure) }, \
-         { "digital_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_stats_tm_t, digital_min_pressure) }, \
-         { "ada_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_payload_stats_tm_t, ada_min_pressure) }, \
-         { "baro_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_payload_stats_tm_t, baro_max_altitude) }, \
-         { "gps_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_stats_tm_t, gps_max_altitude) }, \
-         { "drogue_dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 32, offsetof(mavlink_payload_stats_tm_t, drogue_dpl_ts) }, \
-         { "drogue_dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_stats_tm_t, drogue_dpl_max_acc) }, \
-         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_payload_stats_tm_t, cpu_load) }, \
-         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 92, offsetof(mavlink_payload_stats_tm_t, free_heap) }, \
+         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_stats_tm_t, apogee_lat) }, \
+         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_stats_tm_t, apogee_lon) }, \
+         { "apogee_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_stats_tm_t, apogee_alt) }, \
+         { "min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_stats_tm_t, min_pressure) }, \
+         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_stats_tm_t, cpu_load) }, \
+         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 72, offsetof(mavlink_payload_stats_tm_t, free_heap) }, \
          } \
 }
 #else
 #define MAVLINK_MESSAGE_INFO_PAYLOAD_STATS_TM { \
     "PAYLOAD_STATS_TM", \
-    19, \
-    {  { "liftoff_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_stats_tm_t, liftoff_ts) }, \
-         { "liftoff_max_acc_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc_ts) }, \
-         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc) }, \
+    15, \
+    {  { "liftoff_max_acc_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc_ts) }, \
+         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_payload_stats_tm_t, liftoff_max_acc) }, \
+         { "dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_payload_stats_tm_t, dpl_ts) }, \
+         { "dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_payload_stats_tm_t, dpl_max_acc) }, \
          { "max_z_speed_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_payload_stats_tm_t, max_z_speed_ts) }, \
-         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_stats_tm_t, max_z_speed) }, \
-         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_stats_tm_t, max_airspeed_pitot) }, \
-         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_stats_tm_t, max_speed_altitude) }, \
+         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_payload_stats_tm_t, max_z_speed) }, \
+         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_payload_stats_tm_t, max_airspeed_pitot) }, \
+         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_payload_stats_tm_t, max_speed_altitude) }, \
          { "apogee_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 24, offsetof(mavlink_payload_stats_tm_t, apogee_ts) }, \
-         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_stats_tm_t, apogee_lat) }, \
-         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_stats_tm_t, apogee_lon) }, \
-         { "static_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_stats_tm_t, static_min_pressure) }, \
-         { "digital_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_stats_tm_t, digital_min_pressure) }, \
-         { "ada_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_payload_stats_tm_t, ada_min_pressure) }, \
-         { "baro_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_payload_stats_tm_t, baro_max_altitude) }, \
-         { "gps_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_payload_stats_tm_t, gps_max_altitude) }, \
-         { "drogue_dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 32, offsetof(mavlink_payload_stats_tm_t, drogue_dpl_ts) }, \
-         { "drogue_dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_payload_stats_tm_t, drogue_dpl_max_acc) }, \
-         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_payload_stats_tm_t, cpu_load) }, \
-         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 92, offsetof(mavlink_payload_stats_tm_t, free_heap) }, \
+         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_payload_stats_tm_t, apogee_lat) }, \
+         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_payload_stats_tm_t, apogee_lon) }, \
+         { "apogee_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_payload_stats_tm_t, apogee_alt) }, \
+         { "min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_payload_stats_tm_t, min_pressure) }, \
+         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_payload_stats_tm_t, cpu_load) }, \
+         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 72, offsetof(mavlink_payload_stats_tm_t, free_heap) }, \
          } \
 }
 #endif
@@ -95,9 +83,10 @@ typedef struct __mavlink_payload_stats_tm_t {
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param msg The MAVLink message to compress the data into
  *
- * @param liftoff_ts [us] System clock at liftoff
  * @param liftoff_max_acc_ts [us] System clock at the maximum liftoff acceleration
  * @param liftoff_max_acc [m/s2] Maximum liftoff acceleration
+ * @param dpl_ts [us] System clock at drouge deployment
+ * @param dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param max_z_speed_ts [us] System clock at ADA max vertical speed
  * @param max_z_speed [m/s] Max measured vertical speed - ADA
  * @param max_airspeed_pitot [m/s] Max speed read by the pitot tube
@@ -105,62 +94,49 @@ typedef struct __mavlink_payload_stats_tm_t {
  * @param apogee_ts [us] System clock at apogee
  * @param apogee_lat [deg] Apogee latitude
  * @param apogee_lon [deg] Apogee longitude
- * @param static_min_pressure [Pa] Apogee pressure - Static ports
- * @param digital_min_pressure [Pa] Apogee pressure - Digital barometer
- * @param ada_min_pressure [Pa] Apogee pressure - ADA filtered
- * @param baro_max_altitude [m] Apogee altitude - Digital barometer
- * @param gps_max_altitude [m] Apogee altitude - GPS
- * @param drogue_dpl_ts [us] System clock at drouge deployment
- * @param drogue_dpl_max_acc [m/s2] Max acceleration during drouge deployment
+ * @param apogee_alt [m] Apogee altitude
+ * @param min_pressure [Pa] Apogee pressure - Digital barometer
  * @param cpu_load  CPU load in percentage
  * @param free_heap  Amount of available heap in memory
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_payload_stats_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-                               uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float static_min_pressure, float digital_min_pressure, float ada_min_pressure, float baro_max_altitude, float gps_max_altitude, uint64_t drogue_dpl_ts, float drogue_dpl_max_acc, float cpu_load, uint32_t free_heap)
+                               uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t dpl_ts, float dpl_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float apogee_alt, float min_pressure, float cpu_load, uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN];
-    _mav_put_uint64_t(buf, 0, liftoff_ts);
-    _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 0, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 8, dpl_ts);
     _mav_put_uint64_t(buf, 16, max_z_speed_ts);
     _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_float(buf, 40, liftoff_max_acc);
-    _mav_put_float(buf, 44, max_z_speed);
-    _mav_put_float(buf, 48, max_airspeed_pitot);
-    _mav_put_float(buf, 52, max_speed_altitude);
-    _mav_put_float(buf, 56, apogee_lat);
-    _mav_put_float(buf, 60, apogee_lon);
-    _mav_put_float(buf, 64, static_min_pressure);
-    _mav_put_float(buf, 68, digital_min_pressure);
-    _mav_put_float(buf, 72, ada_min_pressure);
-    _mav_put_float(buf, 76, baro_max_altitude);
-    _mav_put_float(buf, 80, gps_max_altitude);
-    _mav_put_float(buf, 84, drogue_dpl_max_acc);
-    _mav_put_float(buf, 88, cpu_load);
-    _mav_put_uint32_t(buf, 92, free_heap);
+    _mav_put_float(buf, 32, liftoff_max_acc);
+    _mav_put_float(buf, 36, dpl_max_acc);
+    _mav_put_float(buf, 40, max_z_speed);
+    _mav_put_float(buf, 44, max_airspeed_pitot);
+    _mav_put_float(buf, 48, max_speed_altitude);
+    _mav_put_float(buf, 52, apogee_lat);
+    _mav_put_float(buf, 56, apogee_lon);
+    _mav_put_float(buf, 60, apogee_alt);
+    _mav_put_float(buf, 64, min_pressure);
+    _mav_put_float(buf, 68, cpu_load);
+    _mav_put_uint32_t(buf, 72, free_heap);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN);
 #else
     mavlink_payload_stats_tm_t packet;
-    packet.liftoff_ts = liftoff_ts;
     packet.liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet.dpl_ts = dpl_ts;
     packet.max_z_speed_ts = max_z_speed_ts;
     packet.apogee_ts = apogee_ts;
-    packet.drogue_dpl_ts = drogue_dpl_ts;
     packet.liftoff_max_acc = liftoff_max_acc;
+    packet.dpl_max_acc = dpl_max_acc;
     packet.max_z_speed = max_z_speed;
     packet.max_airspeed_pitot = max_airspeed_pitot;
     packet.max_speed_altitude = max_speed_altitude;
     packet.apogee_lat = apogee_lat;
     packet.apogee_lon = apogee_lon;
-    packet.static_min_pressure = static_min_pressure;
-    packet.digital_min_pressure = digital_min_pressure;
-    packet.ada_min_pressure = ada_min_pressure;
-    packet.baro_max_altitude = baro_max_altitude;
-    packet.gps_max_altitude = gps_max_altitude;
-    packet.drogue_dpl_max_acc = drogue_dpl_max_acc;
+    packet.apogee_alt = apogee_alt;
+    packet.min_pressure = min_pressure;
     packet.cpu_load = cpu_load;
     packet.free_heap = free_heap;
 
@@ -177,9 +153,10 @@ static inline uint16_t mavlink_msg_payload_stats_tm_pack(uint8_t system_id, uint
  * @param component_id ID of this component (e.g. 200 for IMU)
  * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
- * @param liftoff_ts [us] System clock at liftoff
  * @param liftoff_max_acc_ts [us] System clock at the maximum liftoff acceleration
  * @param liftoff_max_acc [m/s2] Maximum liftoff acceleration
+ * @param dpl_ts [us] System clock at drouge deployment
+ * @param dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param max_z_speed_ts [us] System clock at ADA max vertical speed
  * @param max_z_speed [m/s] Max measured vertical speed - ADA
  * @param max_airspeed_pitot [m/s] Max speed read by the pitot tube
@@ -187,63 +164,50 @@ static inline uint16_t mavlink_msg_payload_stats_tm_pack(uint8_t system_id, uint
  * @param apogee_ts [us] System clock at apogee
  * @param apogee_lat [deg] Apogee latitude
  * @param apogee_lon [deg] Apogee longitude
- * @param static_min_pressure [Pa] Apogee pressure - Static ports
- * @param digital_min_pressure [Pa] Apogee pressure - Digital barometer
- * @param ada_min_pressure [Pa] Apogee pressure - ADA filtered
- * @param baro_max_altitude [m] Apogee altitude - Digital barometer
- * @param gps_max_altitude [m] Apogee altitude - GPS
- * @param drogue_dpl_ts [us] System clock at drouge deployment
- * @param drogue_dpl_max_acc [m/s2] Max acceleration during drouge deployment
+ * @param apogee_alt [m] Apogee altitude
+ * @param min_pressure [Pa] Apogee pressure - Digital barometer
  * @param cpu_load  CPU load in percentage
  * @param free_heap  Amount of available heap in memory
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_payload_stats_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
                                mavlink_message_t* msg,
-                                   uint64_t liftoff_ts,uint64_t liftoff_max_acc_ts,float liftoff_max_acc,uint64_t max_z_speed_ts,float max_z_speed,float max_airspeed_pitot,float max_speed_altitude,uint64_t apogee_ts,float apogee_lat,float apogee_lon,float static_min_pressure,float digital_min_pressure,float ada_min_pressure,float baro_max_altitude,float gps_max_altitude,uint64_t drogue_dpl_ts,float drogue_dpl_max_acc,float cpu_load,uint32_t free_heap)
+                                   uint64_t liftoff_max_acc_ts,float liftoff_max_acc,uint64_t dpl_ts,float dpl_max_acc,uint64_t max_z_speed_ts,float max_z_speed,float max_airspeed_pitot,float max_speed_altitude,uint64_t apogee_ts,float apogee_lat,float apogee_lon,float apogee_alt,float min_pressure,float cpu_load,uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN];
-    _mav_put_uint64_t(buf, 0, liftoff_ts);
-    _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 0, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 8, dpl_ts);
     _mav_put_uint64_t(buf, 16, max_z_speed_ts);
     _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_float(buf, 40, liftoff_max_acc);
-    _mav_put_float(buf, 44, max_z_speed);
-    _mav_put_float(buf, 48, max_airspeed_pitot);
-    _mav_put_float(buf, 52, max_speed_altitude);
-    _mav_put_float(buf, 56, apogee_lat);
-    _mav_put_float(buf, 60, apogee_lon);
-    _mav_put_float(buf, 64, static_min_pressure);
-    _mav_put_float(buf, 68, digital_min_pressure);
-    _mav_put_float(buf, 72, ada_min_pressure);
-    _mav_put_float(buf, 76, baro_max_altitude);
-    _mav_put_float(buf, 80, gps_max_altitude);
-    _mav_put_float(buf, 84, drogue_dpl_max_acc);
-    _mav_put_float(buf, 88, cpu_load);
-    _mav_put_uint32_t(buf, 92, free_heap);
+    _mav_put_float(buf, 32, liftoff_max_acc);
+    _mav_put_float(buf, 36, dpl_max_acc);
+    _mav_put_float(buf, 40, max_z_speed);
+    _mav_put_float(buf, 44, max_airspeed_pitot);
+    _mav_put_float(buf, 48, max_speed_altitude);
+    _mav_put_float(buf, 52, apogee_lat);
+    _mav_put_float(buf, 56, apogee_lon);
+    _mav_put_float(buf, 60, apogee_alt);
+    _mav_put_float(buf, 64, min_pressure);
+    _mav_put_float(buf, 68, cpu_load);
+    _mav_put_uint32_t(buf, 72, free_heap);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN);
 #else
     mavlink_payload_stats_tm_t packet;
-    packet.liftoff_ts = liftoff_ts;
     packet.liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet.dpl_ts = dpl_ts;
     packet.max_z_speed_ts = max_z_speed_ts;
     packet.apogee_ts = apogee_ts;
-    packet.drogue_dpl_ts = drogue_dpl_ts;
     packet.liftoff_max_acc = liftoff_max_acc;
+    packet.dpl_max_acc = dpl_max_acc;
     packet.max_z_speed = max_z_speed;
     packet.max_airspeed_pitot = max_airspeed_pitot;
     packet.max_speed_altitude = max_speed_altitude;
     packet.apogee_lat = apogee_lat;
     packet.apogee_lon = apogee_lon;
-    packet.static_min_pressure = static_min_pressure;
-    packet.digital_min_pressure = digital_min_pressure;
-    packet.ada_min_pressure = ada_min_pressure;
-    packet.baro_max_altitude = baro_max_altitude;
-    packet.gps_max_altitude = gps_max_altitude;
-    packet.drogue_dpl_max_acc = drogue_dpl_max_acc;
+    packet.apogee_alt = apogee_alt;
+    packet.min_pressure = min_pressure;
     packet.cpu_load = cpu_load;
     packet.free_heap = free_heap;
 
@@ -264,7 +228,7 @@ static inline uint16_t mavlink_msg_payload_stats_tm_pack_chan(uint8_t system_id,
  */
 static inline uint16_t mavlink_msg_payload_stats_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_payload_stats_tm_t* payload_stats_tm)
 {
-    return mavlink_msg_payload_stats_tm_pack(system_id, component_id, msg, payload_stats_tm->liftoff_ts, payload_stats_tm->liftoff_max_acc_ts, payload_stats_tm->liftoff_max_acc, payload_stats_tm->max_z_speed_ts, payload_stats_tm->max_z_speed, payload_stats_tm->max_airspeed_pitot, payload_stats_tm->max_speed_altitude, payload_stats_tm->apogee_ts, payload_stats_tm->apogee_lat, payload_stats_tm->apogee_lon, payload_stats_tm->static_min_pressure, payload_stats_tm->digital_min_pressure, payload_stats_tm->ada_min_pressure, payload_stats_tm->baro_max_altitude, payload_stats_tm->gps_max_altitude, payload_stats_tm->drogue_dpl_ts, payload_stats_tm->drogue_dpl_max_acc, payload_stats_tm->cpu_load, payload_stats_tm->free_heap);
+    return mavlink_msg_payload_stats_tm_pack(system_id, component_id, msg, payload_stats_tm->liftoff_max_acc_ts, payload_stats_tm->liftoff_max_acc, payload_stats_tm->dpl_ts, payload_stats_tm->dpl_max_acc, payload_stats_tm->max_z_speed_ts, payload_stats_tm->max_z_speed, payload_stats_tm->max_airspeed_pitot, payload_stats_tm->max_speed_altitude, payload_stats_tm->apogee_ts, payload_stats_tm->apogee_lat, payload_stats_tm->apogee_lon, payload_stats_tm->apogee_alt, payload_stats_tm->min_pressure, payload_stats_tm->cpu_load, payload_stats_tm->free_heap);
 }
 
 /**
@@ -278,16 +242,17 @@ static inline uint16_t mavlink_msg_payload_stats_tm_encode(uint8_t system_id, ui
  */
 static inline uint16_t mavlink_msg_payload_stats_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_payload_stats_tm_t* payload_stats_tm)
 {
-    return mavlink_msg_payload_stats_tm_pack_chan(system_id, component_id, chan, msg, payload_stats_tm->liftoff_ts, payload_stats_tm->liftoff_max_acc_ts, payload_stats_tm->liftoff_max_acc, payload_stats_tm->max_z_speed_ts, payload_stats_tm->max_z_speed, payload_stats_tm->max_airspeed_pitot, payload_stats_tm->max_speed_altitude, payload_stats_tm->apogee_ts, payload_stats_tm->apogee_lat, payload_stats_tm->apogee_lon, payload_stats_tm->static_min_pressure, payload_stats_tm->digital_min_pressure, payload_stats_tm->ada_min_pressure, payload_stats_tm->baro_max_altitude, payload_stats_tm->gps_max_altitude, payload_stats_tm->drogue_dpl_ts, payload_stats_tm->drogue_dpl_max_acc, payload_stats_tm->cpu_load, payload_stats_tm->free_heap);
+    return mavlink_msg_payload_stats_tm_pack_chan(system_id, component_id, chan, msg, payload_stats_tm->liftoff_max_acc_ts, payload_stats_tm->liftoff_max_acc, payload_stats_tm->dpl_ts, payload_stats_tm->dpl_max_acc, payload_stats_tm->max_z_speed_ts, payload_stats_tm->max_z_speed, payload_stats_tm->max_airspeed_pitot, payload_stats_tm->max_speed_altitude, payload_stats_tm->apogee_ts, payload_stats_tm->apogee_lat, payload_stats_tm->apogee_lon, payload_stats_tm->apogee_alt, payload_stats_tm->min_pressure, payload_stats_tm->cpu_load, payload_stats_tm->free_heap);
 }
 
 /**
  * @brief Send a payload_stats_tm message
  * @param chan MAVLink channel to send the message
  *
- * @param liftoff_ts [us] System clock at liftoff
  * @param liftoff_max_acc_ts [us] System clock at the maximum liftoff acceleration
  * @param liftoff_max_acc [m/s2] Maximum liftoff acceleration
+ * @param dpl_ts [us] System clock at drouge deployment
+ * @param dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param max_z_speed_ts [us] System clock at ADA max vertical speed
  * @param max_z_speed [m/s] Max measured vertical speed - ADA
  * @param max_airspeed_pitot [m/s] Max speed read by the pitot tube
@@ -295,62 +260,49 @@ static inline uint16_t mavlink_msg_payload_stats_tm_encode_chan(uint8_t system_i
  * @param apogee_ts [us] System clock at apogee
  * @param apogee_lat [deg] Apogee latitude
  * @param apogee_lon [deg] Apogee longitude
- * @param static_min_pressure [Pa] Apogee pressure - Static ports
- * @param digital_min_pressure [Pa] Apogee pressure - Digital barometer
- * @param ada_min_pressure [Pa] Apogee pressure - ADA filtered
- * @param baro_max_altitude [m] Apogee altitude - Digital barometer
- * @param gps_max_altitude [m] Apogee altitude - GPS
- * @param drogue_dpl_ts [us] System clock at drouge deployment
- * @param drogue_dpl_max_acc [m/s2] Max acceleration during drouge deployment
+ * @param apogee_alt [m] Apogee altitude
+ * @param min_pressure [Pa] Apogee pressure - Digital barometer
  * @param cpu_load  CPU load in percentage
  * @param free_heap  Amount of available heap in memory
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
-static inline void mavlink_msg_payload_stats_tm_send(mavlink_channel_t chan, uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float static_min_pressure, float digital_min_pressure, float ada_min_pressure, float baro_max_altitude, float gps_max_altitude, uint64_t drogue_dpl_ts, float drogue_dpl_max_acc, float cpu_load, uint32_t free_heap)
+static inline void mavlink_msg_payload_stats_tm_send(mavlink_channel_t chan, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t dpl_ts, float dpl_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float apogee_alt, float min_pressure, float cpu_load, uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN];
-    _mav_put_uint64_t(buf, 0, liftoff_ts);
-    _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 0, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 8, dpl_ts);
     _mav_put_uint64_t(buf, 16, max_z_speed_ts);
     _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_float(buf, 40, liftoff_max_acc);
-    _mav_put_float(buf, 44, max_z_speed);
-    _mav_put_float(buf, 48, max_airspeed_pitot);
-    _mav_put_float(buf, 52, max_speed_altitude);
-    _mav_put_float(buf, 56, apogee_lat);
-    _mav_put_float(buf, 60, apogee_lon);
-    _mav_put_float(buf, 64, static_min_pressure);
-    _mav_put_float(buf, 68, digital_min_pressure);
-    _mav_put_float(buf, 72, ada_min_pressure);
-    _mav_put_float(buf, 76, baro_max_altitude);
-    _mav_put_float(buf, 80, gps_max_altitude);
-    _mav_put_float(buf, 84, drogue_dpl_max_acc);
-    _mav_put_float(buf, 88, cpu_load);
-    _mav_put_uint32_t(buf, 92, free_heap);
+    _mav_put_float(buf, 32, liftoff_max_acc);
+    _mav_put_float(buf, 36, dpl_max_acc);
+    _mav_put_float(buf, 40, max_z_speed);
+    _mav_put_float(buf, 44, max_airspeed_pitot);
+    _mav_put_float(buf, 48, max_speed_altitude);
+    _mav_put_float(buf, 52, apogee_lat);
+    _mav_put_float(buf, 56, apogee_lon);
+    _mav_put_float(buf, 60, apogee_alt);
+    _mav_put_float(buf, 64, min_pressure);
+    _mav_put_float(buf, 68, cpu_load);
+    _mav_put_uint32_t(buf, 72, free_heap);
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PAYLOAD_STATS_TM, buf, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_MIN_LEN, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_CRC);
 #else
     mavlink_payload_stats_tm_t packet;
-    packet.liftoff_ts = liftoff_ts;
     packet.liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet.dpl_ts = dpl_ts;
     packet.max_z_speed_ts = max_z_speed_ts;
     packet.apogee_ts = apogee_ts;
-    packet.drogue_dpl_ts = drogue_dpl_ts;
     packet.liftoff_max_acc = liftoff_max_acc;
+    packet.dpl_max_acc = dpl_max_acc;
     packet.max_z_speed = max_z_speed;
     packet.max_airspeed_pitot = max_airspeed_pitot;
     packet.max_speed_altitude = max_speed_altitude;
     packet.apogee_lat = apogee_lat;
     packet.apogee_lon = apogee_lon;
-    packet.static_min_pressure = static_min_pressure;
-    packet.digital_min_pressure = digital_min_pressure;
-    packet.ada_min_pressure = ada_min_pressure;
-    packet.baro_max_altitude = baro_max_altitude;
-    packet.gps_max_altitude = gps_max_altitude;
-    packet.drogue_dpl_max_acc = drogue_dpl_max_acc;
+    packet.apogee_alt = apogee_alt;
+    packet.min_pressure = min_pressure;
     packet.cpu_load = cpu_load;
     packet.free_heap = free_heap;
 
@@ -366,7 +318,7 @@ static inline void mavlink_msg_payload_stats_tm_send(mavlink_channel_t chan, uin
 static inline void mavlink_msg_payload_stats_tm_send_struct(mavlink_channel_t chan, const mavlink_payload_stats_tm_t* payload_stats_tm)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-    mavlink_msg_payload_stats_tm_send(chan, payload_stats_tm->liftoff_ts, payload_stats_tm->liftoff_max_acc_ts, payload_stats_tm->liftoff_max_acc, payload_stats_tm->max_z_speed_ts, payload_stats_tm->max_z_speed, payload_stats_tm->max_airspeed_pitot, payload_stats_tm->max_speed_altitude, payload_stats_tm->apogee_ts, payload_stats_tm->apogee_lat, payload_stats_tm->apogee_lon, payload_stats_tm->static_min_pressure, payload_stats_tm->digital_min_pressure, payload_stats_tm->ada_min_pressure, payload_stats_tm->baro_max_altitude, payload_stats_tm->gps_max_altitude, payload_stats_tm->drogue_dpl_ts, payload_stats_tm->drogue_dpl_max_acc, payload_stats_tm->cpu_load, payload_stats_tm->free_heap);
+    mavlink_msg_payload_stats_tm_send(chan, payload_stats_tm->liftoff_max_acc_ts, payload_stats_tm->liftoff_max_acc, payload_stats_tm->dpl_ts, payload_stats_tm->dpl_max_acc, payload_stats_tm->max_z_speed_ts, payload_stats_tm->max_z_speed, payload_stats_tm->max_airspeed_pitot, payload_stats_tm->max_speed_altitude, payload_stats_tm->apogee_ts, payload_stats_tm->apogee_lat, payload_stats_tm->apogee_lon, payload_stats_tm->apogee_alt, payload_stats_tm->min_pressure, payload_stats_tm->cpu_load, payload_stats_tm->free_heap);
 #else
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PAYLOAD_STATS_TM, (const char *)payload_stats_tm, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_MIN_LEN, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_CRC);
 #endif
@@ -380,50 +332,42 @@ static inline void mavlink_msg_payload_stats_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_payload_stats_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float static_min_pressure, float digital_min_pressure, float ada_min_pressure, float baro_max_altitude, float gps_max_altitude, uint64_t drogue_dpl_ts, float drogue_dpl_max_acc, float cpu_load, uint32_t free_heap)
+static inline void mavlink_msg_payload_stats_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t dpl_ts, float dpl_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float apogee_alt, float min_pressure, float cpu_load, uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char *buf = (char *)msgbuf;
-    _mav_put_uint64_t(buf, 0, liftoff_ts);
-    _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 0, liftoff_max_acc_ts);
+    _mav_put_uint64_t(buf, 8, dpl_ts);
     _mav_put_uint64_t(buf, 16, max_z_speed_ts);
     _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_float(buf, 40, liftoff_max_acc);
-    _mav_put_float(buf, 44, max_z_speed);
-    _mav_put_float(buf, 48, max_airspeed_pitot);
-    _mav_put_float(buf, 52, max_speed_altitude);
-    _mav_put_float(buf, 56, apogee_lat);
-    _mav_put_float(buf, 60, apogee_lon);
-    _mav_put_float(buf, 64, static_min_pressure);
-    _mav_put_float(buf, 68, digital_min_pressure);
-    _mav_put_float(buf, 72, ada_min_pressure);
-    _mav_put_float(buf, 76, baro_max_altitude);
-    _mav_put_float(buf, 80, gps_max_altitude);
-    _mav_put_float(buf, 84, drogue_dpl_max_acc);
-    _mav_put_float(buf, 88, cpu_load);
-    _mav_put_uint32_t(buf, 92, free_heap);
+    _mav_put_float(buf, 32, liftoff_max_acc);
+    _mav_put_float(buf, 36, dpl_max_acc);
+    _mav_put_float(buf, 40, max_z_speed);
+    _mav_put_float(buf, 44, max_airspeed_pitot);
+    _mav_put_float(buf, 48, max_speed_altitude);
+    _mav_put_float(buf, 52, apogee_lat);
+    _mav_put_float(buf, 56, apogee_lon);
+    _mav_put_float(buf, 60, apogee_alt);
+    _mav_put_float(buf, 64, min_pressure);
+    _mav_put_float(buf, 68, cpu_load);
+    _mav_put_uint32_t(buf, 72, free_heap);
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PAYLOAD_STATS_TM, buf, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_MIN_LEN, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_LEN, MAVLINK_MSG_ID_PAYLOAD_STATS_TM_CRC);
 #else
     mavlink_payload_stats_tm_t *packet = (mavlink_payload_stats_tm_t *)msgbuf;
-    packet->liftoff_ts = liftoff_ts;
     packet->liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet->dpl_ts = dpl_ts;
     packet->max_z_speed_ts = max_z_speed_ts;
     packet->apogee_ts = apogee_ts;
-    packet->drogue_dpl_ts = drogue_dpl_ts;
     packet->liftoff_max_acc = liftoff_max_acc;
+    packet->dpl_max_acc = dpl_max_acc;
     packet->max_z_speed = max_z_speed;
     packet->max_airspeed_pitot = max_airspeed_pitot;
     packet->max_speed_altitude = max_speed_altitude;
     packet->apogee_lat = apogee_lat;
     packet->apogee_lon = apogee_lon;
-    packet->static_min_pressure = static_min_pressure;
-    packet->digital_min_pressure = digital_min_pressure;
-    packet->ada_min_pressure = ada_min_pressure;
-    packet->baro_max_altitude = baro_max_altitude;
-    packet->gps_max_altitude = gps_max_altitude;
-    packet->drogue_dpl_max_acc = drogue_dpl_max_acc;
+    packet->apogee_alt = apogee_alt;
+    packet->min_pressure = min_pressure;
     packet->cpu_load = cpu_load;
     packet->free_heap = free_heap;
 
@@ -438,33 +382,43 @@ static inline void mavlink_msg_payload_stats_tm_send_buf(mavlink_message_t *msgb
 
 
 /**
- * @brief Get field liftoff_ts from payload_stats_tm message
+ * @brief Get field liftoff_max_acc_ts from payload_stats_tm message
  *
- * @return [us] System clock at liftoff
+ * @return [us] System clock at the maximum liftoff acceleration
  */
-static inline uint64_t mavlink_msg_payload_stats_tm_get_liftoff_ts(const mavlink_message_t* msg)
+static inline uint64_t mavlink_msg_payload_stats_tm_get_liftoff_max_acc_ts(const mavlink_message_t* msg)
 {
     return _MAV_RETURN_uint64_t(msg,  0);
 }
 
 /**
- * @brief Get field liftoff_max_acc_ts from payload_stats_tm message
+ * @brief Get field liftoff_max_acc from payload_stats_tm message
  *
- * @return [us] System clock at the maximum liftoff acceleration
+ * @return [m/s2] Maximum liftoff acceleration
  */
-static inline uint64_t mavlink_msg_payload_stats_tm_get_liftoff_max_acc_ts(const mavlink_message_t* msg)
+static inline float mavlink_msg_payload_stats_tm_get_liftoff_max_acc(const mavlink_message_t* msg)
+{
+    return _MAV_RETURN_float(msg,  32);
+}
+
+/**
+ * @brief Get field dpl_ts from payload_stats_tm message
+ *
+ * @return [us] System clock at drouge deployment
+ */
+static inline uint64_t mavlink_msg_payload_stats_tm_get_dpl_ts(const mavlink_message_t* msg)
 {
     return _MAV_RETURN_uint64_t(msg,  8);
 }
 
 /**
- * @brief Get field liftoff_max_acc from payload_stats_tm message
+ * @brief Get field dpl_max_acc from payload_stats_tm message
  *
- * @return [m/s2] Maximum liftoff acceleration
+ * @return [m/s2] Max acceleration during drouge deployment
  */
-static inline float mavlink_msg_payload_stats_tm_get_liftoff_max_acc(const mavlink_message_t* msg)
+static inline float mavlink_msg_payload_stats_tm_get_dpl_max_acc(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  40);
+    return _MAV_RETURN_float(msg,  36);
 }
 
 /**
@@ -484,7 +438,7 @@ static inline uint64_t mavlink_msg_payload_stats_tm_get_max_z_speed_ts(const mav
  */
 static inline float mavlink_msg_payload_stats_tm_get_max_z_speed(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  44);
+    return _MAV_RETURN_float(msg,  40);
 }
 
 /**
@@ -494,7 +448,7 @@ static inline float mavlink_msg_payload_stats_tm_get_max_z_speed(const mavlink_m
  */
 static inline float mavlink_msg_payload_stats_tm_get_max_airspeed_pitot(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  48);
+    return _MAV_RETURN_float(msg,  44);
 }
 
 /**
@@ -504,7 +458,7 @@ static inline float mavlink_msg_payload_stats_tm_get_max_airspeed_pitot(const ma
  */
 static inline float mavlink_msg_payload_stats_tm_get_max_speed_altitude(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  52);
+    return _MAV_RETURN_float(msg,  48);
 }
 
 /**
@@ -524,7 +478,7 @@ static inline uint64_t mavlink_msg_payload_stats_tm_get_apogee_ts(const mavlink_
  */
 static inline float mavlink_msg_payload_stats_tm_get_apogee_lat(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  56);
+    return _MAV_RETURN_float(msg,  52);
 }
 
 /**
@@ -534,77 +488,27 @@ static inline float mavlink_msg_payload_stats_tm_get_apogee_lat(const mavlink_me
  */
 static inline float mavlink_msg_payload_stats_tm_get_apogee_lon(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  60);
+    return _MAV_RETURN_float(msg,  56);
 }
 
 /**
- * @brief Get field static_min_pressure from payload_stats_tm message
+ * @brief Get field apogee_alt from payload_stats_tm message
  *
- * @return [Pa] Apogee pressure - Static ports
+ * @return [m] Apogee altitude
  */
-static inline float mavlink_msg_payload_stats_tm_get_static_min_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_payload_stats_tm_get_apogee_alt(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  64);
+    return _MAV_RETURN_float(msg,  60);
 }
 
 /**
- * @brief Get field digital_min_pressure from payload_stats_tm message
+ * @brief Get field min_pressure from payload_stats_tm message
  *
  * @return [Pa] Apogee pressure - Digital barometer
  */
-static inline float mavlink_msg_payload_stats_tm_get_digital_min_pressure(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  68);
-}
-
-/**
- * @brief Get field ada_min_pressure from payload_stats_tm message
- *
- * @return [Pa] Apogee pressure - ADA filtered
- */
-static inline float mavlink_msg_payload_stats_tm_get_ada_min_pressure(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  72);
-}
-
-/**
- * @brief Get field baro_max_altitude from payload_stats_tm message
- *
- * @return [m] Apogee altitude - Digital barometer
- */
-static inline float mavlink_msg_payload_stats_tm_get_baro_max_altitude(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  76);
-}
-
-/**
- * @brief Get field gps_max_altitude from payload_stats_tm message
- *
- * @return [m] Apogee altitude - GPS
- */
-static inline float mavlink_msg_payload_stats_tm_get_gps_max_altitude(const mavlink_message_t* msg)
+static inline float mavlink_msg_payload_stats_tm_get_min_pressure(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  80);
-}
-
-/**
- * @brief Get field drogue_dpl_ts from payload_stats_tm message
- *
- * @return [us] System clock at drouge deployment
- */
-static inline uint64_t mavlink_msg_payload_stats_tm_get_drogue_dpl_ts(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_uint64_t(msg,  32);
-}
-
-/**
- * @brief Get field drogue_dpl_max_acc from payload_stats_tm message
- *
- * @return [m/s2] Max acceleration during drouge deployment
- */
-static inline float mavlink_msg_payload_stats_tm_get_drogue_dpl_max_acc(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  84);
+    return _MAV_RETURN_float(msg,  64);
 }
 
 /**
@@ -614,7 +518,7 @@ static inline float mavlink_msg_payload_stats_tm_get_drogue_dpl_max_acc(const ma
  */
 static inline float mavlink_msg_payload_stats_tm_get_cpu_load(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  88);
+    return _MAV_RETURN_float(msg,  68);
 }
 
 /**
@@ -624,7 +528,7 @@ static inline float mavlink_msg_payload_stats_tm_get_cpu_load(const mavlink_mess
  */
 static inline uint32_t mavlink_msg_payload_stats_tm_get_free_heap(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_uint32_t(msg,  92);
+    return _MAV_RETURN_uint32_t(msg,  72);
 }
 
 /**
@@ -636,23 +540,19 @@ static inline uint32_t mavlink_msg_payload_stats_tm_get_free_heap(const mavlink_
 static inline void mavlink_msg_payload_stats_tm_decode(const mavlink_message_t* msg, mavlink_payload_stats_tm_t* payload_stats_tm)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-    payload_stats_tm->liftoff_ts = mavlink_msg_payload_stats_tm_get_liftoff_ts(msg);
     payload_stats_tm->liftoff_max_acc_ts = mavlink_msg_payload_stats_tm_get_liftoff_max_acc_ts(msg);
+    payload_stats_tm->dpl_ts = mavlink_msg_payload_stats_tm_get_dpl_ts(msg);
     payload_stats_tm->max_z_speed_ts = mavlink_msg_payload_stats_tm_get_max_z_speed_ts(msg);
     payload_stats_tm->apogee_ts = mavlink_msg_payload_stats_tm_get_apogee_ts(msg);
-    payload_stats_tm->drogue_dpl_ts = mavlink_msg_payload_stats_tm_get_drogue_dpl_ts(msg);
     payload_stats_tm->liftoff_max_acc = mavlink_msg_payload_stats_tm_get_liftoff_max_acc(msg);
+    payload_stats_tm->dpl_max_acc = mavlink_msg_payload_stats_tm_get_dpl_max_acc(msg);
     payload_stats_tm->max_z_speed = mavlink_msg_payload_stats_tm_get_max_z_speed(msg);
     payload_stats_tm->max_airspeed_pitot = mavlink_msg_payload_stats_tm_get_max_airspeed_pitot(msg);
     payload_stats_tm->max_speed_altitude = mavlink_msg_payload_stats_tm_get_max_speed_altitude(msg);
     payload_stats_tm->apogee_lat = mavlink_msg_payload_stats_tm_get_apogee_lat(msg);
     payload_stats_tm->apogee_lon = mavlink_msg_payload_stats_tm_get_apogee_lon(msg);
-    payload_stats_tm->static_min_pressure = mavlink_msg_payload_stats_tm_get_static_min_pressure(msg);
-    payload_stats_tm->digital_min_pressure = mavlink_msg_payload_stats_tm_get_digital_min_pressure(msg);
-    payload_stats_tm->ada_min_pressure = mavlink_msg_payload_stats_tm_get_ada_min_pressure(msg);
-    payload_stats_tm->baro_max_altitude = mavlink_msg_payload_stats_tm_get_baro_max_altitude(msg);
-    payload_stats_tm->gps_max_altitude = mavlink_msg_payload_stats_tm_get_gps_max_altitude(msg);
-    payload_stats_tm->drogue_dpl_max_acc = mavlink_msg_payload_stats_tm_get_drogue_dpl_max_acc(msg);
+    payload_stats_tm->apogee_alt = mavlink_msg_payload_stats_tm_get_apogee_alt(msg);
+    payload_stats_tm->min_pressure = mavlink_msg_payload_stats_tm_get_min_pressure(msg);
     payload_stats_tm->cpu_load = mavlink_msg_payload_stats_tm_get_cpu_load(msg);
     payload_stats_tm->free_heap = mavlink_msg_payload_stats_tm_get_free_heap(msg);
 #else
diff --git a/mavlink_lib/pyxis/mavlink_msg_rocket_stats_tm.h b/mavlink_lib/pyxis/mavlink_msg_rocket_stats_tm.h
index 3440fd4..c878c46 100644
--- a/mavlink_lib/pyxis/mavlink_msg_rocket_stats_tm.h
+++ b/mavlink_lib/pyxis/mavlink_msg_rocket_stats_tm.h
@@ -7,37 +7,31 @@
 typedef struct __mavlink_rocket_stats_tm_t {
  uint64_t liftoff_ts; /*< [us] System clock at liftoff*/
  uint64_t liftoff_max_acc_ts; /*< [us] System clock at the maximum liftoff acceleration*/
+ uint64_t dpl_ts; /*< [us] System clock at drouge deployment*/
  uint64_t max_z_speed_ts; /*< [us] System clock at ADA max vertical speed*/
  uint64_t apogee_ts; /*< [us] System clock at apogee*/
- uint64_t drogue_dpl_ts; /*< [us] System clock at drouge deployment*/
- uint64_t main_dpl_altitude_ts; /*< [us] System clock at main chute deployment*/
  float liftoff_max_acc; /*< [m/s2] Maximum liftoff acceleration*/
+ float dpl_max_acc; /*< [m/s2] Max acceleration during drouge deployment*/
  float max_z_speed; /*< [m/s] Max measured vertical speed - ADA*/
  float max_airspeed_pitot; /*< [m/s] Max speed read by the pitot tube*/
  float max_speed_altitude; /*< [m] Altitude at max speed*/
  float apogee_lat; /*< [deg] Apogee latitude*/
  float apogee_lon; /*< [deg] Apogee longitude*/
- float static_min_pressure; /*< [Pa] Apogee pressure - Static ports*/
- float digital_min_pressure; /*< [Pa] Apogee pressure - Digital barometer*/
+ float apogee_alt; /*< [m] Apogee altitude*/
+ float min_pressure; /*< [Pa] Apogee pressure - Digital barometer*/
  float ada_min_pressure; /*< [Pa] Apogee pressure - ADA filtered*/
- float baro_max_altitude; /*< [m] Apogee altitude - Digital barometer*/
- float gps_max_altitude; /*< [m] Apogee altitude - GPS*/
- float drogue_dpl_max_acc; /*< [m/s2] Max acceleration during drouge deployment*/
  float dpl_vane_max_pressure; /*< [Pa] Max pressure in the deployment bay during drogue deployment*/
- float main_dpl_altitude; /*< [m] Altittude at main deployment (m.s.l)*/
- float main_dpl_zspeed; /*< [m/s] Vertical speed at main deployment (sensor z axis)*/
- float main_dpl_acc; /*< [m/s2] Max measured vertical acceleration (sensor z axis) after main parachute deployment*/
  float cpu_load; /*<  CPU load in percentage*/
  uint32_t free_heap; /*<  Amount of available heap in memory*/
 } mavlink_rocket_stats_tm_t;
 
-#define MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN 120
-#define MAVLINK_MSG_ID_ROCKET_STATS_TM_MIN_LEN 120
-#define MAVLINK_MSG_ID_210_LEN 120
-#define MAVLINK_MSG_ID_210_MIN_LEN 120
+#define MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN 92
+#define MAVLINK_MSG_ID_ROCKET_STATS_TM_MIN_LEN 92
+#define MAVLINK_MSG_ID_210_LEN 92
+#define MAVLINK_MSG_ID_210_MIN_LEN 92
 
-#define MAVLINK_MSG_ID_ROCKET_STATS_TM_CRC 169
-#define MAVLINK_MSG_ID_210_CRC 169
+#define MAVLINK_MSG_ID_ROCKET_STATS_TM_CRC 245
+#define MAVLINK_MSG_ID_210_CRC 245
 
 
 
@@ -45,61 +39,49 @@ typedef struct __mavlink_rocket_stats_tm_t {
 #define MAVLINK_MESSAGE_INFO_ROCKET_STATS_TM { \
     210, \
     "ROCKET_STATS_TM", \
-    24, \
+    18, \
     {  { "liftoff_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_rocket_stats_tm_t, liftoff_ts) }, \
          { "liftoff_max_acc_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_rocket_stats_tm_t, liftoff_max_acc_ts) }, \
-         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_stats_tm_t, liftoff_max_acc) }, \
-         { "max_z_speed_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_rocket_stats_tm_t, max_z_speed_ts) }, \
-         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_stats_tm_t, max_z_speed) }, \
-         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_stats_tm_t, max_airspeed_pitot) }, \
-         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_stats_tm_t, max_speed_altitude) }, \
-         { "apogee_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 24, offsetof(mavlink_rocket_stats_tm_t, apogee_ts) }, \
-         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_stats_tm_t, apogee_lat) }, \
-         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_stats_tm_t, apogee_lon) }, \
-         { "static_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_stats_tm_t, static_min_pressure) }, \
-         { "digital_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_stats_tm_t, digital_min_pressure) }, \
-         { "ada_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_stats_tm_t, ada_min_pressure) }, \
-         { "baro_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_stats_tm_t, baro_max_altitude) }, \
-         { "gps_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_stats_tm_t, gps_max_altitude) }, \
-         { "drogue_dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 32, offsetof(mavlink_rocket_stats_tm_t, drogue_dpl_ts) }, \
-         { "drogue_dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_rocket_stats_tm_t, drogue_dpl_max_acc) }, \
-         { "dpl_vane_max_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_rocket_stats_tm_t, dpl_vane_max_pressure) }, \
-         { "main_dpl_altitude_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 40, offsetof(mavlink_rocket_stats_tm_t, main_dpl_altitude_ts) }, \
-         { "main_dpl_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_rocket_stats_tm_t, main_dpl_altitude) }, \
-         { "main_dpl_zspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_rocket_stats_tm_t, main_dpl_zspeed) }, \
-         { "main_dpl_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_rocket_stats_tm_t, main_dpl_acc) }, \
-         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_rocket_stats_tm_t, cpu_load) }, \
-         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 116, offsetof(mavlink_rocket_stats_tm_t, free_heap) }, \
+         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_rocket_stats_tm_t, liftoff_max_acc) }, \
+         { "dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_rocket_stats_tm_t, dpl_ts) }, \
+         { "dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_rocket_stats_tm_t, dpl_max_acc) }, \
+         { "max_z_speed_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 24, offsetof(mavlink_rocket_stats_tm_t, max_z_speed_ts) }, \
+         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_stats_tm_t, max_z_speed) }, \
+         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_stats_tm_t, max_airspeed_pitot) }, \
+         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_stats_tm_t, max_speed_altitude) }, \
+         { "apogee_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 32, offsetof(mavlink_rocket_stats_tm_t, apogee_ts) }, \
+         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_stats_tm_t, apogee_lat) }, \
+         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_stats_tm_t, apogee_lon) }, \
+         { "apogee_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_stats_tm_t, apogee_alt) }, \
+         { "min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_stats_tm_t, min_pressure) }, \
+         { "ada_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_stats_tm_t, ada_min_pressure) }, \
+         { "dpl_vane_max_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_stats_tm_t, dpl_vane_max_pressure) }, \
+         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_stats_tm_t, cpu_load) }, \
+         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 88, offsetof(mavlink_rocket_stats_tm_t, free_heap) }, \
          } \
 }
 #else
 #define MAVLINK_MESSAGE_INFO_ROCKET_STATS_TM { \
     "ROCKET_STATS_TM", \
-    24, \
+    18, \
     {  { "liftoff_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_rocket_stats_tm_t, liftoff_ts) }, \
          { "liftoff_max_acc_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 8, offsetof(mavlink_rocket_stats_tm_t, liftoff_max_acc_ts) }, \
-         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_stats_tm_t, liftoff_max_acc) }, \
-         { "max_z_speed_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_rocket_stats_tm_t, max_z_speed_ts) }, \
-         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_stats_tm_t, max_z_speed) }, \
-         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_stats_tm_t, max_airspeed_pitot) }, \
-         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_stats_tm_t, max_speed_altitude) }, \
-         { "apogee_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 24, offsetof(mavlink_rocket_stats_tm_t, apogee_ts) }, \
-         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_stats_tm_t, apogee_lat) }, \
-         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_stats_tm_t, apogee_lon) }, \
-         { "static_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_stats_tm_t, static_min_pressure) }, \
-         { "digital_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_stats_tm_t, digital_min_pressure) }, \
-         { "ada_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_stats_tm_t, ada_min_pressure) }, \
-         { "baro_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_stats_tm_t, baro_max_altitude) }, \
-         { "gps_max_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 88, offsetof(mavlink_rocket_stats_tm_t, gps_max_altitude) }, \
-         { "drogue_dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 32, offsetof(mavlink_rocket_stats_tm_t, drogue_dpl_ts) }, \
-         { "drogue_dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 92, offsetof(mavlink_rocket_stats_tm_t, drogue_dpl_max_acc) }, \
-         { "dpl_vane_max_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 96, offsetof(mavlink_rocket_stats_tm_t, dpl_vane_max_pressure) }, \
-         { "main_dpl_altitude_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 40, offsetof(mavlink_rocket_stats_tm_t, main_dpl_altitude_ts) }, \
-         { "main_dpl_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 100, offsetof(mavlink_rocket_stats_tm_t, main_dpl_altitude) }, \
-         { "main_dpl_zspeed", NULL, MAVLINK_TYPE_FLOAT, 0, 104, offsetof(mavlink_rocket_stats_tm_t, main_dpl_zspeed) }, \
-         { "main_dpl_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 108, offsetof(mavlink_rocket_stats_tm_t, main_dpl_acc) }, \
-         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 112, offsetof(mavlink_rocket_stats_tm_t, cpu_load) }, \
-         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 116, offsetof(mavlink_rocket_stats_tm_t, free_heap) }, \
+         { "liftoff_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_rocket_stats_tm_t, liftoff_max_acc) }, \
+         { "dpl_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 16, offsetof(mavlink_rocket_stats_tm_t, dpl_ts) }, \
+         { "dpl_max_acc", NULL, MAVLINK_TYPE_FLOAT, 0, 44, offsetof(mavlink_rocket_stats_tm_t, dpl_max_acc) }, \
+         { "max_z_speed_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 24, offsetof(mavlink_rocket_stats_tm_t, max_z_speed_ts) }, \
+         { "max_z_speed", NULL, MAVLINK_TYPE_FLOAT, 0, 48, offsetof(mavlink_rocket_stats_tm_t, max_z_speed) }, \
+         { "max_airspeed_pitot", NULL, MAVLINK_TYPE_FLOAT, 0, 52, offsetof(mavlink_rocket_stats_tm_t, max_airspeed_pitot) }, \
+         { "max_speed_altitude", NULL, MAVLINK_TYPE_FLOAT, 0, 56, offsetof(mavlink_rocket_stats_tm_t, max_speed_altitude) }, \
+         { "apogee_ts", NULL, MAVLINK_TYPE_UINT64_T, 0, 32, offsetof(mavlink_rocket_stats_tm_t, apogee_ts) }, \
+         { "apogee_lat", NULL, MAVLINK_TYPE_FLOAT, 0, 60, offsetof(mavlink_rocket_stats_tm_t, apogee_lat) }, \
+         { "apogee_lon", NULL, MAVLINK_TYPE_FLOAT, 0, 64, offsetof(mavlink_rocket_stats_tm_t, apogee_lon) }, \
+         { "apogee_alt", NULL, MAVLINK_TYPE_FLOAT, 0, 68, offsetof(mavlink_rocket_stats_tm_t, apogee_alt) }, \
+         { "min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 72, offsetof(mavlink_rocket_stats_tm_t, min_pressure) }, \
+         { "ada_min_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 76, offsetof(mavlink_rocket_stats_tm_t, ada_min_pressure) }, \
+         { "dpl_vane_max_pressure", NULL, MAVLINK_TYPE_FLOAT, 0, 80, offsetof(mavlink_rocket_stats_tm_t, dpl_vane_max_pressure) }, \
+         { "cpu_load", NULL, MAVLINK_TYPE_FLOAT, 0, 84, offsetof(mavlink_rocket_stats_tm_t, cpu_load) }, \
+         { "free_heap", NULL, MAVLINK_TYPE_UINT32_T, 0, 88, offsetof(mavlink_rocket_stats_tm_t, free_heap) }, \
          } \
 }
 #endif
@@ -113,6 +95,8 @@ typedef struct __mavlink_rocket_stats_tm_t {
  * @param liftoff_ts [us] System clock at liftoff
  * @param liftoff_max_acc_ts [us] System clock at the maximum liftoff acceleration
  * @param liftoff_max_acc [m/s2] Maximum liftoff acceleration
+ * @param dpl_ts [us] System clock at drouge deployment
+ * @param dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param max_z_speed_ts [us] System clock at ADA max vertical speed
  * @param max_z_speed [m/s] Max measured vertical speed - ADA
  * @param max_airspeed_pitot [m/s] Max speed read by the pitot tube
@@ -120,77 +104,57 @@ typedef struct __mavlink_rocket_stats_tm_t {
  * @param apogee_ts [us] System clock at apogee
  * @param apogee_lat [deg] Apogee latitude
  * @param apogee_lon [deg] Apogee longitude
- * @param static_min_pressure [Pa] Apogee pressure - Static ports
- * @param digital_min_pressure [Pa] Apogee pressure - Digital barometer
+ * @param apogee_alt [m] Apogee altitude
+ * @param min_pressure [Pa] Apogee pressure - Digital barometer
  * @param ada_min_pressure [Pa] Apogee pressure - ADA filtered
- * @param baro_max_altitude [m] Apogee altitude - Digital barometer
- * @param gps_max_altitude [m] Apogee altitude - GPS
- * @param drogue_dpl_ts [us] System clock at drouge deployment
- * @param drogue_dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param dpl_vane_max_pressure [Pa] Max pressure in the deployment bay during drogue deployment
- * @param main_dpl_altitude_ts [us] System clock at main chute deployment
- * @param main_dpl_altitude [m] Altittude at main deployment (m.s.l)
- * @param main_dpl_zspeed [m/s] Vertical speed at main deployment (sensor z axis)
- * @param main_dpl_acc [m/s2] Max measured vertical acceleration (sensor z axis) after main parachute deployment
  * @param cpu_load  CPU load in percentage
  * @param free_heap  Amount of available heap in memory
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_rocket_stats_tm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-                               uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float static_min_pressure, float digital_min_pressure, float ada_min_pressure, float baro_max_altitude, float gps_max_altitude, uint64_t drogue_dpl_ts, float drogue_dpl_max_acc, float dpl_vane_max_pressure, uint64_t main_dpl_altitude_ts, float main_dpl_altitude, float main_dpl_zspeed, float main_dpl_acc, float cpu_load, uint32_t free_heap)
+                               uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t dpl_ts, float dpl_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float apogee_alt, float min_pressure, float ada_min_pressure, float dpl_vane_max_pressure, float cpu_load, uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN];
     _mav_put_uint64_t(buf, 0, liftoff_ts);
     _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
-    _mav_put_uint64_t(buf, 16, max_z_speed_ts);
-    _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_uint64_t(buf, 40, main_dpl_altitude_ts);
-    _mav_put_float(buf, 48, liftoff_max_acc);
-    _mav_put_float(buf, 52, max_z_speed);
-    _mav_put_float(buf, 56, max_airspeed_pitot);
-    _mav_put_float(buf, 60, max_speed_altitude);
-    _mav_put_float(buf, 64, apogee_lat);
-    _mav_put_float(buf, 68, apogee_lon);
-    _mav_put_float(buf, 72, static_min_pressure);
-    _mav_put_float(buf, 76, digital_min_pressure);
-    _mav_put_float(buf, 80, ada_min_pressure);
-    _mav_put_float(buf, 84, baro_max_altitude);
-    _mav_put_float(buf, 88, gps_max_altitude);
-    _mav_put_float(buf, 92, drogue_dpl_max_acc);
-    _mav_put_float(buf, 96, dpl_vane_max_pressure);
-    _mav_put_float(buf, 100, main_dpl_altitude);
-    _mav_put_float(buf, 104, main_dpl_zspeed);
-    _mav_put_float(buf, 108, main_dpl_acc);
-    _mav_put_float(buf, 112, cpu_load);
-    _mav_put_uint32_t(buf, 116, free_heap);
+    _mav_put_uint64_t(buf, 16, dpl_ts);
+    _mav_put_uint64_t(buf, 24, max_z_speed_ts);
+    _mav_put_uint64_t(buf, 32, apogee_ts);
+    _mav_put_float(buf, 40, liftoff_max_acc);
+    _mav_put_float(buf, 44, dpl_max_acc);
+    _mav_put_float(buf, 48, max_z_speed);
+    _mav_put_float(buf, 52, max_airspeed_pitot);
+    _mav_put_float(buf, 56, max_speed_altitude);
+    _mav_put_float(buf, 60, apogee_lat);
+    _mav_put_float(buf, 64, apogee_lon);
+    _mav_put_float(buf, 68, apogee_alt);
+    _mav_put_float(buf, 72, min_pressure);
+    _mav_put_float(buf, 76, ada_min_pressure);
+    _mav_put_float(buf, 80, dpl_vane_max_pressure);
+    _mav_put_float(buf, 84, cpu_load);
+    _mav_put_uint32_t(buf, 88, free_heap);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN);
 #else
     mavlink_rocket_stats_tm_t packet;
     packet.liftoff_ts = liftoff_ts;
     packet.liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet.dpl_ts = dpl_ts;
     packet.max_z_speed_ts = max_z_speed_ts;
     packet.apogee_ts = apogee_ts;
-    packet.drogue_dpl_ts = drogue_dpl_ts;
-    packet.main_dpl_altitude_ts = main_dpl_altitude_ts;
     packet.liftoff_max_acc = liftoff_max_acc;
+    packet.dpl_max_acc = dpl_max_acc;
     packet.max_z_speed = max_z_speed;
     packet.max_airspeed_pitot = max_airspeed_pitot;
     packet.max_speed_altitude = max_speed_altitude;
     packet.apogee_lat = apogee_lat;
     packet.apogee_lon = apogee_lon;
-    packet.static_min_pressure = static_min_pressure;
-    packet.digital_min_pressure = digital_min_pressure;
+    packet.apogee_alt = apogee_alt;
+    packet.min_pressure = min_pressure;
     packet.ada_min_pressure = ada_min_pressure;
-    packet.baro_max_altitude = baro_max_altitude;
-    packet.gps_max_altitude = gps_max_altitude;
-    packet.drogue_dpl_max_acc = drogue_dpl_max_acc;
     packet.dpl_vane_max_pressure = dpl_vane_max_pressure;
-    packet.main_dpl_altitude = main_dpl_altitude;
-    packet.main_dpl_zspeed = main_dpl_zspeed;
-    packet.main_dpl_acc = main_dpl_acc;
     packet.cpu_load = cpu_load;
     packet.free_heap = free_heap;
 
@@ -210,6 +174,8 @@ static inline uint16_t mavlink_msg_rocket_stats_tm_pack(uint8_t system_id, uint8
  * @param liftoff_ts [us] System clock at liftoff
  * @param liftoff_max_acc_ts [us] System clock at the maximum liftoff acceleration
  * @param liftoff_max_acc [m/s2] Maximum liftoff acceleration
+ * @param dpl_ts [us] System clock at drouge deployment
+ * @param dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param max_z_speed_ts [us] System clock at ADA max vertical speed
  * @param max_z_speed [m/s] Max measured vertical speed - ADA
  * @param max_airspeed_pitot [m/s] Max speed read by the pitot tube
@@ -217,78 +183,58 @@ static inline uint16_t mavlink_msg_rocket_stats_tm_pack(uint8_t system_id, uint8
  * @param apogee_ts [us] System clock at apogee
  * @param apogee_lat [deg] Apogee latitude
  * @param apogee_lon [deg] Apogee longitude
- * @param static_min_pressure [Pa] Apogee pressure - Static ports
- * @param digital_min_pressure [Pa] Apogee pressure - Digital barometer
+ * @param apogee_alt [m] Apogee altitude
+ * @param min_pressure [Pa] Apogee pressure - Digital barometer
  * @param ada_min_pressure [Pa] Apogee pressure - ADA filtered
- * @param baro_max_altitude [m] Apogee altitude - Digital barometer
- * @param gps_max_altitude [m] Apogee altitude - GPS
- * @param drogue_dpl_ts [us] System clock at drouge deployment
- * @param drogue_dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param dpl_vane_max_pressure [Pa] Max pressure in the deployment bay during drogue deployment
- * @param main_dpl_altitude_ts [us] System clock at main chute deployment
- * @param main_dpl_altitude [m] Altittude at main deployment (m.s.l)
- * @param main_dpl_zspeed [m/s] Vertical speed at main deployment (sensor z axis)
- * @param main_dpl_acc [m/s2] Max measured vertical acceleration (sensor z axis) after main parachute deployment
  * @param cpu_load  CPU load in percentage
  * @param free_heap  Amount of available heap in memory
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_rocket_stats_tm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
                                mavlink_message_t* msg,
-                                   uint64_t liftoff_ts,uint64_t liftoff_max_acc_ts,float liftoff_max_acc,uint64_t max_z_speed_ts,float max_z_speed,float max_airspeed_pitot,float max_speed_altitude,uint64_t apogee_ts,float apogee_lat,float apogee_lon,float static_min_pressure,float digital_min_pressure,float ada_min_pressure,float baro_max_altitude,float gps_max_altitude,uint64_t drogue_dpl_ts,float drogue_dpl_max_acc,float dpl_vane_max_pressure,uint64_t main_dpl_altitude_ts,float main_dpl_altitude,float main_dpl_zspeed,float main_dpl_acc,float cpu_load,uint32_t free_heap)
+                                   uint64_t liftoff_ts,uint64_t liftoff_max_acc_ts,float liftoff_max_acc,uint64_t dpl_ts,float dpl_max_acc,uint64_t max_z_speed_ts,float max_z_speed,float max_airspeed_pitot,float max_speed_altitude,uint64_t apogee_ts,float apogee_lat,float apogee_lon,float apogee_alt,float min_pressure,float ada_min_pressure,float dpl_vane_max_pressure,float cpu_load,uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN];
     _mav_put_uint64_t(buf, 0, liftoff_ts);
     _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
-    _mav_put_uint64_t(buf, 16, max_z_speed_ts);
-    _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_uint64_t(buf, 40, main_dpl_altitude_ts);
-    _mav_put_float(buf, 48, liftoff_max_acc);
-    _mav_put_float(buf, 52, max_z_speed);
-    _mav_put_float(buf, 56, max_airspeed_pitot);
-    _mav_put_float(buf, 60, max_speed_altitude);
-    _mav_put_float(buf, 64, apogee_lat);
-    _mav_put_float(buf, 68, apogee_lon);
-    _mav_put_float(buf, 72, static_min_pressure);
-    _mav_put_float(buf, 76, digital_min_pressure);
-    _mav_put_float(buf, 80, ada_min_pressure);
-    _mav_put_float(buf, 84, baro_max_altitude);
-    _mav_put_float(buf, 88, gps_max_altitude);
-    _mav_put_float(buf, 92, drogue_dpl_max_acc);
-    _mav_put_float(buf, 96, dpl_vane_max_pressure);
-    _mav_put_float(buf, 100, main_dpl_altitude);
-    _mav_put_float(buf, 104, main_dpl_zspeed);
-    _mav_put_float(buf, 108, main_dpl_acc);
-    _mav_put_float(buf, 112, cpu_load);
-    _mav_put_uint32_t(buf, 116, free_heap);
+    _mav_put_uint64_t(buf, 16, dpl_ts);
+    _mav_put_uint64_t(buf, 24, max_z_speed_ts);
+    _mav_put_uint64_t(buf, 32, apogee_ts);
+    _mav_put_float(buf, 40, liftoff_max_acc);
+    _mav_put_float(buf, 44, dpl_max_acc);
+    _mav_put_float(buf, 48, max_z_speed);
+    _mav_put_float(buf, 52, max_airspeed_pitot);
+    _mav_put_float(buf, 56, max_speed_altitude);
+    _mav_put_float(buf, 60, apogee_lat);
+    _mav_put_float(buf, 64, apogee_lon);
+    _mav_put_float(buf, 68, apogee_alt);
+    _mav_put_float(buf, 72, min_pressure);
+    _mav_put_float(buf, 76, ada_min_pressure);
+    _mav_put_float(buf, 80, dpl_vane_max_pressure);
+    _mav_put_float(buf, 84, cpu_load);
+    _mav_put_uint32_t(buf, 88, free_heap);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN);
 #else
     mavlink_rocket_stats_tm_t packet;
     packet.liftoff_ts = liftoff_ts;
     packet.liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet.dpl_ts = dpl_ts;
     packet.max_z_speed_ts = max_z_speed_ts;
     packet.apogee_ts = apogee_ts;
-    packet.drogue_dpl_ts = drogue_dpl_ts;
-    packet.main_dpl_altitude_ts = main_dpl_altitude_ts;
     packet.liftoff_max_acc = liftoff_max_acc;
+    packet.dpl_max_acc = dpl_max_acc;
     packet.max_z_speed = max_z_speed;
     packet.max_airspeed_pitot = max_airspeed_pitot;
     packet.max_speed_altitude = max_speed_altitude;
     packet.apogee_lat = apogee_lat;
     packet.apogee_lon = apogee_lon;
-    packet.static_min_pressure = static_min_pressure;
-    packet.digital_min_pressure = digital_min_pressure;
+    packet.apogee_alt = apogee_alt;
+    packet.min_pressure = min_pressure;
     packet.ada_min_pressure = ada_min_pressure;
-    packet.baro_max_altitude = baro_max_altitude;
-    packet.gps_max_altitude = gps_max_altitude;
-    packet.drogue_dpl_max_acc = drogue_dpl_max_acc;
     packet.dpl_vane_max_pressure = dpl_vane_max_pressure;
-    packet.main_dpl_altitude = main_dpl_altitude;
-    packet.main_dpl_zspeed = main_dpl_zspeed;
-    packet.main_dpl_acc = main_dpl_acc;
     packet.cpu_load = cpu_load;
     packet.free_heap = free_heap;
 
@@ -309,7 +255,7 @@ static inline uint16_t mavlink_msg_rocket_stats_tm_pack_chan(uint8_t system_id,
  */
 static inline uint16_t mavlink_msg_rocket_stats_tm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_rocket_stats_tm_t* rocket_stats_tm)
 {
-    return mavlink_msg_rocket_stats_tm_pack(system_id, component_id, msg, rocket_stats_tm->liftoff_ts, rocket_stats_tm->liftoff_max_acc_ts, rocket_stats_tm->liftoff_max_acc, rocket_stats_tm->max_z_speed_ts, rocket_stats_tm->max_z_speed, rocket_stats_tm->max_airspeed_pitot, rocket_stats_tm->max_speed_altitude, rocket_stats_tm->apogee_ts, rocket_stats_tm->apogee_lat, rocket_stats_tm->apogee_lon, rocket_stats_tm->static_min_pressure, rocket_stats_tm->digital_min_pressure, rocket_stats_tm->ada_min_pressure, rocket_stats_tm->baro_max_altitude, rocket_stats_tm->gps_max_altitude, rocket_stats_tm->drogue_dpl_ts, rocket_stats_tm->drogue_dpl_max_acc, rocket_stats_tm->dpl_vane_max_pressure, rocket_stats_tm->main_dpl_altitude_ts, rocket_stats_tm->main_dpl_altitude, rocket_stats_tm->main_dpl_zspeed, rocket_stats_tm->main_dpl_acc, rocket_stats_tm->cpu_load, rocket_stats_tm->free_heap);
+    return mavlink_msg_rocket_stats_tm_pack(system_id, component_id, msg, rocket_stats_tm->liftoff_ts, rocket_stats_tm->liftoff_max_acc_ts, rocket_stats_tm->liftoff_max_acc, rocket_stats_tm->dpl_ts, rocket_stats_tm->dpl_max_acc, rocket_stats_tm->max_z_speed_ts, rocket_stats_tm->max_z_speed, rocket_stats_tm->max_airspeed_pitot, rocket_stats_tm->max_speed_altitude, rocket_stats_tm->apogee_ts, rocket_stats_tm->apogee_lat, rocket_stats_tm->apogee_lon, rocket_stats_tm->apogee_alt, rocket_stats_tm->min_pressure, rocket_stats_tm->ada_min_pressure, rocket_stats_tm->dpl_vane_max_pressure, rocket_stats_tm->cpu_load, rocket_stats_tm->free_heap);
 }
 
 /**
@@ -323,7 +269,7 @@ static inline uint16_t mavlink_msg_rocket_stats_tm_encode(uint8_t system_id, uin
  */
 static inline uint16_t mavlink_msg_rocket_stats_tm_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_rocket_stats_tm_t* rocket_stats_tm)
 {
-    return mavlink_msg_rocket_stats_tm_pack_chan(system_id, component_id, chan, msg, rocket_stats_tm->liftoff_ts, rocket_stats_tm->liftoff_max_acc_ts, rocket_stats_tm->liftoff_max_acc, rocket_stats_tm->max_z_speed_ts, rocket_stats_tm->max_z_speed, rocket_stats_tm->max_airspeed_pitot, rocket_stats_tm->max_speed_altitude, rocket_stats_tm->apogee_ts, rocket_stats_tm->apogee_lat, rocket_stats_tm->apogee_lon, rocket_stats_tm->static_min_pressure, rocket_stats_tm->digital_min_pressure, rocket_stats_tm->ada_min_pressure, rocket_stats_tm->baro_max_altitude, rocket_stats_tm->gps_max_altitude, rocket_stats_tm->drogue_dpl_ts, rocket_stats_tm->drogue_dpl_max_acc, rocket_stats_tm->dpl_vane_max_pressure, rocket_stats_tm->main_dpl_altitude_ts, rocket_stats_tm->main_dpl_altitude, rocket_stats_tm->main_dpl_zspeed, rocket_stats_tm->main_dpl_acc, rocket_stats_tm->cpu_load, rocket_stats_tm->free_heap);
+    return mavlink_msg_rocket_stats_tm_pack_chan(system_id, component_id, chan, msg, rocket_stats_tm->liftoff_ts, rocket_stats_tm->liftoff_max_acc_ts, rocket_stats_tm->liftoff_max_acc, rocket_stats_tm->dpl_ts, rocket_stats_tm->dpl_max_acc, rocket_stats_tm->max_z_speed_ts, rocket_stats_tm->max_z_speed, rocket_stats_tm->max_airspeed_pitot, rocket_stats_tm->max_speed_altitude, rocket_stats_tm->apogee_ts, rocket_stats_tm->apogee_lat, rocket_stats_tm->apogee_lon, rocket_stats_tm->apogee_alt, rocket_stats_tm->min_pressure, rocket_stats_tm->ada_min_pressure, rocket_stats_tm->dpl_vane_max_pressure, rocket_stats_tm->cpu_load, rocket_stats_tm->free_heap);
 }
 
 /**
@@ -333,6 +279,8 @@ static inline uint16_t mavlink_msg_rocket_stats_tm_encode_chan(uint8_t system_id
  * @param liftoff_ts [us] System clock at liftoff
  * @param liftoff_max_acc_ts [us] System clock at the maximum liftoff acceleration
  * @param liftoff_max_acc [m/s2] Maximum liftoff acceleration
+ * @param dpl_ts [us] System clock at drouge deployment
+ * @param dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param max_z_speed_ts [us] System clock at ADA max vertical speed
  * @param max_z_speed [m/s] Max measured vertical speed - ADA
  * @param max_airspeed_pitot [m/s] Max speed read by the pitot tube
@@ -340,77 +288,57 @@ static inline uint16_t mavlink_msg_rocket_stats_tm_encode_chan(uint8_t system_id
  * @param apogee_ts [us] System clock at apogee
  * @param apogee_lat [deg] Apogee latitude
  * @param apogee_lon [deg] Apogee longitude
- * @param static_min_pressure [Pa] Apogee pressure - Static ports
- * @param digital_min_pressure [Pa] Apogee pressure - Digital barometer
+ * @param apogee_alt [m] Apogee altitude
+ * @param min_pressure [Pa] Apogee pressure - Digital barometer
  * @param ada_min_pressure [Pa] Apogee pressure - ADA filtered
- * @param baro_max_altitude [m] Apogee altitude - Digital barometer
- * @param gps_max_altitude [m] Apogee altitude - GPS
- * @param drogue_dpl_ts [us] System clock at drouge deployment
- * @param drogue_dpl_max_acc [m/s2] Max acceleration during drouge deployment
  * @param dpl_vane_max_pressure [Pa] Max pressure in the deployment bay during drogue deployment
- * @param main_dpl_altitude_ts [us] System clock at main chute deployment
- * @param main_dpl_altitude [m] Altittude at main deployment (m.s.l)
- * @param main_dpl_zspeed [m/s] Vertical speed at main deployment (sensor z axis)
- * @param main_dpl_acc [m/s2] Max measured vertical acceleration (sensor z axis) after main parachute deployment
  * @param cpu_load  CPU load in percentage
  * @param free_heap  Amount of available heap in memory
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
-static inline void mavlink_msg_rocket_stats_tm_send(mavlink_channel_t chan, uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float static_min_pressure, float digital_min_pressure, float ada_min_pressure, float baro_max_altitude, float gps_max_altitude, uint64_t drogue_dpl_ts, float drogue_dpl_max_acc, float dpl_vane_max_pressure, uint64_t main_dpl_altitude_ts, float main_dpl_altitude, float main_dpl_zspeed, float main_dpl_acc, float cpu_load, uint32_t free_heap)
+static inline void mavlink_msg_rocket_stats_tm_send(mavlink_channel_t chan, uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t dpl_ts, float dpl_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float apogee_alt, float min_pressure, float ada_min_pressure, float dpl_vane_max_pressure, float cpu_load, uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN];
     _mav_put_uint64_t(buf, 0, liftoff_ts);
     _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
-    _mav_put_uint64_t(buf, 16, max_z_speed_ts);
-    _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_uint64_t(buf, 40, main_dpl_altitude_ts);
-    _mav_put_float(buf, 48, liftoff_max_acc);
-    _mav_put_float(buf, 52, max_z_speed);
-    _mav_put_float(buf, 56, max_airspeed_pitot);
-    _mav_put_float(buf, 60, max_speed_altitude);
-    _mav_put_float(buf, 64, apogee_lat);
-    _mav_put_float(buf, 68, apogee_lon);
-    _mav_put_float(buf, 72, static_min_pressure);
-    _mav_put_float(buf, 76, digital_min_pressure);
-    _mav_put_float(buf, 80, ada_min_pressure);
-    _mav_put_float(buf, 84, baro_max_altitude);
-    _mav_put_float(buf, 88, gps_max_altitude);
-    _mav_put_float(buf, 92, drogue_dpl_max_acc);
-    _mav_put_float(buf, 96, dpl_vane_max_pressure);
-    _mav_put_float(buf, 100, main_dpl_altitude);
-    _mav_put_float(buf, 104, main_dpl_zspeed);
-    _mav_put_float(buf, 108, main_dpl_acc);
-    _mav_put_float(buf, 112, cpu_load);
-    _mav_put_uint32_t(buf, 116, free_heap);
+    _mav_put_uint64_t(buf, 16, dpl_ts);
+    _mav_put_uint64_t(buf, 24, max_z_speed_ts);
+    _mav_put_uint64_t(buf, 32, apogee_ts);
+    _mav_put_float(buf, 40, liftoff_max_acc);
+    _mav_put_float(buf, 44, dpl_max_acc);
+    _mav_put_float(buf, 48, max_z_speed);
+    _mav_put_float(buf, 52, max_airspeed_pitot);
+    _mav_put_float(buf, 56, max_speed_altitude);
+    _mav_put_float(buf, 60, apogee_lat);
+    _mav_put_float(buf, 64, apogee_lon);
+    _mav_put_float(buf, 68, apogee_alt);
+    _mav_put_float(buf, 72, min_pressure);
+    _mav_put_float(buf, 76, ada_min_pressure);
+    _mav_put_float(buf, 80, dpl_vane_max_pressure);
+    _mav_put_float(buf, 84, cpu_load);
+    _mav_put_uint32_t(buf, 88, free_heap);
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_STATS_TM, buf, MAVLINK_MSG_ID_ROCKET_STATS_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN, MAVLINK_MSG_ID_ROCKET_STATS_TM_CRC);
 #else
     mavlink_rocket_stats_tm_t packet;
     packet.liftoff_ts = liftoff_ts;
     packet.liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet.dpl_ts = dpl_ts;
     packet.max_z_speed_ts = max_z_speed_ts;
     packet.apogee_ts = apogee_ts;
-    packet.drogue_dpl_ts = drogue_dpl_ts;
-    packet.main_dpl_altitude_ts = main_dpl_altitude_ts;
     packet.liftoff_max_acc = liftoff_max_acc;
+    packet.dpl_max_acc = dpl_max_acc;
     packet.max_z_speed = max_z_speed;
     packet.max_airspeed_pitot = max_airspeed_pitot;
     packet.max_speed_altitude = max_speed_altitude;
     packet.apogee_lat = apogee_lat;
     packet.apogee_lon = apogee_lon;
-    packet.static_min_pressure = static_min_pressure;
-    packet.digital_min_pressure = digital_min_pressure;
+    packet.apogee_alt = apogee_alt;
+    packet.min_pressure = min_pressure;
     packet.ada_min_pressure = ada_min_pressure;
-    packet.baro_max_altitude = baro_max_altitude;
-    packet.gps_max_altitude = gps_max_altitude;
-    packet.drogue_dpl_max_acc = drogue_dpl_max_acc;
     packet.dpl_vane_max_pressure = dpl_vane_max_pressure;
-    packet.main_dpl_altitude = main_dpl_altitude;
-    packet.main_dpl_zspeed = main_dpl_zspeed;
-    packet.main_dpl_acc = main_dpl_acc;
     packet.cpu_load = cpu_load;
     packet.free_heap = free_heap;
 
@@ -426,7 +354,7 @@ static inline void mavlink_msg_rocket_stats_tm_send(mavlink_channel_t chan, uint
 static inline void mavlink_msg_rocket_stats_tm_send_struct(mavlink_channel_t chan, const mavlink_rocket_stats_tm_t* rocket_stats_tm)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-    mavlink_msg_rocket_stats_tm_send(chan, rocket_stats_tm->liftoff_ts, rocket_stats_tm->liftoff_max_acc_ts, rocket_stats_tm->liftoff_max_acc, rocket_stats_tm->max_z_speed_ts, rocket_stats_tm->max_z_speed, rocket_stats_tm->max_airspeed_pitot, rocket_stats_tm->max_speed_altitude, rocket_stats_tm->apogee_ts, rocket_stats_tm->apogee_lat, rocket_stats_tm->apogee_lon, rocket_stats_tm->static_min_pressure, rocket_stats_tm->digital_min_pressure, rocket_stats_tm->ada_min_pressure, rocket_stats_tm->baro_max_altitude, rocket_stats_tm->gps_max_altitude, rocket_stats_tm->drogue_dpl_ts, rocket_stats_tm->drogue_dpl_max_acc, rocket_stats_tm->dpl_vane_max_pressure, rocket_stats_tm->main_dpl_altitude_ts, rocket_stats_tm->main_dpl_altitude, rocket_stats_tm->main_dpl_zspeed, rocket_stats_tm->main_dpl_acc, rocket_stats_tm->cpu_load, rocket_stats_tm->free_heap);
+    mavlink_msg_rocket_stats_tm_send(chan, rocket_stats_tm->liftoff_ts, rocket_stats_tm->liftoff_max_acc_ts, rocket_stats_tm->liftoff_max_acc, rocket_stats_tm->dpl_ts, rocket_stats_tm->dpl_max_acc, rocket_stats_tm->max_z_speed_ts, rocket_stats_tm->max_z_speed, rocket_stats_tm->max_airspeed_pitot, rocket_stats_tm->max_speed_altitude, rocket_stats_tm->apogee_ts, rocket_stats_tm->apogee_lat, rocket_stats_tm->apogee_lon, rocket_stats_tm->apogee_alt, rocket_stats_tm->min_pressure, rocket_stats_tm->ada_min_pressure, rocket_stats_tm->dpl_vane_max_pressure, rocket_stats_tm->cpu_load, rocket_stats_tm->free_heap);
 #else
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_STATS_TM, (const char *)rocket_stats_tm, MAVLINK_MSG_ID_ROCKET_STATS_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN, MAVLINK_MSG_ID_ROCKET_STATS_TM_CRC);
 #endif
@@ -440,60 +368,48 @@ static inline void mavlink_msg_rocket_stats_tm_send_struct(mavlink_channel_t cha
   is usually the receive buffer for the channel, and allows a reply to an
   incoming message with minimum stack space usage.
  */
-static inline void mavlink_msg_rocket_stats_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float static_min_pressure, float digital_min_pressure, float ada_min_pressure, float baro_max_altitude, float gps_max_altitude, uint64_t drogue_dpl_ts, float drogue_dpl_max_acc, float dpl_vane_max_pressure, uint64_t main_dpl_altitude_ts, float main_dpl_altitude, float main_dpl_zspeed, float main_dpl_acc, float cpu_load, uint32_t free_heap)
+static inline void mavlink_msg_rocket_stats_tm_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint64_t liftoff_ts, uint64_t liftoff_max_acc_ts, float liftoff_max_acc, uint64_t dpl_ts, float dpl_max_acc, uint64_t max_z_speed_ts, float max_z_speed, float max_airspeed_pitot, float max_speed_altitude, uint64_t apogee_ts, float apogee_lat, float apogee_lon, float apogee_alt, float min_pressure, float ada_min_pressure, float dpl_vane_max_pressure, float cpu_load, uint32_t free_heap)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char *buf = (char *)msgbuf;
     _mav_put_uint64_t(buf, 0, liftoff_ts);
     _mav_put_uint64_t(buf, 8, liftoff_max_acc_ts);
-    _mav_put_uint64_t(buf, 16, max_z_speed_ts);
-    _mav_put_uint64_t(buf, 24, apogee_ts);
-    _mav_put_uint64_t(buf, 32, drogue_dpl_ts);
-    _mav_put_uint64_t(buf, 40, main_dpl_altitude_ts);
-    _mav_put_float(buf, 48, liftoff_max_acc);
-    _mav_put_float(buf, 52, max_z_speed);
-    _mav_put_float(buf, 56, max_airspeed_pitot);
-    _mav_put_float(buf, 60, max_speed_altitude);
-    _mav_put_float(buf, 64, apogee_lat);
-    _mav_put_float(buf, 68, apogee_lon);
-    _mav_put_float(buf, 72, static_min_pressure);
-    _mav_put_float(buf, 76, digital_min_pressure);
-    _mav_put_float(buf, 80, ada_min_pressure);
-    _mav_put_float(buf, 84, baro_max_altitude);
-    _mav_put_float(buf, 88, gps_max_altitude);
-    _mav_put_float(buf, 92, drogue_dpl_max_acc);
-    _mav_put_float(buf, 96, dpl_vane_max_pressure);
-    _mav_put_float(buf, 100, main_dpl_altitude);
-    _mav_put_float(buf, 104, main_dpl_zspeed);
-    _mav_put_float(buf, 108, main_dpl_acc);
-    _mav_put_float(buf, 112, cpu_load);
-    _mav_put_uint32_t(buf, 116, free_heap);
+    _mav_put_uint64_t(buf, 16, dpl_ts);
+    _mav_put_uint64_t(buf, 24, max_z_speed_ts);
+    _mav_put_uint64_t(buf, 32, apogee_ts);
+    _mav_put_float(buf, 40, liftoff_max_acc);
+    _mav_put_float(buf, 44, dpl_max_acc);
+    _mav_put_float(buf, 48, max_z_speed);
+    _mav_put_float(buf, 52, max_airspeed_pitot);
+    _mav_put_float(buf, 56, max_speed_altitude);
+    _mav_put_float(buf, 60, apogee_lat);
+    _mav_put_float(buf, 64, apogee_lon);
+    _mav_put_float(buf, 68, apogee_alt);
+    _mav_put_float(buf, 72, min_pressure);
+    _mav_put_float(buf, 76, ada_min_pressure);
+    _mav_put_float(buf, 80, dpl_vane_max_pressure);
+    _mav_put_float(buf, 84, cpu_load);
+    _mav_put_uint32_t(buf, 88, free_heap);
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ROCKET_STATS_TM, buf, MAVLINK_MSG_ID_ROCKET_STATS_TM_MIN_LEN, MAVLINK_MSG_ID_ROCKET_STATS_TM_LEN, MAVLINK_MSG_ID_ROCKET_STATS_TM_CRC);
 #else
     mavlink_rocket_stats_tm_t *packet = (mavlink_rocket_stats_tm_t *)msgbuf;
     packet->liftoff_ts = liftoff_ts;
     packet->liftoff_max_acc_ts = liftoff_max_acc_ts;
+    packet->dpl_ts = dpl_ts;
     packet->max_z_speed_ts = max_z_speed_ts;
     packet->apogee_ts = apogee_ts;
-    packet->drogue_dpl_ts = drogue_dpl_ts;
-    packet->main_dpl_altitude_ts = main_dpl_altitude_ts;
     packet->liftoff_max_acc = liftoff_max_acc;
+    packet->dpl_max_acc = dpl_max_acc;
     packet->max_z_speed = max_z_speed;
     packet->max_airspeed_pitot = max_airspeed_pitot;
     packet->max_speed_altitude = max_speed_altitude;
     packet->apogee_lat = apogee_lat;
     packet->apogee_lon = apogee_lon;
-    packet->static_min_pressure = static_min_pressure;
-    packet->digital_min_pressure = digital_min_pressure;
+    packet->apogee_alt = apogee_alt;
+    packet->min_pressure = min_pressure;
     packet->ada_min_pressure = ada_min_pressure;
-    packet->baro_max_altitude = baro_max_altitude;
-    packet->gps_max_altitude = gps_max_altitude;
-    packet->drogue_dpl_max_acc = drogue_dpl_max_acc;
     packet->dpl_vane_max_pressure = dpl_vane_max_pressure;
-    packet->main_dpl_altitude = main_dpl_altitude;
-    packet->main_dpl_zspeed = main_dpl_zspeed;
-    packet->main_dpl_acc = main_dpl_acc;
     packet->cpu_load = cpu_load;
     packet->free_heap = free_heap;
 
@@ -534,7 +450,27 @@ static inline uint64_t mavlink_msg_rocket_stats_tm_get_liftoff_max_acc_ts(const
  */
 static inline float mavlink_msg_rocket_stats_tm_get_liftoff_max_acc(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  48);
+    return _MAV_RETURN_float(msg,  40);
+}
+
+/**
+ * @brief Get field dpl_ts from rocket_stats_tm message
+ *
+ * @return [us] System clock at drouge deployment
+ */
+static inline uint64_t mavlink_msg_rocket_stats_tm_get_dpl_ts(const mavlink_message_t* msg)
+{
+    return _MAV_RETURN_uint64_t(msg,  16);
+}
+
+/**
+ * @brief Get field dpl_max_acc from rocket_stats_tm message
+ *
+ * @return [m/s2] Max acceleration during drouge deployment
+ */
+static inline float mavlink_msg_rocket_stats_tm_get_dpl_max_acc(const mavlink_message_t* msg)
+{
+    return _MAV_RETURN_float(msg,  44);
 }
 
 /**
@@ -544,7 +480,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_liftoff_max_acc(const mavlin
  */
 static inline uint64_t mavlink_msg_rocket_stats_tm_get_max_z_speed_ts(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_uint64_t(msg,  16);
+    return _MAV_RETURN_uint64_t(msg,  24);
 }
 
 /**
@@ -554,7 +490,7 @@ static inline uint64_t mavlink_msg_rocket_stats_tm_get_max_z_speed_ts(const mavl
  */
 static inline float mavlink_msg_rocket_stats_tm_get_max_z_speed(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  52);
+    return _MAV_RETURN_float(msg,  48);
 }
 
 /**
@@ -564,7 +500,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_max_z_speed(const mavlink_me
  */
 static inline float mavlink_msg_rocket_stats_tm_get_max_airspeed_pitot(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  56);
+    return _MAV_RETURN_float(msg,  52);
 }
 
 /**
@@ -574,7 +510,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_max_airspeed_pitot(const mav
  */
 static inline float mavlink_msg_rocket_stats_tm_get_max_speed_altitude(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  60);
+    return _MAV_RETURN_float(msg,  56);
 }
 
 /**
@@ -584,7 +520,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_max_speed_altitude(const mav
  */
 static inline uint64_t mavlink_msg_rocket_stats_tm_get_apogee_ts(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_uint64_t(msg,  24);
+    return _MAV_RETURN_uint64_t(msg,  32);
 }
 
 /**
@@ -594,7 +530,7 @@ static inline uint64_t mavlink_msg_rocket_stats_tm_get_apogee_ts(const mavlink_m
  */
 static inline float mavlink_msg_rocket_stats_tm_get_apogee_lat(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  64);
+    return _MAV_RETURN_float(msg,  60);
 }
 
 /**
@@ -604,27 +540,27 @@ static inline float mavlink_msg_rocket_stats_tm_get_apogee_lat(const mavlink_mes
  */
 static inline float mavlink_msg_rocket_stats_tm_get_apogee_lon(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  68);
+    return _MAV_RETURN_float(msg,  64);
 }
 
 /**
- * @brief Get field static_min_pressure from rocket_stats_tm message
+ * @brief Get field apogee_alt from rocket_stats_tm message
  *
- * @return [Pa] Apogee pressure - Static ports
+ * @return [m] Apogee altitude
  */
-static inline float mavlink_msg_rocket_stats_tm_get_static_min_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_rocket_stats_tm_get_apogee_alt(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  72);
+    return _MAV_RETURN_float(msg,  68);
 }
 
 /**
- * @brief Get field digital_min_pressure from rocket_stats_tm message
+ * @brief Get field min_pressure from rocket_stats_tm message
  *
  * @return [Pa] Apogee pressure - Digital barometer
  */
-static inline float mavlink_msg_rocket_stats_tm_get_digital_min_pressure(const mavlink_message_t* msg)
+static inline float mavlink_msg_rocket_stats_tm_get_min_pressure(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  76);
+    return _MAV_RETURN_float(msg,  72);
 }
 
 /**
@@ -634,47 +570,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_digital_min_pressure(const m
  */
 static inline float mavlink_msg_rocket_stats_tm_get_ada_min_pressure(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  80);
-}
-
-/**
- * @brief Get field baro_max_altitude from rocket_stats_tm message
- *
- * @return [m] Apogee altitude - Digital barometer
- */
-static inline float mavlink_msg_rocket_stats_tm_get_baro_max_altitude(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  84);
-}
-
-/**
- * @brief Get field gps_max_altitude from rocket_stats_tm message
- *
- * @return [m] Apogee altitude - GPS
- */
-static inline float mavlink_msg_rocket_stats_tm_get_gps_max_altitude(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  88);
-}
-
-/**
- * @brief Get field drogue_dpl_ts from rocket_stats_tm message
- *
- * @return [us] System clock at drouge deployment
- */
-static inline uint64_t mavlink_msg_rocket_stats_tm_get_drogue_dpl_ts(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_uint64_t(msg,  32);
-}
-
-/**
- * @brief Get field drogue_dpl_max_acc from rocket_stats_tm message
- *
- * @return [m/s2] Max acceleration during drouge deployment
- */
-static inline float mavlink_msg_rocket_stats_tm_get_drogue_dpl_max_acc(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  92);
+    return _MAV_RETURN_float(msg,  76);
 }
 
 /**
@@ -684,47 +580,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_drogue_dpl_max_acc(const mav
  */
 static inline float mavlink_msg_rocket_stats_tm_get_dpl_vane_max_pressure(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  96);
-}
-
-/**
- * @brief Get field main_dpl_altitude_ts from rocket_stats_tm message
- *
- * @return [us] System clock at main chute deployment
- */
-static inline uint64_t mavlink_msg_rocket_stats_tm_get_main_dpl_altitude_ts(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_uint64_t(msg,  40);
-}
-
-/**
- * @brief Get field main_dpl_altitude from rocket_stats_tm message
- *
- * @return [m] Altittude at main deployment (m.s.l)
- */
-static inline float mavlink_msg_rocket_stats_tm_get_main_dpl_altitude(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  100);
-}
-
-/**
- * @brief Get field main_dpl_zspeed from rocket_stats_tm message
- *
- * @return [m/s] Vertical speed at main deployment (sensor z axis)
- */
-static inline float mavlink_msg_rocket_stats_tm_get_main_dpl_zspeed(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  104);
-}
-
-/**
- * @brief Get field main_dpl_acc from rocket_stats_tm message
- *
- * @return [m/s2] Max measured vertical acceleration (sensor z axis) after main parachute deployment
- */
-static inline float mavlink_msg_rocket_stats_tm_get_main_dpl_acc(const mavlink_message_t* msg)
-{
-    return _MAV_RETURN_float(msg,  108);
+    return _MAV_RETURN_float(msg,  80);
 }
 
 /**
@@ -734,7 +590,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_main_dpl_acc(const mavlink_m
  */
 static inline float mavlink_msg_rocket_stats_tm_get_cpu_load(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_float(msg,  112);
+    return _MAV_RETURN_float(msg,  84);
 }
 
 /**
@@ -744,7 +600,7 @@ static inline float mavlink_msg_rocket_stats_tm_get_cpu_load(const mavlink_messa
  */
 static inline uint32_t mavlink_msg_rocket_stats_tm_get_free_heap(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_uint32_t(msg,  116);
+    return _MAV_RETURN_uint32_t(msg,  88);
 }
 
 /**
@@ -758,26 +614,20 @@ static inline void mavlink_msg_rocket_stats_tm_decode(const mavlink_message_t* m
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     rocket_stats_tm->liftoff_ts = mavlink_msg_rocket_stats_tm_get_liftoff_ts(msg);
     rocket_stats_tm->liftoff_max_acc_ts = mavlink_msg_rocket_stats_tm_get_liftoff_max_acc_ts(msg);
+    rocket_stats_tm->dpl_ts = mavlink_msg_rocket_stats_tm_get_dpl_ts(msg);
     rocket_stats_tm->max_z_speed_ts = mavlink_msg_rocket_stats_tm_get_max_z_speed_ts(msg);
     rocket_stats_tm->apogee_ts = mavlink_msg_rocket_stats_tm_get_apogee_ts(msg);
-    rocket_stats_tm->drogue_dpl_ts = mavlink_msg_rocket_stats_tm_get_drogue_dpl_ts(msg);
-    rocket_stats_tm->main_dpl_altitude_ts = mavlink_msg_rocket_stats_tm_get_main_dpl_altitude_ts(msg);
     rocket_stats_tm->liftoff_max_acc = mavlink_msg_rocket_stats_tm_get_liftoff_max_acc(msg);
+    rocket_stats_tm->dpl_max_acc = mavlink_msg_rocket_stats_tm_get_dpl_max_acc(msg);
     rocket_stats_tm->max_z_speed = mavlink_msg_rocket_stats_tm_get_max_z_speed(msg);
     rocket_stats_tm->max_airspeed_pitot = mavlink_msg_rocket_stats_tm_get_max_airspeed_pitot(msg);
     rocket_stats_tm->max_speed_altitude = mavlink_msg_rocket_stats_tm_get_max_speed_altitude(msg);
     rocket_stats_tm->apogee_lat = mavlink_msg_rocket_stats_tm_get_apogee_lat(msg);
     rocket_stats_tm->apogee_lon = mavlink_msg_rocket_stats_tm_get_apogee_lon(msg);
-    rocket_stats_tm->static_min_pressure = mavlink_msg_rocket_stats_tm_get_static_min_pressure(msg);
-    rocket_stats_tm->digital_min_pressure = mavlink_msg_rocket_stats_tm_get_digital_min_pressure(msg);
+    rocket_stats_tm->apogee_alt = mavlink_msg_rocket_stats_tm_get_apogee_alt(msg);
+    rocket_stats_tm->min_pressure = mavlink_msg_rocket_stats_tm_get_min_pressure(msg);
     rocket_stats_tm->ada_min_pressure = mavlink_msg_rocket_stats_tm_get_ada_min_pressure(msg);
-    rocket_stats_tm->baro_max_altitude = mavlink_msg_rocket_stats_tm_get_baro_max_altitude(msg);
-    rocket_stats_tm->gps_max_altitude = mavlink_msg_rocket_stats_tm_get_gps_max_altitude(msg);
-    rocket_stats_tm->drogue_dpl_max_acc = mavlink_msg_rocket_stats_tm_get_drogue_dpl_max_acc(msg);
     rocket_stats_tm->dpl_vane_max_pressure = mavlink_msg_rocket_stats_tm_get_dpl_vane_max_pressure(msg);
-    rocket_stats_tm->main_dpl_altitude = mavlink_msg_rocket_stats_tm_get_main_dpl_altitude(msg);
-    rocket_stats_tm->main_dpl_zspeed = mavlink_msg_rocket_stats_tm_get_main_dpl_zspeed(msg);
-    rocket_stats_tm->main_dpl_acc = mavlink_msg_rocket_stats_tm_get_main_dpl_acc(msg);
     rocket_stats_tm->cpu_load = mavlink_msg_rocket_stats_tm_get_cpu_load(msg);
     rocket_stats_tm->free_heap = mavlink_msg_rocket_stats_tm_get_free_heap(msg);
 #else
diff --git a/mavlink_lib/pyxis/pyxis.h b/mavlink_lib/pyxis/pyxis.h
index b9e70eb..72668e7 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 5995035090138037098
+#define MAVLINK_THIS_XML_HASH -1786394334196858732
 
 #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, 158, 120, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define MAVLINK_MESSAGE_LENGTHS {0, 8, 1, 1, 1, 1, 5, 1, 1, 4, 4, 12, 8, 2, 4, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 74, 64, 32, 44, 32, 32, 32, 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, 92, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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}
+#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, 245, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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"
@@ -187,7 +187,7 @@ typedef enum PinsList
 
 
 #undef MAVLINK_THIS_XML_HASH
-#define MAVLINK_THIS_XML_HASH 5995035090138037098
+#define MAVLINK_THIS_XML_HASH -1786394334196858732
 
 #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 5f19e5f..7c3e750 100644
--- a/mavlink_lib/pyxis/testsuite.h
+++ b/mavlink_lib/pyxis/testsuite.h
@@ -2619,32 +2619,26 @@ static void mavlink_test_rocket_stats_tm(uint8_t system_id, uint8_t component_id
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
     mavlink_rocket_stats_tm_t packet_in = {
-        93372036854775807ULL,93372036854776311ULL,93372036854776815ULL,93372036854777319ULL,93372036854777823ULL,93372036854778327ULL,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,963503496
+        93372036854775807ULL,93372036854776311ULL,93372036854776815ULL,93372036854777319ULL,93372036854777823ULL,297.0,325.0,353.0,381.0,409.0,437.0,465.0,493.0,521.0,549.0,577.0,605.0,963502040
     };
     mavlink_rocket_stats_tm_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         packet1.liftoff_ts = packet_in.liftoff_ts;
         packet1.liftoff_max_acc_ts = packet_in.liftoff_max_acc_ts;
+        packet1.dpl_ts = packet_in.dpl_ts;
         packet1.max_z_speed_ts = packet_in.max_z_speed_ts;
         packet1.apogee_ts = packet_in.apogee_ts;
-        packet1.drogue_dpl_ts = packet_in.drogue_dpl_ts;
-        packet1.main_dpl_altitude_ts = packet_in.main_dpl_altitude_ts;
         packet1.liftoff_max_acc = packet_in.liftoff_max_acc;
+        packet1.dpl_max_acc = packet_in.dpl_max_acc;
         packet1.max_z_speed = packet_in.max_z_speed;
         packet1.max_airspeed_pitot = packet_in.max_airspeed_pitot;
         packet1.max_speed_altitude = packet_in.max_speed_altitude;
         packet1.apogee_lat = packet_in.apogee_lat;
         packet1.apogee_lon = packet_in.apogee_lon;
-        packet1.static_min_pressure = packet_in.static_min_pressure;
-        packet1.digital_min_pressure = packet_in.digital_min_pressure;
+        packet1.apogee_alt = packet_in.apogee_alt;
+        packet1.min_pressure = packet_in.min_pressure;
         packet1.ada_min_pressure = packet_in.ada_min_pressure;
-        packet1.baro_max_altitude = packet_in.baro_max_altitude;
-        packet1.gps_max_altitude = packet_in.gps_max_altitude;
-        packet1.drogue_dpl_max_acc = packet_in.drogue_dpl_max_acc;
         packet1.dpl_vane_max_pressure = packet_in.dpl_vane_max_pressure;
-        packet1.main_dpl_altitude = packet_in.main_dpl_altitude;
-        packet1.main_dpl_zspeed = packet_in.main_dpl_zspeed;
-        packet1.main_dpl_acc = packet_in.main_dpl_acc;
         packet1.cpu_load = packet_in.cpu_load;
         packet1.free_heap = packet_in.free_heap;
         
@@ -2661,12 +2655,12 @@ static void mavlink_test_rocket_stats_tm(uint8_t system_id, uint8_t component_id
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_rocket_stats_tm_pack(system_id, component_id, &msg , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.static_min_pressure , packet1.digital_min_pressure , packet1.ada_min_pressure , packet1.baro_max_altitude , packet1.gps_max_altitude , packet1.drogue_dpl_ts , packet1.drogue_dpl_max_acc , packet1.dpl_vane_max_pressure , packet1.main_dpl_altitude_ts , packet1.main_dpl_altitude , packet1.main_dpl_zspeed , packet1.main_dpl_acc , packet1.cpu_load , packet1.free_heap );
+    mavlink_msg_rocket_stats_tm_pack(system_id, component_id, &msg , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.dpl_ts , packet1.dpl_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.apogee_alt , packet1.min_pressure , packet1.ada_min_pressure , packet1.dpl_vane_max_pressure , packet1.cpu_load , packet1.free_heap );
     mavlink_msg_rocket_stats_tm_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_rocket_stats_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.static_min_pressure , packet1.digital_min_pressure , packet1.ada_min_pressure , packet1.baro_max_altitude , packet1.gps_max_altitude , packet1.drogue_dpl_ts , packet1.drogue_dpl_max_acc , packet1.dpl_vane_max_pressure , packet1.main_dpl_altitude_ts , packet1.main_dpl_altitude , packet1.main_dpl_zspeed , packet1.main_dpl_acc , packet1.cpu_load , packet1.free_heap );
+    mavlink_msg_rocket_stats_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.dpl_ts , packet1.dpl_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.apogee_alt , packet1.min_pressure , packet1.ada_min_pressure , packet1.dpl_vane_max_pressure , packet1.cpu_load , packet1.free_heap );
     mavlink_msg_rocket_stats_tm_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
@@ -2679,7 +2673,7 @@ static void mavlink_test_rocket_stats_tm(uint8_t system_id, uint8_t component_id
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
         
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_rocket_stats_tm_send(MAVLINK_COMM_1 , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.static_min_pressure , packet1.digital_min_pressure , packet1.ada_min_pressure , packet1.baro_max_altitude , packet1.gps_max_altitude , packet1.drogue_dpl_ts , packet1.drogue_dpl_max_acc , packet1.dpl_vane_max_pressure , packet1.main_dpl_altitude_ts , packet1.main_dpl_altitude , packet1.main_dpl_zspeed , packet1.main_dpl_acc , packet1.cpu_load , packet1.free_heap );
+    mavlink_msg_rocket_stats_tm_send(MAVLINK_COMM_1 , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.dpl_ts , packet1.dpl_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.apogee_alt , packet1.min_pressure , packet1.ada_min_pressure , packet1.dpl_vane_max_pressure , packet1.cpu_load , packet1.free_heap );
     mavlink_msg_rocket_stats_tm_decode(last_msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
@@ -2701,27 +2695,23 @@ static void mavlink_test_payload_stats_tm(uint8_t system_id, uint8_t component_i
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
     mavlink_payload_stats_tm_t packet_in = {
-        93372036854775807ULL,93372036854776311ULL,93372036854776815ULL,93372036854777319ULL,93372036854777823ULL,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,963502248
+        93372036854775807ULL,93372036854776311ULL,93372036854776815ULL,93372036854777319ULL,241.0,269.0,297.0,325.0,353.0,381.0,409.0,437.0,465.0,493.0,963501208
     };
     mavlink_payload_stats_tm_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
-        packet1.liftoff_ts = packet_in.liftoff_ts;
         packet1.liftoff_max_acc_ts = packet_in.liftoff_max_acc_ts;
+        packet1.dpl_ts = packet_in.dpl_ts;
         packet1.max_z_speed_ts = packet_in.max_z_speed_ts;
         packet1.apogee_ts = packet_in.apogee_ts;
-        packet1.drogue_dpl_ts = packet_in.drogue_dpl_ts;
         packet1.liftoff_max_acc = packet_in.liftoff_max_acc;
+        packet1.dpl_max_acc = packet_in.dpl_max_acc;
         packet1.max_z_speed = packet_in.max_z_speed;
         packet1.max_airspeed_pitot = packet_in.max_airspeed_pitot;
         packet1.max_speed_altitude = packet_in.max_speed_altitude;
         packet1.apogee_lat = packet_in.apogee_lat;
         packet1.apogee_lon = packet_in.apogee_lon;
-        packet1.static_min_pressure = packet_in.static_min_pressure;
-        packet1.digital_min_pressure = packet_in.digital_min_pressure;
-        packet1.ada_min_pressure = packet_in.ada_min_pressure;
-        packet1.baro_max_altitude = packet_in.baro_max_altitude;
-        packet1.gps_max_altitude = packet_in.gps_max_altitude;
-        packet1.drogue_dpl_max_acc = packet_in.drogue_dpl_max_acc;
+        packet1.apogee_alt = packet_in.apogee_alt;
+        packet1.min_pressure = packet_in.min_pressure;
         packet1.cpu_load = packet_in.cpu_load;
         packet1.free_heap = packet_in.free_heap;
         
@@ -2738,12 +2728,12 @@ static void mavlink_test_payload_stats_tm(uint8_t system_id, uint8_t component_i
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_payload_stats_tm_pack(system_id, component_id, &msg , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.static_min_pressure , packet1.digital_min_pressure , packet1.ada_min_pressure , packet1.baro_max_altitude , packet1.gps_max_altitude , packet1.drogue_dpl_ts , packet1.drogue_dpl_max_acc , packet1.cpu_load , packet1.free_heap );
+    mavlink_msg_payload_stats_tm_pack(system_id, component_id, &msg , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.dpl_ts , packet1.dpl_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.apogee_alt , packet1.min_pressure , packet1.cpu_load , packet1.free_heap );
     mavlink_msg_payload_stats_tm_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_payload_stats_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.static_min_pressure , packet1.digital_min_pressure , packet1.ada_min_pressure , packet1.baro_max_altitude , packet1.gps_max_altitude , packet1.drogue_dpl_ts , packet1.drogue_dpl_max_acc , packet1.cpu_load , packet1.free_heap );
+    mavlink_msg_payload_stats_tm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.dpl_ts , packet1.dpl_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.apogee_alt , packet1.min_pressure , packet1.cpu_load , packet1.free_heap );
     mavlink_msg_payload_stats_tm_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
@@ -2756,7 +2746,7 @@ static void mavlink_test_payload_stats_tm(uint8_t system_id, uint8_t component_i
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
         
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_payload_stats_tm_send(MAVLINK_COMM_1 , packet1.liftoff_ts , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.static_min_pressure , packet1.digital_min_pressure , packet1.ada_min_pressure , packet1.baro_max_altitude , packet1.gps_max_altitude , packet1.drogue_dpl_ts , packet1.drogue_dpl_max_acc , packet1.cpu_load , packet1.free_heap );
+    mavlink_msg_payload_stats_tm_send(MAVLINK_COMM_1 , packet1.liftoff_max_acc_ts , packet1.liftoff_max_acc , packet1.dpl_ts , packet1.dpl_max_acc , packet1.max_z_speed_ts , packet1.max_z_speed , packet1.max_airspeed_pitot , packet1.max_speed_altitude , packet1.apogee_ts , packet1.apogee_lat , packet1.apogee_lon , packet1.apogee_alt , packet1.min_pressure , packet1.cpu_load , packet1.free_heap );
     mavlink_msg_payload_stats_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 1d8905d..ce1282e 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 "Mon Sep 05 2022"
+#define MAVLINK_BUILD_DATE "Thu Sep 08 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 68107bd..2998122 100644
--- a/message_definitions/pyxis.xml
+++ b/message_definitions/pyxis.xml
@@ -552,6 +552,8 @@
             <field name="liftoff_ts" type="uint64_t" units="us">System clock at liftoff</field>
             <field name="liftoff_max_acc_ts" type="uint64_t" units="us">System clock at the maximum liftoff acceleration</field>
             <field name="liftoff_max_acc" type="float" units="m/s2">Maximum liftoff acceleration</field>
+            <field name="dpl_ts" type="uint64_t" units="us">System clock at drouge deployment</field>
+            <field name="dpl_max_acc" type="float" units="m/s2">Max acceleration during drouge deployment</field>
             <field name="max_z_speed_ts" type="uint64_t" units="us">System clock at ADA max vertical speed</field>
             <field name="max_z_speed" type="float" units="m/s">Max measured vertical speed - ADA</field>
             <field name="max_airspeed_pitot" type="float" units="m/s">Max speed read by the pitot tube</field>
@@ -559,27 +561,20 @@
             <field name="apogee_ts" type="uint64_t" units="us">System clock at apogee</field>
             <field name="apogee_lat" type="float" units="deg">Apogee latitude</field>
             <field name="apogee_lon" type="float" units="deg">Apogee longitude</field>
-            <field name="static_min_pressure" type="float" units="Pa">Apogee pressure - Static ports</field>
-            <field name="digital_min_pressure" type="float" units="Pa">Apogee pressure - Digital barometer</field>
+            <field name="apogee_alt" type="float" units="m">Apogee altitude</field>
+            <field name="min_pressure" type="float" units="Pa">Apogee pressure - Digital barometer</field>
             <field name="ada_min_pressure" type="float" units="Pa">Apogee pressure - ADA filtered</field>
-            <field name="baro_max_altitude" type="float" units="m">Apogee altitude - Digital barometer</field>
-            <field name="gps_max_altitude" type="float" units="m">Apogee altitude - GPS</field>
-            <field name="drogue_dpl_ts" type="uint64_t" units="us">System clock at drouge deployment</field>
-            <field name="drogue_dpl_max_acc" type="float" units="m/s2">Max acceleration during drouge deployment</field>
             <field name="dpl_vane_max_pressure" type="float" units="Pa">Max pressure in the deployment bay during drogue deployment</field>
-            <field name="main_dpl_altitude_ts" type="uint64_t" units="us">System clock at main chute deployment</field>
-            <field name="main_dpl_altitude" type="float" units="m">Altittude at main deployment (m.s.l)</field>
-            <field name="main_dpl_zspeed" type="float" units="m/s">Vertical speed at main deployment (sensor z axis)</field>
-            <field name="main_dpl_acc" type="float" units="m/s2">Max measured vertical acceleration (sensor z axis) after main parachute deployment</field>
             <field name="cpu_load" type="float">CPU load in percentage</field>
             <field name="free_heap" type="uint32_t">Amount of available heap in memory</field>
         </message>
         <message id="211" name="PAYLOAD_STATS_TM">
             <description>Low Rate Telemetry</description>
             <!-- TODO: COULD NEED SOMETHING ABOUT CONTROL ALGORITHM LIKE WING EFFICIENCY AND VELOCITIES DURING DESCENDING -->
-            <field name="liftoff_ts" type="uint64_t" units="us">System clock at liftoff</field>
             <field name="liftoff_max_acc_ts" type="uint64_t" units="us">System clock at the maximum liftoff acceleration</field>
             <field name="liftoff_max_acc" type="float" units="m/s2">Maximum liftoff acceleration</field>
+            <field name="dpl_ts" type="uint64_t" units="us">System clock at drouge deployment</field>
+            <field name="dpl_max_acc" type="float" units="m/s2">Max acceleration during drouge deployment</field>
             <field name="max_z_speed_ts" type="uint64_t" units="us">System clock at ADA max vertical speed</field>
             <field name="max_z_speed" type="float" units="m/s">Max measured vertical speed - ADA</field>
             <field name="max_airspeed_pitot" type="float" units="m/s">Max speed read by the pitot tube</field>
@@ -587,13 +582,8 @@
             <field name="apogee_ts" type="uint64_t" units="us">System clock at apogee</field>
             <field name="apogee_lat" type="float" units="deg">Apogee latitude</field>
             <field name="apogee_lon" type="float" units="deg">Apogee longitude</field>
-            <field name="static_min_pressure" type="float" units="Pa">Apogee pressure - Static ports</field>
-            <field name="digital_min_pressure" type="float" units="Pa">Apogee pressure - Digital barometer</field>
-            <field name="ada_min_pressure" type="float" units="Pa">Apogee pressure - ADA filtered</field>
-            <field name="baro_max_altitude" type="float" units="m">Apogee altitude - Digital barometer</field>
-            <field name="gps_max_altitude" type="float" units="m">Apogee altitude - GPS</field>
-            <field name="drogue_dpl_ts" type="uint64_t" units="us">System clock at drouge deployment</field>
-            <field name="drogue_dpl_max_acc" type="float" units="m/s2">Max acceleration during drouge deployment</field>
+            <field name="apogee_alt" type="float" units="m">Apogee altitude</field>
+            <field name="min_pressure" type="float" units="Pa">Apogee pressure - Digital barometer</field>
             <field name="cpu_load" type="float">CPU load in percentage</field>
             <field name="free_heap" type="uint32_t">Amount of available heap in memory</field>
         </message>
-- 
GitLab