autogenerated headers for rev...

autogenerated headers for rev https://github.com/mavlink/mavlink/tree/5b29f942e3a4e26e06ee226e631cd7b375fb42c7

ASLUAV/testsuite.h

@@ -990,6 +990,125 @@ static void mavlink_test_gsm_link_status(uint8_t system_id, uint8_t component_id
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 }
 
+static void mavlink_test_satcom_link_status(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
+{
+#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
+    mavlink_status_t *status = mavlink_get_channel_status(MAVLINK_COMM_0);
+        if ((status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) && MAVLINK_MSG_ID_SATCOM_LINK_STATUS >= 256) {
+            return;
+        }
+#endif
+    mavlink_message_t msg;
+        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
+        uint16_t i;
+    mavlink_satcom_link_status_t packet_in = {
+        93372036854775807ULL,93372036854776311ULL,18067,18171,65,132,199,10
+    };
+    mavlink_satcom_link_status_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        packet1.timestamp = packet_in.timestamp;
+        packet1.last_heartbeat = packet_in.last_heartbeat;
+        packet1.failed_sessions = packet_in.failed_sessions;
+        packet1.successful_sessions = packet_in.successful_sessions;
+        packet1.signal_quality = packet_in.signal_quality;
+        packet1.ring_pending = packet_in.ring_pending;
+        packet1.tx_session_pending = packet_in.tx_session_pending;
+        packet1.rx_session_pending = packet_in.rx_session_pending;
+        
+        
+#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
+        if (status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) {
+           // cope with extensions
+           memset(MAVLINK_MSG_ID_SATCOM_LINK_STATUS_MIN_LEN + (char *)&packet1, 0, sizeof(packet1)-MAVLINK_MSG_ID_SATCOM_LINK_STATUS_MIN_LEN);
+        }
+#endif
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_satcom_link_status_encode(system_id, component_id, &msg, &packet1);
+    mavlink_msg_satcom_link_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_satcom_link_status_pack(system_id, component_id, &msg , packet1.timestamp , packet1.last_heartbeat , packet1.failed_sessions , packet1.successful_sessions , packet1.signal_quality , packet1.ring_pending , packet1.tx_session_pending , packet1.rx_session_pending );
+    mavlink_msg_satcom_link_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_satcom_link_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.last_heartbeat , packet1.failed_sessions , packet1.successful_sessions , packet1.signal_quality , packet1.ring_pending , packet1.tx_session_pending , packet1.rx_session_pending );
+    mavlink_msg_satcom_link_status_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+        mavlink_msg_to_send_buffer(buffer, &msg);
+        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
+            comm_send_ch(MAVLINK_COMM_0, buffer[i]);
+        }
+    mavlink_msg_satcom_link_status_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_satcom_link_status_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.last_heartbeat , packet1.failed_sessions , packet1.successful_sessions , packet1.signal_quality , packet1.ring_pending , packet1.tx_session_pending , packet1.rx_session_pending );
+    mavlink_msg_satcom_link_status_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
+static void mavlink_test_sensor_airflow_angles(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
+{
+#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
+    mavlink_status_t *status = mavlink_get_channel_status(MAVLINK_COMM_0);
+        if ((status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) && MAVLINK_MSG_ID_SENSOR_AIRFLOW_ANGLES >= 256) {
+            return;
+        }
+#endif
+    mavlink_message_t msg;
+        uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
+        uint16_t i;
+    mavlink_sensor_airflow_angles_t packet_in = {
+        93372036854775807ULL,73.0,101.0,53,120
+    };
+    mavlink_sensor_airflow_angles_t packet1, packet2;
+        memset(&packet1, 0, sizeof(packet1));
+        packet1.timestamp = packet_in.timestamp;
+        packet1.angleofattack = packet_in.angleofattack;
+        packet1.sideslip = packet_in.sideslip;
+        packet1.angleofattack_valid = packet_in.angleofattack_valid;
+        packet1.sideslip_valid = packet_in.sideslip_valid;
+        
+        
+#ifdef MAVLINK_STATUS_FLAG_OUT_MAVLINK1
+        if (status->flags & MAVLINK_STATUS_FLAG_OUT_MAVLINK1) {
+           // cope with extensions
+           memset(MAVLINK_MSG_ID_SENSOR_AIRFLOW_ANGLES_MIN_LEN + (char *)&packet1, 0, sizeof(packet1)-MAVLINK_MSG_ID_SENSOR_AIRFLOW_ANGLES_MIN_LEN);
+        }
+#endif
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_sensor_airflow_angles_encode(system_id, component_id, &msg, &packet1);
+    mavlink_msg_sensor_airflow_angles_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_sensor_airflow_angles_pack(system_id, component_id, &msg , packet1.timestamp , packet1.angleofattack , packet1.angleofattack_valid , packet1.sideslip , packet1.sideslip_valid );
+    mavlink_msg_sensor_airflow_angles_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_sensor_airflow_angles_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.angleofattack , packet1.angleofattack_valid , packet1.sideslip , packet1.sideslip_valid );
+    mavlink_msg_sensor_airflow_angles_decode(&msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+
+        memset(&packet2, 0, sizeof(packet2));
+        mavlink_msg_to_send_buffer(buffer, &msg);
+        for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
+            comm_send_ch(MAVLINK_COMM_0, buffer[i]);
+        }
+    mavlink_msg_sensor_airflow_angles_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+        
+        memset(&packet2, 0, sizeof(packet2));
+    mavlink_msg_sensor_airflow_angles_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.angleofattack , packet1.angleofattack_valid , packet1.sideslip , packet1.sideslip_valid );
+    mavlink_msg_sensor_airflow_angles_decode(last_msg, &packet2);
+        MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
+}
+
 static void mavlink_test_ASLUAV(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
 {
     mavlink_test_command_int_stamped(system_id, component_id, last_msg);
@@ -1007,6 +1126,8 @@ static void mavlink_test_ASLUAV(uint8_t system_id, uint8_t component_id, mavlink
     mavlink_test_sensorpod_status(system_id, component_id, last_msg);
     mavlink_test_sens_power_board(system_id, component_id, last_msg);
     mavlink_test_gsm_link_status(system_id, component_id, last_msg);
+    mavlink_test_satcom_link_status(system_id, component_id, last_msg);
+    mavlink_test_sensor_airflow_angles(system_id, component_id, last_msg);
 }
 
 #ifdef __cplusplus

ASLUAV/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

ardupilotmega/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

autoquad/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

checksum.h

@@ -24,7 +24,7 @@ extern "C" {
 
 #ifndef HAVE_CRC_ACCUMULATE
 /**
- * @brief Accumulate the X.25 CRC by adding one char at a time.
+ * @brief Accumulate the CRC16_MCRF4XX checksum by adding one char at a time.
  *
  * The checksum function adds the hash of one char at a time to the
  * 16 bit checksum (uint16_t).
@@ -45,9 +45,9 @@ static inline void crc_accumulate(uint8_t data, uint16_t *crcAccum)
 
 
 /**
- * @brief Initiliaze the buffer for the X.25 CRC
+ * @brief Initiliaze the buffer for the MCRF4XX CRC16
  *
- * @param crcAccum the 16 bit X.25 CRC
+ * @param crcAccum the 16 bit MCRF4XX CRC16
  */
 static inline void crc_init(uint16_t* crcAccum)
 {
@@ -56,7 +56,7 @@ static inline void crc_init(uint16_t* crcAccum)
 
 
 /**
- * @brief Calculates the X.25 checksum on a byte buffer
+ * @brief Calculates the CRC16_MCRF4XX checksum on a byte buffer
  *
  * @param  pBuffer buffer containing the byte array to hash
  * @param  length  length of the byte array
@@ -74,7 +74,7 @@ static inline uint16_t crc_calculate(const uint8_t* pBuffer, uint16_t length)
 
 
 /**
- * @brief Accumulate the X.25 CRC by adding an array of bytes
+ * @brief Accumulate the MCRF4XX CRC16 by adding an array of bytes
  *
  * The checksum function adds the hash of one char at a time to the
  * 16 bit checksum (uint16_t).

common/mavlink_msg_efi_status.h

@@ -7,8 +7,8 @@
 typedef struct __mavlink_efi_status_t {
  float ecu_index; /*<  ECU index*/
  float rpm; /*<  RPM*/
- float fuel_consumed; /*< [g] Fuel consumed*/
- float fuel_flow; /*< [g/min] Fuel flow rate*/
+ float fuel_consumed; /*< [cm^3] Fuel consumed*/
+ float fuel_flow; /*< [cm^3/min] Fuel flow rate*/
  float engine_load; /*< [%] Engine load*/
  float throttle_position; /*< [%] Throttle position*/
  float spark_dwell_time; /*< [ms] Spark dwell time*/
@@ -92,8 +92,8 @@ typedef struct __mavlink_efi_status_t {
  * @param health  EFI health status
  * @param ecu_index  ECU index
  * @param rpm  RPM
- * @param fuel_consumed [g] Fuel consumed
- * @param fuel_flow [g/min] Fuel flow rate
+ * @param fuel_consumed [cm^3] Fuel consumed
+ * @param fuel_flow [cm^3/min] Fuel flow rate
  * @param engine_load [%] Engine load
  * @param throttle_position [%] Throttle position
  * @param spark_dwell_time [ms] Spark dwell time
@@ -168,8 +168,8 @@ static inline uint16_t mavlink_msg_efi_status_pack(uint8_t system_id, uint8_t co
  * @param health  EFI health status
  * @param ecu_index  ECU index
  * @param rpm  RPM
- * @param fuel_consumed [g] Fuel consumed
- * @param fuel_flow [g/min] Fuel flow rate
+ * @param fuel_consumed [cm^3] Fuel consumed
+ * @param fuel_flow [cm^3/min] Fuel flow rate
  * @param engine_load [%] Engine load
  * @param throttle_position [%] Throttle position
  * @param spark_dwell_time [ms] Spark dwell time
@@ -270,8 +270,8 @@ static inline uint16_t mavlink_msg_efi_status_encode_chan(uint8_t system_id, uin
  * @param health  EFI health status
  * @param ecu_index  ECU index
  * @param rpm  RPM
- * @param fuel_consumed [g] Fuel consumed
- * @param fuel_flow [g/min] Fuel flow rate
+ * @param fuel_consumed [cm^3] Fuel consumed
+ * @param fuel_flow [cm^3/min] Fuel flow rate
  * @param engine_load [%] Engine load
  * @param throttle_position [%] Throttle position
  * @param spark_dwell_time [ms] Spark dwell time
@@ -442,7 +442,7 @@ static inline float mavlink_msg_efi_status_get_rpm(const mavlink_message_t* msg)
 /**
  * @brief Get field fuel_consumed from efi_status message
  *
- * @return [g] Fuel consumed
+ * @return [cm^3] Fuel consumed
  */
 static inline float mavlink_msg_efi_status_get_fuel_consumed(const mavlink_message_t* msg)
 {
@@ -452,7 +452,7 @@ static inline float mavlink_msg_efi_status_get_fuel_consumed(const mavlink_messa
 /**
  * @brief Get field fuel_flow from efi_status message
  *
- * @return [g/min] Fuel flow rate
+ * @return [cm^3/min] Fuel flow rate
  */
 static inline float mavlink_msg_efi_status_get_fuel_flow(const mavlink_message_t* msg)
 {

common/mavlink_msg_smart_battery_info.h

@@ -7,7 +7,7 @@
 typedef struct __mavlink_smart_battery_info_t {
  int32_t capacity_full_specification; /*< [mAh] Capacity when full according to manufacturer, -1: field not provided.*/
  int32_t capacity_full; /*< [mAh] Capacity when full (accounting for battery degradation), -1: field not provided.*/
- uint16_t cycle_count; /*<  Charge/discharge cycle count. -1: field not provided.*/
+ uint16_t cycle_count; /*<  Charge/discharge cycle count. UINT16_MAX: field not provided.*/
  uint16_t weight; /*< [g] Battery weight. 0: field not provided.*/
  uint16_t discharge_minimum_voltage; /*< [mV] Minimum per-cell voltage when discharging. If not supplied set to UINT16_MAX value.*/
  uint16_t charging_minimum_voltage; /*< [mV] Minimum per-cell voltage when charging. If not supplied set to UINT16_MAX value.*/
@@ -80,7 +80,7 @@ typedef struct __mavlink_smart_battery_info_t {
  * @param type  Type (chemistry) of the battery
  * @param capacity_full_specification [mAh] Capacity when full according to manufacturer, -1: field not provided.
  * @param capacity_full [mAh] Capacity when full (accounting for battery degradation), -1: field not provided.
- * @param cycle_count  Charge/discharge cycle count. -1: field not provided.
+ * @param cycle_count  Charge/discharge cycle count. UINT16_MAX: field not provided.
  * @param serial_number  Serial number in ASCII characters, 0 terminated. All 0: field not provided.
  * @param device_name  Static device name. Encode as manufacturer and product names separated using an underscore.
  * @param weight [g] Battery weight. 0: field not provided.
@@ -139,7 +139,7 @@ static inline uint16_t mavlink_msg_smart_battery_info_pack(uint8_t system_id, ui
  * @param type  Type (chemistry) of the battery
  * @param capacity_full_specification [mAh] Capacity when full according to manufacturer, -1: field not provided.
  * @param capacity_full [mAh] Capacity when full (accounting for battery degradation), -1: field not provided.
- * @param cycle_count  Charge/discharge cycle count. -1: field not provided.
+ * @param cycle_count  Charge/discharge cycle count. UINT16_MAX: field not provided.
  * @param serial_number  Serial number in ASCII characters, 0 terminated. All 0: field not provided.
  * @param device_name  Static device name. Encode as manufacturer and product names separated using an underscore.
  * @param weight [g] Battery weight. 0: field not provided.
@@ -224,7 +224,7 @@ static inline uint16_t mavlink_msg_smart_battery_info_encode_chan(uint8_t system
  * @param type  Type (chemistry) of the battery
  * @param capacity_full_specification [mAh] Capacity when full according to manufacturer, -1: field not provided.
  * @param capacity_full [mAh] Capacity when full (accounting for battery degradation), -1: field not provided.
- * @param cycle_count  Charge/discharge cycle count. -1: field not provided.
+ * @param cycle_count  Charge/discharge cycle count. UINT16_MAX: field not provided.
  * @param serial_number  Serial number in ASCII characters, 0 terminated. All 0: field not provided.
  * @param device_name  Static device name. Encode as manufacturer and product names separated using an underscore.
  * @param weight [g] Battery weight. 0: field not provided.
@@ -385,7 +385,7 @@ static inline int32_t mavlink_msg_smart_battery_info_get_capacity_full(const mav
 /**
  * @brief Get field cycle_count from smart_battery_info message
  *
- * @return  Charge/discharge cycle count. -1: field not provided.
+ * @return  Charge/discharge cycle count. UINT16_MAX: field not provided.
  */
 static inline uint16_t mavlink_msg_smart_battery_info_get_cycle_count(const mavlink_message_t* msg)
 {

common/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

icarous/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 46
  

matrixpilot/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

mavlink_sha256.h

@@ -5,7 +5,7 @@
   modifications to suit mavlink headers
  */
 /*
- * Copyright (c) 1995 - 2001 Kungliga Tekniska Hgskolan
+ * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -69,15 +69,6 @@ typedef struct {
 #define sigma0(x)	(ROTR(x,7)  ^ ROTR(x,18) ^ ((x)>>3))
 #define sigma1(x)	(ROTR(x,17) ^ ROTR(x,19) ^ ((x)>>10))
 
-#define A m->counter[0]
-#define B m->counter[1]
-#define C m->counter[2]
-#define D m->counter[3]
-#define E m->counter[4]
-#define F m->counter[5]
-#define G m->counter[6]
-#define H m->counter[7]
-
 static const uint32_t mavlink_sha256_constant_256[64] = {
     0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
     0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
@@ -101,14 +92,14 @@ MAVLINK_HELPER void mavlink_sha256_init(mavlink_sha256_ctx *m)
 {
     m->sz[0] = 0;
     m->sz[1] = 0;
-    A = 0x6a09e667;
-    B = 0xbb67ae85;
-    C = 0x3c6ef372;
-    D = 0xa54ff53a;
-    E = 0x510e527f;
-    F = 0x9b05688c;
-    G = 0x1f83d9ab;
-    H = 0x5be0cd19;
+    m->counter[0] = 0x6a09e667;
+    m->counter[1] = 0xbb67ae85;
+    m->counter[2] = 0x3c6ef372;
+    m->counter[3] = 0xa54ff53a;
+    m->counter[4] = 0x510e527f;
+    m->counter[5] = 0x9b05688c;
+    m->counter[6] = 0x1f83d9ab;
+    m->counter[7] = 0x5be0cd19;
 }
 
 static inline void mavlink_sha256_calc(mavlink_sha256_ctx *m, uint32_t *in)
@@ -117,14 +108,14 @@ static inline void mavlink_sha256_calc(mavlink_sha256_ctx *m, uint32_t *in)
     uint32_t data[64];
     int i;
 
-    AA = A;
-    BB = B;
-    CC = C;
-    DD = D;
-    EE = E;
-    FF = F;
-    GG = G;
-    HH = H;
+    AA = m->counter[0];
+    BB = m->counter[1];
+    CC = m->counter[2];
+    DD = m->counter[3];
+    EE = m->counter[4];
+    FF = m->counter[5];
+    GG = m->counter[6];
+    HH = m->counter[7];
 
     for (i = 0; i < 16; ++i)
 	data[i] = in[i];
@@ -148,14 +139,14 @@ static inline void mavlink_sha256_calc(mavlink_sha256_ctx *m, uint32_t *in)
 	AA = T1 + T2;
     }
 
-    A += AA;
-    B += BB;
-    C += CC;
-    D += DD;
-    E += EE;
-    F += FF;
-    G += GG;
-    H += HH;
+    m->counter[0] += AA;
+    m->counter[1] += BB;
+    m->counter[2] += CC;
+    m->counter[3] += DD;
+    m->counter[4] += EE;
+    m->counter[5] += FF;
+    m->counter[6] += GG;
+    m->counter[7] += HH;
 }
 
 MAVLINK_HELPER void mavlink_sha256_update(mavlink_sha256_ctx *m, const void *v, uint32_t len)
@@ -230,14 +221,6 @@ MAVLINK_HELPER void mavlink_sha256_final_48(mavlink_sha256_ctx *m, uint8_t resul
 }
 
 // prevent conflicts with users of the header
-#undef A
-#undef B
-#undef C
-#undef D
-#undef E
-#undef F
-#undef G
-#undef H
 #undef Ch
 #undef ROTR
 #undef Sigma0

mavlink_types.h

@@ -161,12 +161,14 @@ typedef struct __mavlink_message_info {
 #define mavlink_ck_a(msg) *((msg)->len + (uint8_t *)_MAV_PAYLOAD_NON_CONST(msg))
 #define mavlink_ck_b(msg) *(((msg)->len+(uint16_t)1) + (uint8_t *)_MAV_PAYLOAD_NON_CONST(msg))
 
+#ifndef HAVE_MAVLINK_CHANNEL_T
 typedef enum {
     MAVLINK_COMM_0,
     MAVLINK_COMM_1,
     MAVLINK_COMM_2,
     MAVLINK_COMM_3
 } mavlink_channel_t;
+#endif
 
 /*
  * applications can set MAVLINK_COMM_NUM_BUFFERS to the maximum number

message_definitions/ASLUAV.xml

@@ -48,7 +48,7 @@
       <entry value="0" name="GSM_MODEM_TYPE_UNKNOWN">
         <description>not specified</description>
       </entry>
-      <entry name="GSM_MODEM_TYPE_HUAWEI_E3372">
+      <entry value="1" name="GSM_MODEM_TYPE_HUAWEI_E3372">
         <description>HUAWEI LTE USB Stick E3372</description>
       </entry>
     </enum>
@@ -270,5 +270,24 @@
       <field type="uint8_t" name="sinr_ecio">SINR (LTE) or ECIO (WCDMA) as reported by modem (unconverted)</field>
       <field type="uint8_t" name="rsrq">RSRQ (LTE only) as reported by modem (unconverted)</field>
     </message>
+    <message id="214" name="SATCOM_LINK_STATUS">
+      <description>Status of the SatCom link</description>
+      <field type="uint64_t" name="timestamp" units="us">Timestamp</field>
+      <field type="uint64_t" name="last_heartbeat" units="us">Timestamp of the last successful sbd session</field>
+      <field type="uint16_t" name="failed_sessions">Number of failed sessions</field>
+      <field type="uint16_t" name="successful_sessions">Number of successful sessions</field>
+      <field type="uint8_t" name="signal_quality">Signal quality</field>
+      <field type="uint8_t" name="ring_pending">Ring call pending</field>
+      <field type="uint8_t" name="tx_session_pending">Transmission session pending</field>
+      <field type="uint8_t" name="rx_session_pending">Receiving session pending</field>
+    </message>
+    <message id="215" name="SENSOR_AIRFLOW_ANGLES">
+      <description>Calibrated airflow angle measurements</description>
+      <field type="uint64_t" name="timestamp" units="us">Timestamp</field>
+      <field type="float" name="angleofattack" units="deg">Angle of attack</field>
+      <field type="uint8_t" name="angleofattack_valid">Angle of attack measurement valid</field>
+      <field type="float" name="sideslip" units="deg">Sideslip angle</field>
+      <field type="uint8_t" name="sideslip_valid">Sideslip angle measurement valid</field>
+    </message>
   </messages>
 </mavlink>

message_definitions/all.xml

@@ -12,11 +12,9 @@
   <include>minimal.xml</include>
   <!-- paparazzi.xml: : ERROR: Duplicate message id 180 for SCRIPT_ITEM (paparazzi.xml:9) also used by CAMERA_FEEDBACK (ardupilotmega.xml:1370) -->
   <!-- <include>paparazzi.xml</include> -->
-  <!-- python_array_test.xml: ERROR: Duplicate message id 150 for ARRAY_TEST_0 (python_array_test.xml:6) also used by SENSOR_OFFSETS (ardupilotmega.xml:1101) -->
-  <!-- <include>python_array_test.xml</include> -->
+  <include>python_array_test.xml</include>
   <include>standard.xml</include>
-  <!-- test.xml: ERROR: Duplicate message id 0 for TEST_TYPES (test.xml:5) also used by HEARTBEAT (common.xml:3527) -->
-  <!-- <include>test.xml</include> -->
+  <include>test.xml</include>
   <include>ualberta.xml</include>
   <include>uAvionix.xml</include>
   <messages/>

message_definitions/autoquad.xml

@@ -5,7 +5,7 @@
   <enums>
     <enum name="AUTOQUAD_MAVLINK_DEFS_VERSION">
       <description>Track current version of these definitions (can be used by checking value of AUTOQUAD_MAVLINK_DEFS_VERSION_ENUM_END). Append a new entry for each published change.</description>
-      <entry name="AQ_MAVLINK_DEFS_VERSION_1"/>
+      <entry value="1" name="AQ_MAVLINK_DEFS_VERSION_1"/>
     </enum>
     <enum name="AUTOQUAD_NAV_STATUS">
       <description>Available operating modes/statuses for AutoQuad flight controller. 
@@ -111,7 +111,7 @@
     </enum>
     <!-- extend MAV_DATA_STREAM -->
     <enum name="MAV_DATA_STREAM">
-      <entry name="MAV_DATA_STREAM_PROPULSION">
+      <entry value="13" name="MAV_DATA_STREAM_PROPULSION">
         <description>Motor/ESC telemetry data.</description>
       </entry>
     </enum>

message_definitions/minimal.xml

@@ -235,28 +235,28 @@
       <entry value="0" name="MAV_STATE_UNINIT">
         <description>Uninitialized system, state is unknown.</description>
       </entry>
-      <entry name="MAV_STATE_BOOT">
+      <entry value="1" name="MAV_STATE_BOOT">
         <description>System is booting up.</description>
       </entry>
-      <entry name="MAV_STATE_CALIBRATING">
+      <entry value="2" name="MAV_STATE_CALIBRATING">
         <description>System is calibrating and not flight-ready.</description>
       </entry>
-      <entry name="MAV_STATE_STANDBY">
+      <entry value="3" name="MAV_STATE_STANDBY">
         <description>System is grounded and on standby. It can be launched any time.</description>
       </entry>
-      <entry name="MAV_STATE_ACTIVE">
+      <entry value="4" name="MAV_STATE_ACTIVE">
         <description>System is active and might be already airborne. Motors are engaged.</description>
       </entry>
-      <entry name="MAV_STATE_CRITICAL">
+      <entry value="5" name="MAV_STATE_CRITICAL">
         <description>System is in a non-normal flight mode. It can however still navigate.</description>
       </entry>
-      <entry name="MAV_STATE_EMERGENCY">
+      <entry value="6" name="MAV_STATE_EMERGENCY">
         <description>System is in a non-normal flight mode. It lost control over parts or over the whole airframe. It is in mayday and going down.</description>
       </entry>
-      <entry name="MAV_STATE_POWEROFF">
+      <entry value="7" name="MAV_STATE_POWEROFF">
         <description>System just initialized its power-down sequence, will shut down now.</description>
       </entry>
-      <entry name="MAV_STATE_FLIGHT_TERMINATION">
+      <entry value="8" name="MAV_STATE_FLIGHT_TERMINATION">
         <description>System is terminating itself.</description>
       </entry>
     </enum>

message_definitions/python_array_test.xml

@@ -3,7 +3,7 @@
 <mavlink>
   <include>common.xml</include>
   <messages>
-    <message id="150" name="ARRAY_TEST_0">
+    <message id="17150" name="ARRAY_TEST_0">
       <description>Array test #0.</description>
       <field type="uint8_t" name="v1">Stub field</field>
       <field type="int8_t[4]" name="ar_i8">Value array</field>
@@ -11,26 +11,26 @@
       <field type="uint16_t[4]" name="ar_u16">Value array</field>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
     </message>
-    <message id="151" name="ARRAY_TEST_1">
+    <message id="17151" name="ARRAY_TEST_1">
       <description>Array test #1.</description>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
     </message>
-    <message id="153" name="ARRAY_TEST_3">
+    <message id="17153" name="ARRAY_TEST_3">
       <description>Array test #3.</description>
       <field type="uint8_t" name="v">Stub field</field>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
     </message>
-    <message id="154" name="ARRAY_TEST_4">
+    <message id="17154" name="ARRAY_TEST_4">
       <description>Array test #4.</description>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
       <field type="uint8_t" name="v">Stub field</field>
     </message>
-    <message id="155" name="ARRAY_TEST_5">
+    <message id="17155" name="ARRAY_TEST_5">
       <description>Array test #5.</description>
       <field type="char[5]" name="c1">Value array</field>
       <field type="char[5]" name="c2">Value array</field>
     </message>
-    <message id="156" name="ARRAY_TEST_6">
+    <message id="17156" name="ARRAY_TEST_6">
       <description>Array test #6.</description>
       <field type="uint8_t" name="v1">Stub field</field>
       <field type="uint16_t" name="v2">Stub field</field>
@@ -45,7 +45,7 @@
       <field type="double[2]" name="ar_d">Value array</field>
       <field type="float[2]" name="ar_f">Value array</field>
     </message>
-    <message id="157" name="ARRAY_TEST_7">
+    <message id="17157" name="ARRAY_TEST_7">
       <description>Array test #7.</description>
       <field type="double[2]" name="ar_d">Value array</field>
       <field type="float[2]" name="ar_f">Value array</field>
@@ -57,7 +57,7 @@
       <field type="int8_t[2]" name="ar_i8">Value array</field>
       <field type="char[32]" name="ar_c">Value array</field>
     </message>
-    <message id="158" name="ARRAY_TEST_8">
+    <message id="17158" name="ARRAY_TEST_8">
       <description>Array test #8.</description>
       <field type="uint32_t" name="v3">Stub field</field>
       <field type="double[2]" name="ar_d">Value array</field>

message_definitions/test.xml

@@ -2,7 +2,7 @@
 <mavlink>
   <version>3</version>
   <messages>
-    <message id="0" name="TEST_TYPES">
+    <message id="17000" name="TEST_TYPES">
       <description>Test all field types</description>
       <field type="char" name="c">char</field>
       <field type="char[10]" name="s">string</field>

message_definitions/ualberta.xml

@@ -4,44 +4,44 @@
   <enums>
     <enum name="UALBERTA_AUTOPILOT_MODE">
       <description>Available autopilot modes for ualberta uav</description>
-      <entry name="MODE_MANUAL_DIRECT">
+      <entry value="1" name="MODE_MANUAL_DIRECT">
         <description>Raw input pulse widts sent to output</description>
       </entry>
-      <entry name="MODE_MANUAL_SCALED">
+      <entry value="2" name="MODE_MANUAL_SCALED">
         <description>Inputs are normalized using calibration, the converted back to raw pulse widths for output</description>
       </entry>
-      <entry name="MODE_AUTO_PID_ATT">
+      <entry value="3" name="MODE_AUTO_PID_ATT">
         <description> dfsdfs</description>
       </entry>
-      <entry name="MODE_AUTO_PID_VEL">
+      <entry value="4" name="MODE_AUTO_PID_VEL">
         <description> dfsfds</description>
       </entry>
-      <entry name="MODE_AUTO_PID_POS">
+      <entry value="5" name="MODE_AUTO_PID_POS">
         <description> dfsdfsdfs</description>
       </entry>
     </enum>
     <enum name="UALBERTA_NAV_MODE">
       <description>Navigation filter mode</description>
-      <entry name="NAV_AHRS_INIT"/>
-      <entry name="NAV_AHRS">
+      <entry value="1" name="NAV_AHRS_INIT"/>
+      <entry value="2" name="NAV_AHRS">
         <description>AHRS mode</description>
       </entry>
-      <entry name="NAV_INS_GPS_INIT">
+      <entry value="3" name="NAV_INS_GPS_INIT">
         <description>INS/GPS initialization mode</description>
       </entry>
-      <entry name="NAV_INS_GPS">
+      <entry value="4" name="NAV_INS_GPS">
         <description>INS/GPS mode</description>
       </entry>
     </enum>
     <enum name="UALBERTA_PILOT_MODE">
       <description>Mode currently commanded by pilot</description>
-      <entry name="PILOT_MANUAL">
+      <entry value="1" name="PILOT_MANUAL">
         <description> sdf</description>
       </entry>
-      <entry name="PILOT_AUTO">
+      <entry value="2" name="PILOT_AUTO">
         <description> dfs</description>
       </entry>
-      <entry name="PILOT_ROTO">
+      <entry value="3" name="PILOT_ROTO">
         <description> Rotomotion mode </description>
       </entry>
     </enum>

minimal/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22
  

standard/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

test/mavlink_msg_test_types.h

 #pragma once
 // MESSAGE TEST_TYPES PACKING
 
-#define MAVLINK_MSG_ID_TEST_TYPES 0
+#define MAVLINK_MSG_ID_TEST_TYPES 17000
 
 
 typedef struct __mavlink_test_types_t {
@@ -31,11 +31,11 @@ typedef struct __mavlink_test_types_t {
 
 #define MAVLINK_MSG_ID_TEST_TYPES_LEN 179
 #define MAVLINK_MSG_ID_TEST_TYPES_MIN_LEN 179
-#define MAVLINK_MSG_ID_0_LEN 179
-#define MAVLINK_MSG_ID_0_MIN_LEN 179
+#define MAVLINK_MSG_ID_17000_LEN 179
+#define MAVLINK_MSG_ID_17000_MIN_LEN 179
 
 #define MAVLINK_MSG_ID_TEST_TYPES_CRC 103
-#define MAVLINK_MSG_ID_0_CRC 103
+#define MAVLINK_MSG_ID_17000_CRC 103
 
 #define MAVLINK_MSG_TEST_TYPES_FIELD_U64_ARRAY_LEN 3
 #define MAVLINK_MSG_TEST_TYPES_FIELD_S64_ARRAY_LEN 3
@@ -51,7 +51,7 @@ typedef struct __mavlink_test_types_t {
 
 #if MAVLINK_COMMAND_24BIT
 #define MAVLINK_MESSAGE_INFO_TEST_TYPES { \
-    0, \
+    17000, \
     "TEST_TYPES", \
     22, \
     {  { "c", NULL, MAVLINK_TYPE_CHAR, 0, 160, offsetof(mavlink_test_types_t, c) }, \

test/test.h

@@ -24,7 +24,7 @@ extern "C" {
 #endif
 
 #ifndef MAVLINK_MESSAGE_CRCS
-#define MAVLINK_MESSAGE_CRCS {{0, 103, 179, 179, 0, 0, 0}}
+#define MAVLINK_MESSAGE_CRCS {{17000, 103, 179, 179, 0, 0, 0}}
 #endif
 
 #include "../protocol.h"
@@ -57,7 +57,7 @@ extern "C" {
 
 #if MAVLINK_THIS_XML_IDX == MAVLINK_PRIMARY_XML_IDX
 # define MAVLINK_MESSAGE_INFO {MAVLINK_MESSAGE_INFO_TEST_TYPES}
-# define MAVLINK_MESSAGE_NAMES {{ "TEST_TYPES", 0 }}
+# define MAVLINK_MESSAGE_NAMES {{ "TEST_TYPES", 17000 }}
 # if MAVLINK_COMMAND_24BIT
 #  include "../mavlink_get_info.h"
 # endif

test/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
  

uAvionix/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Dec 23 2020"
+#define MAVLINK_BUILD_DATE "Wed Feb 03 2021"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255