Przeglądaj źródła

ECU_STATUS 增加进气温度

Liu Yang 2 dni temu
rodzic
commit
44d317894c

+ 3 - 2
msg_definitions/VKFly.xml

@@ -1051,8 +1051,9 @@
       <extensions />
       <field type="uint16_t" name="inlet_pressure" units="hPa">inlet air pressure</field>
       <field type="int16_t" name="ge_temp" units="degC">Ge temperature</field>
-      <field type="int16_t" name="temp_1" units="degC">Ge temperature</field>
-      <field type="int16_t" name="volt_2" units="dV">Ge temperature</field>
+      <field type="int16_t" name="air_temp" units="degC">air temperature</field>
+      <field type="int16_t" name="temp_1" units="degC">temperature 1</field>
+      <field type="int16_t" name="volt_2" units="dV">volt 2</field>
     </message>
 
     <message id="53006" name="VK_COMP_VERSION">

Plik diff jest za duży
+ 1 - 1
v2.0/VKFly/VKFly.h


+ 1 - 1
v2.0/VKFly/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH -3632216719937891446
+#define MAVLINK_PRIMARY_XML_HASH 3639273076366165217
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

+ 69 - 41
v2.0/VKFly/mavlink_msg_vk_engine_ecu_staus.h

@@ -27,13 +27,14 @@ typedef struct __mavlink_vk_engine_ecu_staus_t {
  uint8_t reserve[4]; /*<  engine state*/
  uint16_t inlet_pressure; /*< [hPa] inlet air pressure*/
  int16_t ge_temp; /*< [degC] Ge temperature*/
- int16_t temp_1; /*< [degC] Ge temperature*/
- int16_t volt_2; /*< [dV] Ge temperature*/
+ int16_t air_temp; /*< [degC] air temperature*/
+ int16_t temp_1; /*< [degC] temperature 1*/
+ int16_t volt_2; /*< [dV] volt 2*/
 }) mavlink_vk_engine_ecu_staus_t;
 
-#define MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN 45
+#define MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN 47
 #define MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_MIN_LEN 37
-#define MAVLINK_MSG_ID_53005_LEN 45
+#define MAVLINK_MSG_ID_53005_LEN 47
 #define MAVLINK_MSG_ID_53005_MIN_LEN 37
 
 #define MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_CRC 145
@@ -45,7 +46,7 @@ typedef struct __mavlink_vk_engine_ecu_staus_t {
 #define MAVLINK_MESSAGE_INFO_VK_ENGINE_ECU_STAUS { \
     53005, \
     "VK_ENGINE_ECU_STAUS", \
-    22, \
+    23, \
     {  { "timestamp", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_vk_engine_ecu_staus_t, timestamp) }, \
          { "spd_rpm", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_vk_engine_ecu_staus_t, spd_rpm) }, \
          { "thr_pos", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_vk_engine_ecu_staus_t, thr_pos) }, \
@@ -66,14 +67,15 @@ typedef struct __mavlink_vk_engine_ecu_staus_t {
          { "reserve", NULL, MAVLINK_TYPE_UINT8_T, 4, 33, offsetof(mavlink_vk_engine_ecu_staus_t, reserve) }, \
          { "inlet_pressure", NULL, MAVLINK_TYPE_UINT16_T, 0, 37, offsetof(mavlink_vk_engine_ecu_staus_t, inlet_pressure) }, \
          { "ge_temp", NULL, MAVLINK_TYPE_INT16_T, 0, 39, offsetof(mavlink_vk_engine_ecu_staus_t, ge_temp) }, \
-         { "temp_1", NULL, MAVLINK_TYPE_INT16_T, 0, 41, offsetof(mavlink_vk_engine_ecu_staus_t, temp_1) }, \
-         { "volt_2", NULL, MAVLINK_TYPE_INT16_T, 0, 43, offsetof(mavlink_vk_engine_ecu_staus_t, volt_2) }, \
+         { "air_temp", NULL, MAVLINK_TYPE_INT16_T, 0, 41, offsetof(mavlink_vk_engine_ecu_staus_t, air_temp) }, \
+         { "temp_1", NULL, MAVLINK_TYPE_INT16_T, 0, 43, offsetof(mavlink_vk_engine_ecu_staus_t, temp_1) }, \
+         { "volt_2", NULL, MAVLINK_TYPE_INT16_T, 0, 45, offsetof(mavlink_vk_engine_ecu_staus_t, volt_2) }, \
          } \
 }
 #else
 #define MAVLINK_MESSAGE_INFO_VK_ENGINE_ECU_STAUS { \
     "VK_ENGINE_ECU_STAUS", \
-    22, \
+    23, \
     {  { "timestamp", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_vk_engine_ecu_staus_t, timestamp) }, \
          { "spd_rpm", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_vk_engine_ecu_staus_t, spd_rpm) }, \
          { "thr_pos", NULL, MAVLINK_TYPE_UINT8_T, 0, 28, offsetof(mavlink_vk_engine_ecu_staus_t, thr_pos) }, \
@@ -94,8 +96,9 @@ typedef struct __mavlink_vk_engine_ecu_staus_t {
          { "reserve", NULL, MAVLINK_TYPE_UINT8_T, 4, 33, offsetof(mavlink_vk_engine_ecu_staus_t, reserve) }, \
          { "inlet_pressure", NULL, MAVLINK_TYPE_UINT16_T, 0, 37, offsetof(mavlink_vk_engine_ecu_staus_t, inlet_pressure) }, \
          { "ge_temp", NULL, MAVLINK_TYPE_INT16_T, 0, 39, offsetof(mavlink_vk_engine_ecu_staus_t, ge_temp) }, \
-         { "temp_1", NULL, MAVLINK_TYPE_INT16_T, 0, 41, offsetof(mavlink_vk_engine_ecu_staus_t, temp_1) }, \
-         { "volt_2", NULL, MAVLINK_TYPE_INT16_T, 0, 43, offsetof(mavlink_vk_engine_ecu_staus_t, volt_2) }, \
+         { "air_temp", NULL, MAVLINK_TYPE_INT16_T, 0, 41, offsetof(mavlink_vk_engine_ecu_staus_t, air_temp) }, \
+         { "temp_1", NULL, MAVLINK_TYPE_INT16_T, 0, 43, offsetof(mavlink_vk_engine_ecu_staus_t, temp_1) }, \
+         { "volt_2", NULL, MAVLINK_TYPE_INT16_T, 0, 45, offsetof(mavlink_vk_engine_ecu_staus_t, volt_2) }, \
          } \
 }
 #endif
@@ -128,12 +131,13 @@ typedef struct __mavlink_vk_engine_ecu_staus_t {
  * @param reserve  engine state
  * @param inlet_pressure [hPa] inlet air pressure
  * @param ge_temp [degC] Ge temperature
- * @param temp_1 [degC] Ge temperature
- * @param volt_2 [dV] Ge temperature
+ * @param air_temp [degC] air temperature
+ * @param temp_1 [degC] temperature 1
+ * @param volt_2 [dV] volt 2
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-                               uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t temp_1, int16_t volt_2)
+                               uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t air_temp, int16_t temp_1, int16_t volt_2)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN];
@@ -156,8 +160,9 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack(uint8_t system_id, u
     _mav_put_uint8_t(buf, 32, index);
     _mav_put_uint16_t(buf, 37, inlet_pressure);
     _mav_put_int16_t(buf, 39, ge_temp);
-    _mav_put_int16_t(buf, 41, temp_1);
-    _mav_put_int16_t(buf, 43, volt_2);
+    _mav_put_int16_t(buf, 41, air_temp);
+    _mav_put_int16_t(buf, 43, temp_1);
+    _mav_put_int16_t(buf, 45, volt_2);
     _mav_put_uint8_t_array(buf, 33, reserve, 4);
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN);
 #else
@@ -181,6 +186,7 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack(uint8_t system_id, u
     packet.index = index;
     packet.inlet_pressure = inlet_pressure;
     packet.ge_temp = ge_temp;
+    packet.air_temp = air_temp;
     packet.temp_1 = temp_1;
     packet.volt_2 = volt_2;
     mav_array_memcpy(packet.reserve, reserve, sizeof(uint8_t)*4);
@@ -220,12 +226,13 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack(uint8_t system_id, u
  * @param reserve  engine state
  * @param inlet_pressure [hPa] inlet air pressure
  * @param ge_temp [degC] Ge temperature
- * @param temp_1 [degC] Ge temperature
- * @param volt_2 [dV] Ge temperature
+ * @param air_temp [degC] air temperature
+ * @param temp_1 [degC] temperature 1
+ * @param volt_2 [dV] volt 2
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_status(uint8_t system_id, uint8_t component_id, mavlink_status_t *_status, mavlink_message_t* msg,
-                               uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t temp_1, int16_t volt_2)
+                               uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t air_temp, int16_t temp_1, int16_t volt_2)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN];
@@ -248,8 +255,9 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_status(uint8_t syste
     _mav_put_uint8_t(buf, 32, index);
     _mav_put_uint16_t(buf, 37, inlet_pressure);
     _mav_put_int16_t(buf, 39, ge_temp);
-    _mav_put_int16_t(buf, 41, temp_1);
-    _mav_put_int16_t(buf, 43, volt_2);
+    _mav_put_int16_t(buf, 41, air_temp);
+    _mav_put_int16_t(buf, 43, temp_1);
+    _mav_put_int16_t(buf, 45, volt_2);
     _mav_put_uint8_t_array(buf, 33, reserve, 4);
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN);
 #else
@@ -273,6 +281,7 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_status(uint8_t syste
     packet.index = index;
     packet.inlet_pressure = inlet_pressure;
     packet.ge_temp = ge_temp;
+    packet.air_temp = air_temp;
     packet.temp_1 = temp_1;
     packet.volt_2 = volt_2;
     mav_array_memcpy(packet.reserve, reserve, sizeof(uint8_t)*4);
@@ -315,13 +324,14 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_status(uint8_t syste
  * @param reserve  engine state
  * @param inlet_pressure [hPa] inlet air pressure
  * @param ge_temp [degC] Ge temperature
- * @param temp_1 [degC] Ge temperature
- * @param volt_2 [dV] Ge temperature
+ * @param air_temp [degC] air temperature
+ * @param temp_1 [degC] temperature 1
+ * @param volt_2 [dV] volt 2
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
                                mavlink_message_t* msg,
-                                   uint32_t timestamp,uint16_t spd_rpm,uint8_t thr_pos,uint8_t fuel_pos,int16_t cylinderA_temp,int16_t cylinderB_temp,int16_t coolant_temp,uint16_t fuel_remain,uint16_t alarm,uint32_t total_runtime,uint16_t runtime,uint16_t service_time,uint16_t output_volt,uint16_t output_curr,uint8_t fault,uint8_t engine_state,uint8_t index,const uint8_t *reserve,uint16_t inlet_pressure,int16_t ge_temp,int16_t temp_1,int16_t volt_2)
+                                   uint32_t timestamp,uint16_t spd_rpm,uint8_t thr_pos,uint8_t fuel_pos,int16_t cylinderA_temp,int16_t cylinderB_temp,int16_t coolant_temp,uint16_t fuel_remain,uint16_t alarm,uint32_t total_runtime,uint16_t runtime,uint16_t service_time,uint16_t output_volt,uint16_t output_curr,uint8_t fault,uint8_t engine_state,uint8_t index,const uint8_t *reserve,uint16_t inlet_pressure,int16_t ge_temp,int16_t air_temp,int16_t temp_1,int16_t volt_2)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN];
@@ -344,8 +354,9 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_chan(uint8_t system_
     _mav_put_uint8_t(buf, 32, index);
     _mav_put_uint16_t(buf, 37, inlet_pressure);
     _mav_put_int16_t(buf, 39, ge_temp);
-    _mav_put_int16_t(buf, 41, temp_1);
-    _mav_put_int16_t(buf, 43, volt_2);
+    _mav_put_int16_t(buf, 41, air_temp);
+    _mav_put_int16_t(buf, 43, temp_1);
+    _mav_put_int16_t(buf, 45, volt_2);
     _mav_put_uint8_t_array(buf, 33, reserve, 4);
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN);
 #else
@@ -369,6 +380,7 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_chan(uint8_t system_
     packet.index = index;
     packet.inlet_pressure = inlet_pressure;
     packet.ge_temp = ge_temp;
+    packet.air_temp = air_temp;
     packet.temp_1 = temp_1;
     packet.volt_2 = volt_2;
     mav_array_memcpy(packet.reserve, reserve, sizeof(uint8_t)*4);
@@ -389,7 +401,7 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_pack_chan(uint8_t system_
  */
 static inline uint16_t mavlink_msg_vk_engine_ecu_staus_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_vk_engine_ecu_staus_t* vk_engine_ecu_staus)
 {
-    return mavlink_msg_vk_engine_ecu_staus_pack(system_id, component_id, msg, vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
+    return mavlink_msg_vk_engine_ecu_staus_pack(system_id, component_id, msg, vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->air_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
 }
 
 /**
@@ -403,7 +415,7 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_encode(uint8_t system_id,
  */
 static inline uint16_t mavlink_msg_vk_engine_ecu_staus_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_vk_engine_ecu_staus_t* vk_engine_ecu_staus)
 {
-    return mavlink_msg_vk_engine_ecu_staus_pack_chan(system_id, component_id, chan, msg, vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
+    return mavlink_msg_vk_engine_ecu_staus_pack_chan(system_id, component_id, chan, msg, vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->air_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
 }
 
 /**
@@ -417,7 +429,7 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_encode_chan(uint8_t syste
  */
 static inline uint16_t mavlink_msg_vk_engine_ecu_staus_encode_status(uint8_t system_id, uint8_t component_id, mavlink_status_t* _status, mavlink_message_t* msg, const mavlink_vk_engine_ecu_staus_t* vk_engine_ecu_staus)
 {
-    return mavlink_msg_vk_engine_ecu_staus_pack_status(system_id, component_id, _status, msg,  vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
+    return mavlink_msg_vk_engine_ecu_staus_pack_status(system_id, component_id, _status, msg,  vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->air_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
 }
 
 /**
@@ -446,12 +458,13 @@ static inline uint16_t mavlink_msg_vk_engine_ecu_staus_encode_status(uint8_t sys
  * @param reserve  engine state
  * @param inlet_pressure [hPa] inlet air pressure
  * @param ge_temp [degC] Ge temperature
- * @param temp_1 [degC] Ge temperature
- * @param volt_2 [dV] Ge temperature
+ * @param air_temp [degC] air temperature
+ * @param temp_1 [degC] temperature 1
+ * @param volt_2 [dV] volt 2
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
-static inline void mavlink_msg_vk_engine_ecu_staus_send(mavlink_channel_t chan, uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t temp_1, int16_t volt_2)
+static inline void mavlink_msg_vk_engine_ecu_staus_send(mavlink_channel_t chan, uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t air_temp, int16_t temp_1, int16_t volt_2)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN];
@@ -474,8 +487,9 @@ static inline void mavlink_msg_vk_engine_ecu_staus_send(mavlink_channel_t chan,
     _mav_put_uint8_t(buf, 32, index);
     _mav_put_uint16_t(buf, 37, inlet_pressure);
     _mav_put_int16_t(buf, 39, ge_temp);
-    _mav_put_int16_t(buf, 41, temp_1);
-    _mav_put_int16_t(buf, 43, volt_2);
+    _mav_put_int16_t(buf, 41, air_temp);
+    _mav_put_int16_t(buf, 43, temp_1);
+    _mav_put_int16_t(buf, 45, volt_2);
     _mav_put_uint8_t_array(buf, 33, reserve, 4);
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS, buf, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_MIN_LEN, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_CRC);
 #else
@@ -499,6 +513,7 @@ static inline void mavlink_msg_vk_engine_ecu_staus_send(mavlink_channel_t chan,
     packet.index = index;
     packet.inlet_pressure = inlet_pressure;
     packet.ge_temp = ge_temp;
+    packet.air_temp = air_temp;
     packet.temp_1 = temp_1;
     packet.volt_2 = volt_2;
     mav_array_memcpy(packet.reserve, reserve, sizeof(uint8_t)*4);
@@ -514,7 +529,7 @@ static inline void mavlink_msg_vk_engine_ecu_staus_send(mavlink_channel_t chan,
 static inline void mavlink_msg_vk_engine_ecu_staus_send_struct(mavlink_channel_t chan, const mavlink_vk_engine_ecu_staus_t* vk_engine_ecu_staus)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-    mavlink_msg_vk_engine_ecu_staus_send(chan, vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
+    mavlink_msg_vk_engine_ecu_staus_send(chan, vk_engine_ecu_staus->timestamp, vk_engine_ecu_staus->spd_rpm, vk_engine_ecu_staus->thr_pos, vk_engine_ecu_staus->fuel_pos, vk_engine_ecu_staus->cylinderA_temp, vk_engine_ecu_staus->cylinderB_temp, vk_engine_ecu_staus->coolant_temp, vk_engine_ecu_staus->fuel_remain, vk_engine_ecu_staus->alarm, vk_engine_ecu_staus->total_runtime, vk_engine_ecu_staus->runtime, vk_engine_ecu_staus->service_time, vk_engine_ecu_staus->output_volt, vk_engine_ecu_staus->output_curr, vk_engine_ecu_staus->fault, vk_engine_ecu_staus->engine_state, vk_engine_ecu_staus->index, vk_engine_ecu_staus->reserve, vk_engine_ecu_staus->inlet_pressure, vk_engine_ecu_staus->ge_temp, vk_engine_ecu_staus->air_temp, vk_engine_ecu_staus->temp_1, vk_engine_ecu_staus->volt_2);
 #else
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS, (const char *)vk_engine_ecu_staus, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_MIN_LEN, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_CRC);
 #endif
@@ -528,7 +543,7 @@ static inline void mavlink_msg_vk_engine_ecu_staus_send_struct(mavlink_channel_t
   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_vk_engine_ecu_staus_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t temp_1, int16_t volt_2)
+static inline void mavlink_msg_vk_engine_ecu_staus_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint32_t timestamp, uint16_t spd_rpm, uint8_t thr_pos, uint8_t fuel_pos, int16_t cylinderA_temp, int16_t cylinderB_temp, int16_t coolant_temp, uint16_t fuel_remain, uint16_t alarm, uint32_t total_runtime, uint16_t runtime, uint16_t service_time, uint16_t output_volt, uint16_t output_curr, uint8_t fault, uint8_t engine_state, uint8_t index, const uint8_t *reserve, uint16_t inlet_pressure, int16_t ge_temp, int16_t air_temp, int16_t temp_1, int16_t volt_2)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char *buf = (char *)msgbuf;
@@ -551,8 +566,9 @@ static inline void mavlink_msg_vk_engine_ecu_staus_send_buf(mavlink_message_t *m
     _mav_put_uint8_t(buf, 32, index);
     _mav_put_uint16_t(buf, 37, inlet_pressure);
     _mav_put_int16_t(buf, 39, ge_temp);
-    _mav_put_int16_t(buf, 41, temp_1);
-    _mav_put_int16_t(buf, 43, volt_2);
+    _mav_put_int16_t(buf, 41, air_temp);
+    _mav_put_int16_t(buf, 43, temp_1);
+    _mav_put_int16_t(buf, 45, volt_2);
     _mav_put_uint8_t_array(buf, 33, reserve, 4);
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS, buf, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_MIN_LEN, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_LEN, MAVLINK_MSG_ID_VK_ENGINE_ECU_STAUS_CRC);
 #else
@@ -576,6 +592,7 @@ static inline void mavlink_msg_vk_engine_ecu_staus_send_buf(mavlink_message_t *m
     packet->index = index;
     packet->inlet_pressure = inlet_pressure;
     packet->ge_temp = ge_temp;
+    packet->air_temp = air_temp;
     packet->temp_1 = temp_1;
     packet->volt_2 = volt_2;
     mav_array_memcpy(packet->reserve, reserve, sizeof(uint8_t)*4);
@@ -791,24 +808,34 @@ static inline int16_t mavlink_msg_vk_engine_ecu_staus_get_ge_temp(const mavlink_
     return _MAV_RETURN_int16_t(msg,  39);
 }
 
+/**
+ * @brief Get field air_temp from vk_engine_ecu_staus message
+ *
+ * @return [degC] air temperature
+ */
+static inline int16_t mavlink_msg_vk_engine_ecu_staus_get_air_temp(const mavlink_message_t* msg)
+{
+    return _MAV_RETURN_int16_t(msg,  41);
+}
+
 /**
  * @brief Get field temp_1 from vk_engine_ecu_staus message
  *
- * @return [degC] Ge temperature
+ * @return [degC] temperature 1
  */
 static inline int16_t mavlink_msg_vk_engine_ecu_staus_get_temp_1(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_int16_t(msg,  41);
+    return _MAV_RETURN_int16_t(msg,  43);
 }
 
 /**
  * @brief Get field volt_2 from vk_engine_ecu_staus message
  *
- * @return [dV] Ge temperature
+ * @return [dV] volt 2
  */
 static inline int16_t mavlink_msg_vk_engine_ecu_staus_get_volt_2(const mavlink_message_t* msg)
 {
-    return _MAV_RETURN_int16_t(msg,  43);
+    return _MAV_RETURN_int16_t(msg,  45);
 }
 
 /**
@@ -840,6 +867,7 @@ static inline void mavlink_msg_vk_engine_ecu_staus_decode(const mavlink_message_
     mavlink_msg_vk_engine_ecu_staus_get_reserve(msg, vk_engine_ecu_staus->reserve);
     vk_engine_ecu_staus->inlet_pressure = mavlink_msg_vk_engine_ecu_staus_get_inlet_pressure(msg);
     vk_engine_ecu_staus->ge_temp = mavlink_msg_vk_engine_ecu_staus_get_ge_temp(msg);
+    vk_engine_ecu_staus->air_temp = mavlink_msg_vk_engine_ecu_staus_get_air_temp(msg);
     vk_engine_ecu_staus->temp_1 = mavlink_msg_vk_engine_ecu_staus_get_temp_1(msg);
     vk_engine_ecu_staus->volt_2 = mavlink_msg_vk_engine_ecu_staus_get_volt_2(msg);
 #else

+ 5 - 4
v2.0/VKFly/testsuite.h

@@ -388,7 +388,7 @@ static void mavlink_test_vk_engine_ecu_staus(uint8_t system_id, uint8_t componen
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
     mavlink_vk_engine_ecu_staus_t packet_in = {
-        963497464,963497672,17651,17755,17859,17963,18067,18171,18275,18379,18483,18587,89,156,223,34,101,{ 168, 169, 170, 171 },19159,19263,19367,19471
+        963497464,963497672,17651,17755,17859,17963,18067,18171,18275,18379,18483,18587,89,156,223,34,101,{ 168, 169, 170, 171 },19159,19263,19367,19471,19575
     };
     mavlink_vk_engine_ecu_staus_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
@@ -411,6 +411,7 @@ static void mavlink_test_vk_engine_ecu_staus(uint8_t system_id, uint8_t componen
         packet1.index = packet_in.index;
         packet1.inlet_pressure = packet_in.inlet_pressure;
         packet1.ge_temp = packet_in.ge_temp;
+        packet1.air_temp = packet_in.air_temp;
         packet1.temp_1 = packet_in.temp_1;
         packet1.volt_2 = packet_in.volt_2;
         
@@ -428,12 +429,12 @@ static void mavlink_test_vk_engine_ecu_staus(uint8_t system_id, uint8_t componen
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_vk_engine_ecu_staus_pack(system_id, component_id, &msg , packet1.timestamp , packet1.spd_rpm , packet1.thr_pos , packet1.fuel_pos , packet1.cylinderA_temp , packet1.cylinderB_temp , packet1.coolant_temp , packet1.fuel_remain , packet1.alarm , packet1.total_runtime , packet1.runtime , packet1.service_time , packet1.output_volt , packet1.output_curr , packet1.fault , packet1.engine_state , packet1.index , packet1.reserve , packet1.inlet_pressure , packet1.ge_temp , packet1.temp_1 , packet1.volt_2 );
+    mavlink_msg_vk_engine_ecu_staus_pack(system_id, component_id, &msg , packet1.timestamp , packet1.spd_rpm , packet1.thr_pos , packet1.fuel_pos , packet1.cylinderA_temp , packet1.cylinderB_temp , packet1.coolant_temp , packet1.fuel_remain , packet1.alarm , packet1.total_runtime , packet1.runtime , packet1.service_time , packet1.output_volt , packet1.output_curr , packet1.fault , packet1.engine_state , packet1.index , packet1.reserve , packet1.inlet_pressure , packet1.ge_temp , packet1.air_temp , packet1.temp_1 , packet1.volt_2 );
     mavlink_msg_vk_engine_ecu_staus_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_vk_engine_ecu_staus_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.spd_rpm , packet1.thr_pos , packet1.fuel_pos , packet1.cylinderA_temp , packet1.cylinderB_temp , packet1.coolant_temp , packet1.fuel_remain , packet1.alarm , packet1.total_runtime , packet1.runtime , packet1.service_time , packet1.output_volt , packet1.output_curr , packet1.fault , packet1.engine_state , packet1.index , packet1.reserve , packet1.inlet_pressure , packet1.ge_temp , packet1.temp_1 , packet1.volt_2 );
+    mavlink_msg_vk_engine_ecu_staus_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.timestamp , packet1.spd_rpm , packet1.thr_pos , packet1.fuel_pos , packet1.cylinderA_temp , packet1.cylinderB_temp , packet1.coolant_temp , packet1.fuel_remain , packet1.alarm , packet1.total_runtime , packet1.runtime , packet1.service_time , packet1.output_volt , packet1.output_curr , packet1.fault , packet1.engine_state , packet1.index , packet1.reserve , packet1.inlet_pressure , packet1.ge_temp , packet1.air_temp , packet1.temp_1 , packet1.volt_2 );
     mavlink_msg_vk_engine_ecu_staus_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
@@ -446,7 +447,7 @@ static void mavlink_test_vk_engine_ecu_staus(uint8_t system_id, uint8_t componen
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
         
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_vk_engine_ecu_staus_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.spd_rpm , packet1.thr_pos , packet1.fuel_pos , packet1.cylinderA_temp , packet1.cylinderB_temp , packet1.coolant_temp , packet1.fuel_remain , packet1.alarm , packet1.total_runtime , packet1.runtime , packet1.service_time , packet1.output_volt , packet1.output_curr , packet1.fault , packet1.engine_state , packet1.index , packet1.reserve , packet1.inlet_pressure , packet1.ge_temp , packet1.temp_1 , packet1.volt_2 );
+    mavlink_msg_vk_engine_ecu_staus_send(MAVLINK_COMM_1 , packet1.timestamp , packet1.spd_rpm , packet1.thr_pos , packet1.fuel_pos , packet1.cylinderA_temp , packet1.cylinderB_temp , packet1.coolant_temp , packet1.fuel_remain , packet1.alarm , packet1.total_runtime , packet1.runtime , packet1.service_time , packet1.output_volt , packet1.output_curr , packet1.fault , packet1.engine_state , packet1.index , packet1.reserve , packet1.inlet_pressure , packet1.ge_temp , packet1.air_temp , packet1.temp_1 , packet1.volt_2 );
     mavlink_msg_vk_engine_ecu_staus_decode(last_msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 

+ 1 - 1
v2.0/common/common.h

@@ -10,7 +10,7 @@
     #error Wrong include order: MAVLINK_COMMON.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
 #endif
 
-#define MAVLINK_COMMON_XML_HASH -3445670045918479351
+#define MAVLINK_COMMON_XML_HASH -2276509121531570771
 
 #ifdef __cplusplus
 extern "C" {

+ 1 - 1
v2.0/common/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH -3445670045918479351
+#define MAVLINK_PRIMARY_XML_HASH -2276509121531570771
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

+ 1 - 1
v2.0/minimal/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH -8220065756402345545
+#define MAVLINK_PRIMARY_XML_HASH -357763083277771255
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

+ 1 - 1
v2.0/minimal/minimal.h

@@ -10,7 +10,7 @@
     #error Wrong include order: MAVLINK_MINIMAL.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
 #endif
 
-#define MAVLINK_MINIMAL_XML_HASH -8220065756402345545
+#define MAVLINK_MINIMAL_XML_HASH -357763083277771255
 
 #ifdef __cplusplus
 extern "C" {

+ 1 - 1
v2.0/standard/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH 7318385347264150845
+#define MAVLINK_PRIMARY_XML_HASH 8101352429893670386
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

+ 1 - 1
v2.0/standard/standard.h

@@ -10,7 +10,7 @@
     #error Wrong include order: MAVLINK_STANDARD.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
 #endif
 
-#define MAVLINK_STANDARD_XML_HASH 7318385347264150845
+#define MAVLINK_STANDARD_XML_HASH 8101352429893670386
 
 #ifdef __cplusplus
 extern "C" {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików