Browse Source

增加顺逆序列执行航线, 返航等定义, 上报数据增加悬停原因定义

Liu Yang 11 months ago
parent
commit
76d58ef0a3

+ 94 - 5
msg_definitions/VKFly.xml

@@ -360,6 +360,23 @@
       </entry>
     </enum>
 
+    <enum name="VKFLY_LOITER_REASON">
+      <entry value="1" name="VLFLY_LOITER_REASON_DEFAULT"></entry>
+      <entry value="2" name="VLFLY_LOITER_REASON_GCS_CMD"></entry>
+      <entry value="3" name="VLFLY_LOITER_REASON_MISSION_DONE"></entry>
+      <entry value="5" name="VLFLY_LOITER_REASON_GPS_REABLE"></entry>
+      <entry value="6" name="VLFLY_LOITER_REASON_RC_CMD"></entry>
+      <entry value="7" name="VLFLY_LOITER_REASON_FOLLOW_FAIL"></entry>
+      <entry value="9" name="VLFLY_LOITER_REASON_TAKEOFF_DONE"></entry>
+      <entry value="10" name="VLFLY_LOITER_REASON_BAT_VOLT_LOW"></entry>
+      <entry value="11" name="VLFLY_LOITER_REASON_RC_FAIL"></entry>
+      <entry value="12" name="VLFLY_LOITER_REASON_RC_LOST"></entry>
+      <entry value="13" name="VLFLY_LOITER_REASON_RC_BAD"></entry>
+      <entry value="14" name="VLFLY_LOITER_REASON_BAT_CAP_LOW"></entry>
+      <entry value="15" name="VLFLY_LOITER_REASON_OFFBOARD"></entry>
+      <entry value="21" name="VLFLY_LOITER_REASON_WPDATA_ERR"></entry>
+    </enum>
+
     <enum name="VKFLY_DIGICAM_WP_ACT">
       <description>Digicam action trigger on waypoint arrive.</description>
       <entry value="0" name="VKFLY_DIGICAM_WP_ACT_NONE">
@@ -444,6 +461,28 @@
       </entry>
     </enum>
 
+    <enum name="VKFLY_MISSION_EXEC_MODE">
+      <entry value="0" name="VKFLY_MISSION_EXEC_MODE_NORMAL"></entry>
+      <entry value="1" name="VKFLY_MISSION_EXEC_MODE_NO_ACT"></entry>
+      <entry value="2" name="VKFLY_MISSION_EXEC_MODE_REVERSE"></entry>
+      <entry value="3" name="VKFLY_MISSION_EXEC_MODE_REVERSE_NO_ACT"></entry>
+      <entry value="4" name="VKFLY_MISSION_EXEC_MODE_REVERSE_THAN_NORMAL"></entry>
+      <entry value="5" name="VKFLY_MISSION_EXEC_MODE_REVERSE_THAN_NORMAL_NO_ACT"></entry>
+    </enum>
+
+    <enum name="VKFLY_MISSION_DONE_ACT">
+      <entry value="0" name="VKFLY_MISSION_DONE_LOITER"></entry>
+      <entry value="1" name="VKFLY_MISSION_DONE_RETURN_TO_LAUNCH"></entry>
+      <entry value="2" name="VKFLY_MISSION_DONE_LAND"></entry>
+      <entry value="3" name="VKFLY_MISSION_DONE_RETURN_TO_RALLY"></entry>
+    </enum>
+
+    <enum name="VKFLY_RTL_EXEC_MODE">
+      <entry value="0" name="VKFLY_RTL_EXEC_MODE_NORMAL"></entry>
+      <entry value="1" name="VKFLY_RTL_EXEC_MODE_BY_MISSION_SEQ"></entry>
+      <entry value="2" name="VKFLY_RTL_EXEC_MODE_BY_MISSION_SEQ_REVERSE"></entry>
+    </enum>
+
     <enum name="VKFLY_CMD">
       <description> VKFLY custom CMD </description>
       <entry value="44010" name="VKFLY_CMD_NAV_WP" hasLocation="true" isDestination="true">
@@ -493,8 +532,8 @@
       </entry>
 
       <entry value="44050" name="VKFLY_CMD_ESC_CONFIG" hasLocation="false"
-        isDestination="true">
-        <description>esc </description>
+        isDestination="false">
+        <description>can esc id configuration</description>
         <param index="1" label="Set ID"> Set Esc id, min=1, max=16 </param>
         <param index="2" label=""> </param>
         <param index="3" label=""> </param>
@@ -503,6 +542,55 @@
         <param index="6" label=""> </param>
         <param index="7" label=""> </param>
       </entry>
+
+      <entry value="44060" name="VKFLY_CMD_DO_REPOSITION_THAN_THROW" hasLocation="true"
+        isDestination="true">
+        <description>Do reposition and throwing</description>
+        <param index="1" label="Throw servo id" minValue="0" maxValue="65535"> Throw servo id bitmap </param>
+        <param index="2" label="Throw altitude"> </param>
+        <param index="3" label="Speed"> </param>
+        <param index="4" label="Yaw"> </param>
+        <param index="5" label="Latitude"> </param>
+        <param index="6" label="Longitude"> </param>
+        <param index="7" label="Altitude" units="m"> </param>
+      </entry>
+
+      <entry value="44061" name="VKFLY_CMD_DO_REPOSITION_THAN_LAND" hasLocation="true"
+        isDestination="true">
+        <description>Do reposition and throwing</description>
+        <param index="1" label="Groud Msl" units="m"> Ground msl altitude</param>
+        <param index="2" label=""> </param>
+        <param index="3" label="Speed"> </param>
+        <param index="4" label="Yaw" units="deg" minValue="0" maxValue="359.99"> </param>
+        <param index="5" label="Latitude"> </param>
+        <param index="6" label="Longitude"> </param>
+        <param index="7" label="Altitude" units="m"> </param>
+      </entry>
+
+      <entry value="44062" name="VKFLY_CMD_MISSION_START" hasLocation="false"
+        isDestination="false">
+        <description>Start mission</description>
+        <param index="1" label="Start Seq" minValue="0" maxValue="65535">start sequence of mission</param>
+        <param index="2" label="Mission Exec Mode" enum="VKFLY_MISSION_EXEC_MODE"> </param>
+        <param index="3" label="Mission Done Action"> </param>
+        <param index="4" label=""> </param>
+        <param index="5" label=""> </param>
+        <param index="6" label=""> </param>
+        <param index="7" label=""> </param>
+      </entry>
+
+      <entry value="44063" name="VKFLY_CMD_RETURN_TO_LAUCH" hasLocation="false"
+        isDestination="false">
+        <description>Return to launch position than land</description>
+        <param index="1" label="Start Seq" minValue="0" maxValue="65535">start sequence of mission</param>
+        <param index="2" label="Rtl Exec Mode" enum="VKFLY_RTL_EXEC_MODE"> </param>
+        <param index="3" label=""> </param>
+        <param index="4" label=""> </param>
+        <param index="5" label=""> </param>
+        <param index="6" label=""> </param>
+        <param index="7" label=""> </param>
+      </entry>
+
     </enum>
   </enums>
 
@@ -536,7 +624,7 @@
       <description> </description>
       <field type="uint32_t" name="time_boot_ms" units="ms">Timestamp in ms from system boot.</field>
       <field type="uint8_t" name="rtl_reason" enum="VKFLY_RTL_REASON">return to launch reason.</field>
-      <field type="uint8_t" name="s_flag2">fmu sflag2</field>
+      <field type="uint8_t" name="loiter_reason" enum="VKFLY_LOITER_REASON">Loiter reason </field>
       <field type="uint8_t" name="s_flag3">fmu sflag3</field>
       <field type="uint16_t" name="ups_volt">ups voltage in 0.1V</field>
       <field type="uint16_t" name="adc_volt">adc voltage in 0.1V</field>
@@ -557,7 +645,8 @@
       <description> battery bms status message </description>
       <field type="uint32_t" name="time_boot_ms" units="ms">Timestamp in ms from system boot.</field>
       <field type="uint32_t" name="voltage" units="mV">BMS voltage in mV</field>
-      <field type="int16_t" name="current" units="cA">BMS current in cA, negative value means in charging</field>
+      <field type="int16_t" name="current" units="cA">BMS current in cA, negative value means in
+        charging</field>
       <field type="int16_t" name="temperature" units="degC">BMS temperature in degC</field>
       <field type="int8_t" name="cap_percent" units="%">BMS remaining power in percentage</field>
       <field type="uint8_t" name="bat_id" minValue="0" maxValue="1" increment="1">BMS id, start from
@@ -623,4 +712,4 @@
 
   </messages>
 
-</mavlink>
+</mavlink>

+ 163 - 26
readme.md

@@ -779,6 +779,31 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
     VKFLY_RTL_REASON_ENUM_END=14, /*  | */
   } VKFLY_RTL_REASON;
   ```
+- VKFLY_LOITER_REASON
+  悬停原因
+  
+  ```c
+  typedef enum VKFLY_LOITER_REASON
+  {
+    VLFLY_LOITER_REASON_DEFAULT=1, /* 默认原因 | */
+    VLFLY_LOITER_REASON_GCS_CMD=2, /*  | 地面站指令悬停 */
+    VLFLY_LOITER_REASON_MISSION_DONE=3, /* 任务完成悬停 | */
+    VLFLY_LOITER_REASON_GPS_REABLE=5, /* GPS重定位悬停 | */
+    VLFLY_LOITER_REASON_RC_CMD=6, /* 遥控器指令悬停 | */
+    VLFLY_LOITER_REASON_FOLLOW_FAIL=7, /* 跟随目标结束悬停 | */
+    VLFLY_LOITER_REASON_TAKEOFF_DONE=9, /* 自动起飞结束悬停 | */
+    VLFLY_LOITER_REASON_BAT_VOLT_LOW=10, /* 电池电压低悬停 | */
+    VLFLY_LOITER_REASON_RC_FAIL=11, /*  遥控器失控悬停 | */
+    VLFLY_LOITER_REASON_RC_LOST=12, /* 遥控器失联悬停 | */
+    VLFLY_LOITER_REASON_RC_BAD=13, /* 遥控器数据异常悬停 | */
+    VLFLY_LOITER_REASON_BAT_CAP_LOW=14, /* 电池电量低悬停 | */
+    VLFLY_LOITER_REASON_OFFBOARD=15, /* OFFBORAD控制悬停 | */
+    VLFLY_LOITER_REASON_WPDATA_ERR=21, /* 航点数据异常悬停  | */
+    VKFLY_LOITER_REASON_ENUM_END=22, /*  | */
+  } VKFLY_LOITER_REASON;
+  #endif
+  ```
+
 
 - VKFLY_VKINS_NAV_STATUS
 
@@ -886,6 +911,44 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
     VKFLY_THROW_CHAN_TYPE_ENUM_END=65536, /*  | */
   } VKFLY_THROW_CHAN_TYPE;
   ```
+- VKFLY_MISSION_EXEC_MODE
+  航线执行方式
+  ```c
+  typedef enum VKFLY_MISSION_EXEC_MODE
+  {
+    VKFLY_MISSION_EXEC_MODE_NORMAL=0, /* 顺序执行, 正常执行航点动作 | */
+    VKFLY_MISSION_EXEC_MODE_NO_ACT=1, /* 顺序执行, 略过航点动作 | */
+    VKFLY_MISSION_EXEC_MODE_REVERSE=2, /* 逆序执行, 正常航点动作 | */
+    VKFLY_MISSION_EXEC_MODE_REVERSE_NO_ACT=3, /* 逆序执行, 忽略航点动作 | */
+    VKFLY_MISSION_EXEC_MODE_NORMAL_THAN_REVERSE=4, /* 顺序执行, 完成最后一个任务点后再逆序执行, 全程正常执行航点动作 | */
+    VKFLY_MISSION_EXEC_MODE_NORMAL_THAN_REVERSE_NO_ACT=5, /* 顺序执行, 完成最后一首歌任务点后再逆序执行, 逆序过程略过航点动作 | */
+    VKFLY_MISSION_EXEC_MODE_ENUM_END=6, /*  | */
+  } VKFLY_MISSION_EXEC_MODE;
+  ```
+- VKFLY_MISSION_DONE_ACT
+  航线任务完成后动作
+  ```c
+  typedef enum VKFLY_MISSION_DONE_ACT
+  {
+    VKFLY_MISSION_DONE_LOITER=0, /* 悬停 | */
+    VKFLY_MISSION_DONE_RETURN_TO_LAUNCH=1, /* 返航回 home  | */
+    VKFLY_MISSION_DONE_LAND=2, /* 原地降落 | */
+    VKFLY_MISSION_DONE_RETURN_TO_RALLY=3, /* 返回回备降点 | */
+    VKFLY_MISSION_DONE_ACT_ENUM_END=4, /*  | */
+  } VKFLY_MISSION_DONE_ACT;
+  ```
+
+- VKFLY_RTL_EXEC_MODE
+  返航执行方式
+  ```c
+  typedef enum VKFLY_RTL_EXEC_MODE
+  {
+    VKFLY_RTL_EXEC_MODE_NORMAL=0, /*  | */
+    VKFLY_RTL_EXEC_MODE_BY_MISSION_SEQ=1, /*  | */
+    VKFLY_RTL_EXEC_MODE_BY_MISSION_SEQ_REVERSE=2, /*  | */
+    VKFLY_RTL_EXEC_MODE_ENUM_END=3, /*  | */
+  } VKFLY_RTL_EXEC_MODE;
+  ```
 
 ### 自定义 command
 
@@ -906,8 +969,7 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
   | param7 | 高度 m                                                                                                                                                                                                                                                                                                       |
 
 - VKFLY_CMD_NAV_WP_THROW
-
-  抛投航点
+  抛投航点, 抛投完成后继续执行后续航点, 无后续航点则悬停
 
   | 参数   | 说明                                                                                                                                                                                                                                                                                                 |
   | ------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -919,6 +981,20 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
   | param6 | 经度 1e-7deg                                                                                                                                                                                                                                                                                         |
   | param7 | 高度 m                                                                                                                                                                                                                                                                                               |
 
+- VKFLY_CMD_NAV_WP_THROW_THEN_INVERSE_MISSION
+  抛投航点, 抛投完成后反向执行前续航点, 到达第一个航点后按参数执行悬停或降落
+
+  | 参数   | 说明                                                                                                                                                                                                                                                                                                 |
+  | ------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+  | param1 | 该参数按 byte[4] 进行使用. <br>byte[0]~byte[1] s16, 悬停时间, 单位 s. 0 表示不进行悬停自动转弯. 悬停到时间后将执行抛投信号触发. <br>byte[2]~byte[3] s16, 巡航速度, 单位 dm/s. 0 或负数表示使用默认巡航速度参数.                                                                                      |
+  | param2 | 该参数按 byte[4] 进行使用. <br>byte[0]~byte[1] s16, 抛投对地高度, 单位 dm. 0或者负数表示在航点当前高度抛投. 若有有效的对地高度信息如雷达测距仪等, 则自动在航点进行下降到设定的对地高度再执行抛投. <br>byte[2]~byte[3] u16, 抛投通道. 每 bit 代表一个抛投执行通道, bitmap 参考 VKFLY_THROW_CHAN_TYPE. |
+  | param3 | 改参数按 byte[4] 进行使用.                                                                                                                                                                                                                                                                           |
+  | param4 | 该参数作为 byte[4] 类型使用. <br>byte[0] u8, 为航向模式参考 VKFLY_YAW_CTRL_MODE. <br>byte[1]预留. <br>byte[2]~byte[3] s16, 范围-180~180. 当航向模式为 VKFLY_YAW_TO_SETVAL 时表示给定的航向值, 单位deg. 当航向模式为指向 <br>HOME 或 NEXT_WP 或 INTEREST 等给定点点时, 表示叠加的航向偏移.            |
+  | param5 | 纬度 1e-7deg                                                                                                                                                                                                                                                                                         |
+  | param6 | 经度 1e-7deg                                                                                                                                                                                                                                                                                         |
+  | param7 | 高度 m                                                                                                                                                                                                                                                                                               |
+
+
 - VKFLY_CMD_NAV_WP_ORBIT_DO_PHOTO
 
   环绕航点
@@ -936,9 +1012,53 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
 
 - VKFLY_CMD_ESC_CONFIG
   电调设置
-  | 参数   | 说明                                  |
-  | ------ | ------------------------------------- |
-  | param1 | 设置电调编号, 1~16, NAN表示忽略该指令 |
+
+| 参数   | 说明                                  |
+| ------ | ------------------------------------- |
+| param1 | 设置电调编号, 1~16, NAN表示忽略该指令 |
+
+- VKFLY_CMD_DO_REPOSITION_THAN_THROW
+  指点后抛投, 本指令仅支持 COMMAND_INT 
+
+  | 参数   | 说明                                                                       |
+  | ------ | -------------------------------------------------------------------------- |
+  | param1 | 抛投舵机编号, 0~0xFFFF, 从低到高每bit对应一舵机, 参考VKFLY_THROW_CHAN_TYPE |
+  | param2 | 抛投后动作, NAN或0为悬停, 1为返航                                          |
+  | x      | 纬度, 1e-7deg                                                              |
+  | y      | 经度, 1e-7deg                                                              |
+  | z      | 高度, m                                                                    |
+
+- VKFLY_CMD_DO_REPOSITION_THAN_LAND
+  指点后降落, 本指令仅支持 COMMAND_INT
+
+  | 参数   | 说明                                                                   |
+  | ------ | ---------------------------------------------------------------------- |
+  | param1 | 地面海拔,单位m, 飞控根据该参数判断何时接近了地面需要减速, 未知则填 NAN |
+  | param3 | 水平速度,单位m/s, 飞到该位置的最大水平速度                             |
+  | param4 | 航向,单位deg, 0-359.99deg, 北偏东航向                                  |
+  | x      | 纬度,1e-7deg                                                           |
+  | y      | 精度,1e-7deg                                                           |
+  | z      | 高度, m. 飞往该点过程中的相对高度                                      |
+
+- VKFLY_CMD_MISSION_START 
+  开始航线
+
+  | 参数   | 说明                                                                            |
+  | ------ | ------------------------------------------------------------------------------- |
+  | param1 | 起始航点序号,0-UINT16_MAX. NAN表示忽略该参数,飞控根据执行方式从0或最后一点开始 |
+  | param2 | 任务执行方式, 参考 VKFLY_MISSION_EXEC_MODE                                      |
+  | param3 | 任务完成后动作, 参考 VKFLY_MISSION_DONE_ACT                                     |
+
+- VKFLY_CMD_RETURN_TO_LAUCH
+  返航
+
+  | 参数   | 说明                                                                                         |
+  | ------ | -------------------------------------------------------------------------------------------- |
+  | param1 | 起始航点序号, 0-UINT16_MAX. 当返航执行方式为正序或逆序航线返航时参数有效. NAN 表示忽略该参数 |
+  | param2 | 返航执行, 参考 VKFLY_RTL_EXEC_MODE                                                        |
+
+
+
 
 ### 自定义消息
 
@@ -963,16 +1083,16 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
   | raw_gps_alt     | vkins解算使用的原始海拔高度m                                                              |
 
 - MAVLINK_VKFMU_STATUS
-  | 字段         | 说明                            |
-  | ------------ | ------------------------------- |
-  | time_boot_ms | 系统本地时间戳ms                |
-  | rtl_reason   | 返航原因, 参考 VKFLY_RTL_REASON |
-  | s_flag2      | 预留                            |
-  | s_flag3      | 预留                            |
-  | ups_volt     | ups电压, 0.1V                   |
-  | adc_volt     | adc电压, 0.1V                   |
-  | flight_time  | 飞行时间,s                      |
-  | dist_t_tar   | 目标距离, cm                    |
+  | 字段          | 说明                               |
+  | ------------- | ---------------------------------- |
+  | time_boot_ms  | 系统本地时间戳ms                   |
+  | rtl_reason    | 返航原因, 参考 VKFLY_RTL_REASON    |
+  | loiter_reason | 悬停原因, 参考 VKFLY_LOITER_REASON |
+  | s_flag3       | 预留                               |
+  | ups_volt      | ups电压, 0.1V                      |
+  | adc_volt      | adc电压, 0.1V                      |
+  | flight_time   | 飞行时间,s                         |
+  | dist_t_tar    | 目标距离, cm                       |
 
 - MAVLINK_VK_BMS_STATUS
   智能电池状态数据
@@ -1026,11 +1146,11 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
 | OBAVOID_DIST    | 障碍悬停距离                         | FLOAT  | 范围2~8, 单位m                                                                                 |
 | OBAVOID_ACT     | 避障动作                             | UINT8  | 范围0~2,0-不开启 1-悬停 2-爬高                                                                 |
 | GCS_DISC_CRUISE | 航线中是否启用地面站失联             | UINT8  | 范围0~1,0-不启用 1-启用                                                                        |
-| WP_FINISH_ACT   | 航线完成后动作                       | UINT8  | 0-悬停 1-返航 2-降落 3-重新执行航线                                                            |
 | FS_CONF_A       | 失控保护设置                         | UINT32 | 参考enum FS_ACTION. <br>bit0~3:1级低电压保护 <br>bit4~7:2级低电压保护 <br>bit8~11:动力故障保护 |
 | CIR_RAD_DFLT    | 默认环绕/盘旋半径                    | FLOAT  | 范围1~10000m                                                                                   |
 | TOF_ALT_M       | 默认起飞高度                         | FLOAT  | 范围1~5000, 单位m                                                                              |
 | RTL_ALT_M       | 默认返航高度                         | FLOAT  | 范围0~5000, 单位m                                                                              |
+| RTL_EXEC_MODE   | 默认返航执行方式                     | UINT8  | 参考VKFLY_RTL_EXEC_MODE                                                                        |
 | MC_XY_CRUISE    | 默认旋翼巡航速度                     | FLOAT  | 范围2~25, 单位m/s                                                                              |
 | COM_P1_AF       | 载荷P1串口复用                       | UINT16 | 范围0~UINT16_MAX                                                                               |
 | ALT_LIM_UP1     | 1级高度限制                          | UINT16 | 范围10~10000, 单位m                                                                            |
@@ -1047,6 +1167,7 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
 | PHO_PWM_OFF     | 拍照PWM信号待命值                    | UINT16 | 范围0~10000, 单位us                                                                            |
 | PHO_PWM_ON      | 拍照PWM信号触发值                    | UINT16 | 范围0~10000, 单位us                                                                            |
 | PHO_SIG_TIME    | 拍照触发信号持续时间                 | UINT16 | 范围0~20000, 单位ms                                                                            |
+| PHO_SIG_CH      | 拍照-信号输出通道映射                | UINT8  | 拍照信号映射到飞控的哪个输出接口,0~16, 0-表示不启用映射输出                                    |
 | FOLLOW_DIST     | 默认跟随距离                         | FLOAT  | 范围2~1000,单位m                                                                               |
 | MAN_VELH_MAX    | 手动模式最大水平速度                 | FLOAT  | 范围2~20,单位m/s                                                                               |
 | MAN_VELU_MAX    | 手动模式最大爬升速度                 | FLOAT  | 范围1~10,单位m/s                                                                               |
@@ -1195,15 +1316,23 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
 | THROW_RCCH5     | 抛投5-遥控器通道映射                 | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
 | THROW_RCCH6     | 抛投6-遥控器通道映射                 | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
 | THROW_RCCH7     | 抛投7-遥控器通道映射                 | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
-| THROW_RCCH8     | 抛投7-遥控器通道映射                 | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
-| THROW_CH1       | 抛投1-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
-| THROW_CH2       | 抛投2-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
-| THROW_CH3       | 抛投3-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
-| THROW_CH4       | 抛投4-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
-| THROW_CH5       | 抛投5-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
-| THROW_CH6       | 抛投6-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
-| THROW_CH7       | 抛投7-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
-| THROW_CH8       | 抛投8-PWM输出通道映射                | UINT16 | 范围 0~15, 0-表示不启用                                                                        |
+| THROW_RCCH8     | 抛投8-遥控器通道映射                 | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
+| THROW_RCCH9     | 抛投9-遥控器通道映射                 | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
+| THROW_RCCH10    | 抛投10-遥控器通道映射                | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
+| THROW_RCCH11    | 抛投11-遥控器通道映射                | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
+| THROW_RCCH12    | 抛投12-遥控器通道映射                | UINT16 | 范围 0~18, 0-表示不启用                                                                        |
+| THROW_CH1       | 抛投1-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH2       | 抛投2-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH3       | 抛投3-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH4       | 抛投4-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH5       | 抛投5-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH6       | 抛投6-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH7       | 抛投7-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH8       | 抛投8-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH9       | 抛投9-PWM输出通道映射                | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH10      | 抛投10-PWM输出通道映射               | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH11      | 抛投11-PWM输出通道映射               | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
+| THROW_CH12      | 抛投12-PWM输出通道映射               | UINT16 | 范围 0~16, 0-表示不启用                                                                        |
 | THROW_CH1_ON    | 抛投1-打开PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH2_ON    | 抛投2-打开PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH3_ON    | 抛投3-打开PWM值                      | UINT16 | 范围 0~2500                                                                                    |
@@ -1212,6 +1341,10 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
 | THROW_CH6_ON    | 抛投6-打开PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH7_ON    | 抛投7-打开PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH8_ON    | 抛投8-打开PWM值                      | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH9_ON    | 抛投9-打开PWM值                      | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH10_ON   | 抛投10-打开PWM值                     | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH11_ON   | 抛投11-打开PWM值                     | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH12_ON   | 抛投12-打开PWM值                     | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH1_OFF   | 抛投1-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH2_OFF   | 抛投2-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH3_OFF   | 抛投3-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
@@ -1219,4 +1352,8 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
 | THROW_CH5_OFF   | 抛投5-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH6_OFF   | 抛投6-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
 | THROW_CH7_OFF   | 抛投7-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
-| THROW_CH8_OFF   | 抛投8-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH8_OFF   | 抛投8-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH9_OFF   | 抛投9-关闭PWM值                      | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH10_OFF  | 抛投10-关闭PWM值                     | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH11_OFF  | 抛投11-关闭PWM值                     | UINT16 | 范围 0~2500                                                                                    |
+| THROW_CH12_OFF  | 抛投12-关闭PWM值                     | UINT16 | 范围 0~2500                                                                                    |

File diff suppressed because it is too large
+ 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 9052510758403855634
+#define MAVLINK_PRIMARY_XML_HASH -8759080805051931211
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

+ 12 - 6
v2.0/VKFly/mavlink_msg_vk_bms_status.h

@@ -9,7 +9,8 @@ typedef struct __mavlink_vk_bms_status_t {
  uint32_t voltage; /*< [mV] BMS voltage in mV*/
  uint32_t err_code; /*<  BMS error code,
         0 means no error*/
- int16_t current; /*< [cA] BMS current in cA, negative value means in charging*/
+ int16_t current; /*< [cA] BMS current in cA, negative value means in
+        charging*/
  int16_t temperature; /*< [degC] BMS temperature in degC*/
  uint16_t cell_num; /*<  BMS cell numbers*/
  uint16_t cell_volt[30]; /*< [mV] BMS cell voltage in mV*/
@@ -69,7 +70,8 @@ typedef struct __mavlink_vk_bms_status_t {
  *
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param voltage [mV] BMS voltage in mV
- * @param current [cA] BMS current in cA, negative value means in charging
+ * @param current [cA] BMS current in cA, negative value means in
+        charging
  * @param temperature [degC] BMS temperature in degC
  * @param cap_percent [%] BMS remaining power in percentage
  * @param bat_id  BMS id, start from
@@ -122,7 +124,8 @@ static inline uint16_t mavlink_msg_vk_bms_status_pack(uint8_t system_id, uint8_t
  *
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param voltage [mV] BMS voltage in mV
- * @param current [cA] BMS current in cA, negative value means in charging
+ * @param current [cA] BMS current in cA, negative value means in
+        charging
  * @param temperature [degC] BMS temperature in degC
  * @param cap_percent [%] BMS remaining power in percentage
  * @param bat_id  BMS id, start from
@@ -178,7 +181,8 @@ static inline uint16_t mavlink_msg_vk_bms_status_pack_status(uint8_t system_id,
  * @param msg The MAVLink message to compress the data into
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param voltage [mV] BMS voltage in mV
- * @param current [cA] BMS current in cA, negative value means in charging
+ * @param current [cA] BMS current in cA, negative value means in
+        charging
  * @param temperature [degC] BMS temperature in degC
  * @param cap_percent [%] BMS remaining power in percentage
  * @param bat_id  BMS id, start from
@@ -270,7 +274,8 @@ static inline uint16_t mavlink_msg_vk_bms_status_encode_status(uint8_t system_id
  *
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param voltage [mV] BMS voltage in mV
- * @param current [cA] BMS current in cA, negative value means in charging
+ * @param current [cA] BMS current in cA, negative value means in
+        charging
  * @param temperature [degC] BMS temperature in degC
  * @param cap_percent [%] BMS remaining power in percentage
  * @param bat_id  BMS id, start from
@@ -391,7 +396,8 @@ static inline uint32_t mavlink_msg_vk_bms_status_get_voltage(const mavlink_messa
 /**
  * @brief Get field current from vk_bms_status message
  *
- * @return [cA] BMS current in cA, negative value means in charging
+ * @return [cA] BMS current in cA, negative value means in
+        charging
  */
 static inline int16_t mavlink_msg_vk_bms_status_get_current(const mavlink_message_t* msg)
 {

+ 32 - 32
v2.0/VKFly/mavlink_msg_vkfmu_status.h

@@ -11,7 +11,7 @@ typedef struct __mavlink_vkfmu_status_t {
  uint16_t ups_volt; /*<  ups voltage in 0.1V*/
  uint16_t adc_volt; /*<  adc voltage in 0.1V*/
  uint8_t rtl_reason; /*<  return to launch reason.*/
- uint8_t s_flag2; /*<  fmu sflag2*/
+ uint8_t loiter_reason; /*<  Loiter reason */
  uint8_t s_flag3; /*<  fmu sflag3*/
 } mavlink_vkfmu_status_t;
 
@@ -20,8 +20,8 @@ typedef struct __mavlink_vkfmu_status_t {
 #define MAVLINK_MSG_ID_53001_LEN 19
 #define MAVLINK_MSG_ID_53001_MIN_LEN 19
 
-#define MAVLINK_MSG_ID_VKFMU_STATUS_CRC 223
-#define MAVLINK_MSG_ID_53001_CRC 223
+#define MAVLINK_MSG_ID_VKFMU_STATUS_CRC 149
+#define MAVLINK_MSG_ID_53001_CRC 149
 
 
 
@@ -32,7 +32,7 @@ typedef struct __mavlink_vkfmu_status_t {
     8, \
     {  { "time_boot_ms", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_vkfmu_status_t, time_boot_ms) }, \
          { "rtl_reason", NULL, MAVLINK_TYPE_UINT8_T, 0, 16, offsetof(mavlink_vkfmu_status_t, rtl_reason) }, \
-         { "s_flag2", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_vkfmu_status_t, s_flag2) }, \
+         { "loiter_reason", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_vkfmu_status_t, loiter_reason) }, \
          { "s_flag3", NULL, MAVLINK_TYPE_UINT8_T, 0, 18, offsetof(mavlink_vkfmu_status_t, s_flag3) }, \
          { "ups_volt", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_vkfmu_status_t, ups_volt) }, \
          { "adc_volt", NULL, MAVLINK_TYPE_UINT16_T, 0, 14, offsetof(mavlink_vkfmu_status_t, adc_volt) }, \
@@ -46,7 +46,7 @@ typedef struct __mavlink_vkfmu_status_t {
     8, \
     {  { "time_boot_ms", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_vkfmu_status_t, time_boot_ms) }, \
          { "rtl_reason", NULL, MAVLINK_TYPE_UINT8_T, 0, 16, offsetof(mavlink_vkfmu_status_t, rtl_reason) }, \
-         { "s_flag2", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_vkfmu_status_t, s_flag2) }, \
+         { "loiter_reason", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_vkfmu_status_t, loiter_reason) }, \
          { "s_flag3", NULL, MAVLINK_TYPE_UINT8_T, 0, 18, offsetof(mavlink_vkfmu_status_t, s_flag3) }, \
          { "ups_volt", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_vkfmu_status_t, ups_volt) }, \
          { "adc_volt", NULL, MAVLINK_TYPE_UINT16_T, 0, 14, offsetof(mavlink_vkfmu_status_t, adc_volt) }, \
@@ -64,7 +64,7 @@ typedef struct __mavlink_vkfmu_status_t {
  *
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param rtl_reason  return to launch reason.
- * @param s_flag2  fmu sflag2
+ * @param loiter_reason  Loiter reason 
  * @param s_flag3  fmu sflag3
  * @param ups_volt  ups voltage in 0.1V
  * @param adc_volt  adc voltage in 0.1V
@@ -73,7 +73,7 @@ typedef struct __mavlink_vkfmu_status_t {
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vkfmu_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-                               uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t s_flag2, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
+                               uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t loiter_reason, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VKFMU_STATUS_LEN];
@@ -83,7 +83,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack(uint8_t system_id, uint8_t
     _mav_put_uint16_t(buf, 12, ups_volt);
     _mav_put_uint16_t(buf, 14, adc_volt);
     _mav_put_uint8_t(buf, 16, rtl_reason);
-    _mav_put_uint8_t(buf, 17, s_flag2);
+    _mav_put_uint8_t(buf, 17, loiter_reason);
     _mav_put_uint8_t(buf, 18, s_flag3);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_VKFMU_STATUS_LEN);
@@ -95,7 +95,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack(uint8_t system_id, uint8_t
     packet.ups_volt = ups_volt;
     packet.adc_volt = adc_volt;
     packet.rtl_reason = rtl_reason;
-    packet.s_flag2 = s_flag2;
+    packet.loiter_reason = loiter_reason;
     packet.s_flag3 = s_flag3;
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_VKFMU_STATUS_LEN);
@@ -114,7 +114,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack(uint8_t system_id, uint8_t
  *
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param rtl_reason  return to launch reason.
- * @param s_flag2  fmu sflag2
+ * @param loiter_reason  Loiter reason 
  * @param s_flag3  fmu sflag3
  * @param ups_volt  ups voltage in 0.1V
  * @param adc_volt  adc voltage in 0.1V
@@ -123,7 +123,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack(uint8_t system_id, uint8_t
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vkfmu_status_pack_status(uint8_t system_id, uint8_t component_id, mavlink_status_t *_status, mavlink_message_t* msg,
-                               uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t s_flag2, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
+                               uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t loiter_reason, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VKFMU_STATUS_LEN];
@@ -133,7 +133,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack_status(uint8_t system_id, u
     _mav_put_uint16_t(buf, 12, ups_volt);
     _mav_put_uint16_t(buf, 14, adc_volt);
     _mav_put_uint8_t(buf, 16, rtl_reason);
-    _mav_put_uint8_t(buf, 17, s_flag2);
+    _mav_put_uint8_t(buf, 17, loiter_reason);
     _mav_put_uint8_t(buf, 18, s_flag3);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_VKFMU_STATUS_LEN);
@@ -145,7 +145,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack_status(uint8_t system_id, u
     packet.ups_volt = ups_volt;
     packet.adc_volt = adc_volt;
     packet.rtl_reason = rtl_reason;
-    packet.s_flag2 = s_flag2;
+    packet.loiter_reason = loiter_reason;
     packet.s_flag3 = s_flag3;
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_VKFMU_STATUS_LEN);
@@ -167,7 +167,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack_status(uint8_t system_id, u
  * @param msg The MAVLink message to compress the data into
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param rtl_reason  return to launch reason.
- * @param s_flag2  fmu sflag2
+ * @param loiter_reason  Loiter reason 
  * @param s_flag3  fmu sflag3
  * @param ups_volt  ups voltage in 0.1V
  * @param adc_volt  adc voltage in 0.1V
@@ -177,7 +177,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack_status(uint8_t system_id, u
  */
 static inline uint16_t mavlink_msg_vkfmu_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
                                mavlink_message_t* msg,
-                                   uint32_t time_boot_ms,uint8_t rtl_reason,uint8_t s_flag2,uint8_t s_flag3,uint16_t ups_volt,uint16_t adc_volt,uint32_t flight_time,uint32_t dist_to_tar)
+                                   uint32_t time_boot_ms,uint8_t rtl_reason,uint8_t loiter_reason,uint8_t s_flag3,uint16_t ups_volt,uint16_t adc_volt,uint32_t flight_time,uint32_t dist_to_tar)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VKFMU_STATUS_LEN];
@@ -187,7 +187,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack_chan(uint8_t system_id, uin
     _mav_put_uint16_t(buf, 12, ups_volt);
     _mav_put_uint16_t(buf, 14, adc_volt);
     _mav_put_uint8_t(buf, 16, rtl_reason);
-    _mav_put_uint8_t(buf, 17, s_flag2);
+    _mav_put_uint8_t(buf, 17, loiter_reason);
     _mav_put_uint8_t(buf, 18, s_flag3);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_VKFMU_STATUS_LEN);
@@ -199,7 +199,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack_chan(uint8_t system_id, uin
     packet.ups_volt = ups_volt;
     packet.adc_volt = adc_volt;
     packet.rtl_reason = rtl_reason;
-    packet.s_flag2 = s_flag2;
+    packet.loiter_reason = loiter_reason;
     packet.s_flag3 = s_flag3;
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, MAVLINK_MSG_ID_VKFMU_STATUS_LEN);
@@ -219,7 +219,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_pack_chan(uint8_t system_id, uin
  */
 static inline uint16_t mavlink_msg_vkfmu_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_vkfmu_status_t* vkfmu_status)
 {
-    return mavlink_msg_vkfmu_status_pack(system_id, component_id, msg, vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->s_flag2, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
+    return mavlink_msg_vkfmu_status_pack(system_id, component_id, msg, vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->loiter_reason, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
 }
 
 /**
@@ -233,7 +233,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_encode(uint8_t system_id, uint8_
  */
 static inline uint16_t mavlink_msg_vkfmu_status_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_vkfmu_status_t* vkfmu_status)
 {
-    return mavlink_msg_vkfmu_status_pack_chan(system_id, component_id, chan, msg, vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->s_flag2, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
+    return mavlink_msg_vkfmu_status_pack_chan(system_id, component_id, chan, msg, vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->loiter_reason, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
 }
 
 /**
@@ -247,7 +247,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_encode_chan(uint8_t system_id, u
  */
 static inline uint16_t mavlink_msg_vkfmu_status_encode_status(uint8_t system_id, uint8_t component_id, mavlink_status_t* _status, mavlink_message_t* msg, const mavlink_vkfmu_status_t* vkfmu_status)
 {
-    return mavlink_msg_vkfmu_status_pack_status(system_id, component_id, _status, msg,  vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->s_flag2, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
+    return mavlink_msg_vkfmu_status_pack_status(system_id, component_id, _status, msg,  vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->loiter_reason, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
 }
 
 /**
@@ -256,7 +256,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_encode_status(uint8_t system_id,
  *
  * @param time_boot_ms [ms] Timestamp in ms from system boot.
  * @param rtl_reason  return to launch reason.
- * @param s_flag2  fmu sflag2
+ * @param loiter_reason  Loiter reason 
  * @param s_flag3  fmu sflag3
  * @param ups_volt  ups voltage in 0.1V
  * @param adc_volt  adc voltage in 0.1V
@@ -265,7 +265,7 @@ static inline uint16_t mavlink_msg_vkfmu_status_encode_status(uint8_t system_id,
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
-static inline void mavlink_msg_vkfmu_status_send(mavlink_channel_t chan, uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t s_flag2, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
+static inline void mavlink_msg_vkfmu_status_send(mavlink_channel_t chan, uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t loiter_reason, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char buf[MAVLINK_MSG_ID_VKFMU_STATUS_LEN];
@@ -275,7 +275,7 @@ static inline void mavlink_msg_vkfmu_status_send(mavlink_channel_t chan, uint32_
     _mav_put_uint16_t(buf, 12, ups_volt);
     _mav_put_uint16_t(buf, 14, adc_volt);
     _mav_put_uint8_t(buf, 16, rtl_reason);
-    _mav_put_uint8_t(buf, 17, s_flag2);
+    _mav_put_uint8_t(buf, 17, loiter_reason);
     _mav_put_uint8_t(buf, 18, s_flag3);
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VKFMU_STATUS, buf, MAVLINK_MSG_ID_VKFMU_STATUS_MIN_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_CRC);
@@ -287,7 +287,7 @@ static inline void mavlink_msg_vkfmu_status_send(mavlink_channel_t chan, uint32_
     packet.ups_volt = ups_volt;
     packet.adc_volt = adc_volt;
     packet.rtl_reason = rtl_reason;
-    packet.s_flag2 = s_flag2;
+    packet.loiter_reason = loiter_reason;
     packet.s_flag3 = s_flag3;
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VKFMU_STATUS, (const char *)&packet, MAVLINK_MSG_ID_VKFMU_STATUS_MIN_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_CRC);
@@ -302,7 +302,7 @@ static inline void mavlink_msg_vkfmu_status_send(mavlink_channel_t chan, uint32_
 static inline void mavlink_msg_vkfmu_status_send_struct(mavlink_channel_t chan, const mavlink_vkfmu_status_t* vkfmu_status)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-    mavlink_msg_vkfmu_status_send(chan, vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->s_flag2, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
+    mavlink_msg_vkfmu_status_send(chan, vkfmu_status->time_boot_ms, vkfmu_status->rtl_reason, vkfmu_status->loiter_reason, vkfmu_status->s_flag3, vkfmu_status->ups_volt, vkfmu_status->adc_volt, vkfmu_status->flight_time, vkfmu_status->dist_to_tar);
 #else
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VKFMU_STATUS, (const char *)vkfmu_status, MAVLINK_MSG_ID_VKFMU_STATUS_MIN_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_CRC);
 #endif
@@ -316,7 +316,7 @@ static inline void mavlink_msg_vkfmu_status_send_struct(mavlink_channel_t chan,
   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_vkfmu_status_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t s_flag2, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
+static inline void mavlink_msg_vkfmu_status_send_buf(mavlink_message_t *msgbuf, mavlink_channel_t chan,  uint32_t time_boot_ms, uint8_t rtl_reason, uint8_t loiter_reason, uint8_t s_flag3, uint16_t ups_volt, uint16_t adc_volt, uint32_t flight_time, uint32_t dist_to_tar)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
     char *buf = (char *)msgbuf;
@@ -326,7 +326,7 @@ static inline void mavlink_msg_vkfmu_status_send_buf(mavlink_message_t *msgbuf,
     _mav_put_uint16_t(buf, 12, ups_volt);
     _mav_put_uint16_t(buf, 14, adc_volt);
     _mav_put_uint8_t(buf, 16, rtl_reason);
-    _mav_put_uint8_t(buf, 17, s_flag2);
+    _mav_put_uint8_t(buf, 17, loiter_reason);
     _mav_put_uint8_t(buf, 18, s_flag3);
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VKFMU_STATUS, buf, MAVLINK_MSG_ID_VKFMU_STATUS_MIN_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_CRC);
@@ -338,7 +338,7 @@ static inline void mavlink_msg_vkfmu_status_send_buf(mavlink_message_t *msgbuf,
     packet->ups_volt = ups_volt;
     packet->adc_volt = adc_volt;
     packet->rtl_reason = rtl_reason;
-    packet->s_flag2 = s_flag2;
+    packet->loiter_reason = loiter_reason;
     packet->s_flag3 = s_flag3;
 
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VKFMU_STATUS, (const char *)packet, MAVLINK_MSG_ID_VKFMU_STATUS_MIN_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_LEN, MAVLINK_MSG_ID_VKFMU_STATUS_CRC);
@@ -372,11 +372,11 @@ static inline uint8_t mavlink_msg_vkfmu_status_get_rtl_reason(const mavlink_mess
 }
 
 /**
- * @brief Get field s_flag2 from vkfmu_status message
+ * @brief Get field loiter_reason from vkfmu_status message
  *
- * @return  fmu sflag2
+ * @return  Loiter reason 
  */
-static inline uint8_t mavlink_msg_vkfmu_status_get_s_flag2(const mavlink_message_t* msg)
+static inline uint8_t mavlink_msg_vkfmu_status_get_loiter_reason(const mavlink_message_t* msg)
 {
     return _MAV_RETURN_uint8_t(msg,  17);
 }
@@ -446,7 +446,7 @@ static inline void mavlink_msg_vkfmu_status_decode(const mavlink_message_t* msg,
     vkfmu_status->ups_volt = mavlink_msg_vkfmu_status_get_ups_volt(msg);
     vkfmu_status->adc_volt = mavlink_msg_vkfmu_status_get_adc_volt(msg);
     vkfmu_status->rtl_reason = mavlink_msg_vkfmu_status_get_rtl_reason(msg);
-    vkfmu_status->s_flag2 = mavlink_msg_vkfmu_status_get_s_flag2(msg);
+    vkfmu_status->loiter_reason = mavlink_msg_vkfmu_status_get_loiter_reason(msg);
     vkfmu_status->s_flag3 = mavlink_msg_vkfmu_status_get_s_flag3(msg);
 #else
         uint8_t len = msg->len < MAVLINK_MSG_ID_VKFMU_STATUS_LEN? msg->len : MAVLINK_MSG_ID_VKFMU_STATUS_LEN;

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

@@ -123,7 +123,7 @@ static void mavlink_test_vkfmu_status(uint8_t system_id, uint8_t component_id, m
         packet1.ups_volt = packet_in.ups_volt;
         packet1.adc_volt = packet_in.adc_volt;
         packet1.rtl_reason = packet_in.rtl_reason;
-        packet1.s_flag2 = packet_in.s_flag2;
+        packet1.loiter_reason = packet_in.loiter_reason;
         packet1.s_flag3 = packet_in.s_flag3;
         
         
@@ -139,12 +139,12 @@ static void mavlink_test_vkfmu_status(uint8_t system_id, uint8_t component_id, m
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_vkfmu_status_pack(system_id, component_id, &msg , packet1.time_boot_ms , packet1.rtl_reason , packet1.s_flag2 , packet1.s_flag3 , packet1.ups_volt , packet1.adc_volt , packet1.flight_time , packet1.dist_to_tar );
+    mavlink_msg_vkfmu_status_pack(system_id, component_id, &msg , packet1.time_boot_ms , packet1.rtl_reason , packet1.loiter_reason , packet1.s_flag3 , packet1.ups_volt , packet1.adc_volt , packet1.flight_time , packet1.dist_to_tar );
     mavlink_msg_vkfmu_status_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_vkfmu_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time_boot_ms , packet1.rtl_reason , packet1.s_flag2 , packet1.s_flag3 , packet1.ups_volt , packet1.adc_volt , packet1.flight_time , packet1.dist_to_tar );
+    mavlink_msg_vkfmu_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.time_boot_ms , packet1.rtl_reason , packet1.loiter_reason , packet1.s_flag3 , packet1.ups_volt , packet1.adc_volt , packet1.flight_time , packet1.dist_to_tar );
     mavlink_msg_vkfmu_status_decode(&msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 
@@ -157,7 +157,7 @@ static void mavlink_test_vkfmu_status(uint8_t system_id, uint8_t component_id, m
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
         
         memset(&packet2, 0, sizeof(packet2));
-    mavlink_msg_vkfmu_status_send(MAVLINK_COMM_1 , packet1.time_boot_ms , packet1.rtl_reason , packet1.s_flag2 , packet1.s_flag3 , packet1.ups_volt , packet1.adc_volt , packet1.flight_time , packet1.dist_to_tar );
+    mavlink_msg_vkfmu_status_send(MAVLINK_COMM_1 , packet1.time_boot_ms , packet1.rtl_reason , packet1.loiter_reason , packet1.s_flag3 , packet1.ups_volt , packet1.adc_volt , packet1.flight_time , packet1.dist_to_tar );
     mavlink_msg_vkfmu_status_decode(last_msg, &packet2);
         MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
 

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

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Jul 31 2024"
+#define MAVLINK_BUILD_DATE "Tue Sep 03 2024"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

+ 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 7176770833453663646
+#define MAVLINK_COMMON_XML_HASH 2119984325654329320
 
 #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 7176770833453663646
+#define MAVLINK_PRIMARY_XML_HASH 2119984325654329320
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

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

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Jul 31 2024"
+#define MAVLINK_BUILD_DATE "Tue Sep 03 2024"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

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

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH -7264840984064512659
+#define MAVLINK_PRIMARY_XML_HASH -7192635655080444157
 
 #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 -7264840984064512659
+#define MAVLINK_MINIMAL_XML_HASH -7192635655080444157
 
 #ifdef __cplusplus
 extern "C" {

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

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Jul 31 2024"
+#define MAVLINK_BUILD_DATE "Tue Sep 03 2024"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22
  

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

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH -2446954289536133969
+#define MAVLINK_PRIMARY_XML_HASH 928119734354877572
 
 #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 -2446954289536133969
+#define MAVLINK_STANDARD_XML_HASH 928119734354877572
 
 #ifdef __cplusplus
 extern "C" {

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

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Wed Jul 31 2024"
+#define MAVLINK_BUILD_DATE "Tue Sep 03 2024"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22
  

Some files were not shown because too many files changed in this diff