Browse Source

增加航线完成后动作相关设置

Liu Yang 1 year ago
parent
commit
f2eebe4821

+ 3 - 0
msg_definitions/VKFly.xml

@@ -355,6 +355,9 @@
       <entry value="12" name="VKFLY_RTL_REASON_SERVO_FAULT">
         <description>Trigger rtl mode by servo fault.</description>
       </entry>
+      <entry value="13" name="VKFLY_RTL_REASON_WP_FINISH">
+        <description>Trigger rtl mode by servo fault.</description>
+      </entry>
     </enum>
 
     <enum name="VKFLY_DIGICAM_WP_ACT">

+ 3 - 1
readme.md

@@ -775,7 +775,8 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
     VKFLY_RTL_REASON_BMS_LOWCAP=10, /* 电池BMS电量低保护返航 | */
     VKFLY_RTL_REASON_BMS_LINKLOST=11, /* 电池BMS通信失联保护返航 | */
     VKFLY_RTL_REASON_SERVO_FAULT=12, /* 伺服动力故障保护返航 | */
-    VKFLY_RTL_REASON_ENUM_END=13, /*  | */
+    VKFLY_RTL_REASON_WP_FINISH = 13, /* 航线完成返航 */
+    VKFLY_RTL_REASON_ENUM_END=14, /*  | */
   } VKFLY_RTL_REASON;
   ```
 
@@ -1025,6 +1026,7 @@ 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                                                                              |

+ 3 - 2
v2.0/VKFly/VKFly.h

@@ -10,7 +10,7 @@
     #error Wrong include order: MAVLINK_VKFLY.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_VKFLY_XML_HASH 1575324864285451450
+#define MAVLINK_VKFLY_XML_HASH 9052510758403855634
 
 #ifdef __cplusplus
 extern "C" {
@@ -245,7 +245,8 @@ typedef enum VKFLY_RTL_REASON
    VKFLY_RTL_REASON_BMS_LOWCAP=10, /* Trigger rtl mode by battery manager system low capacity. | */
    VKFLY_RTL_REASON_BMS_LINKLOST=11, /* Trigger rtl mode by battery manager link lost. | */
    VKFLY_RTL_REASON_SERVO_FAULT=12, /* Trigger rtl mode by servo fault. | */
-   VKFLY_RTL_REASON_ENUM_END=13, /*  | */
+   VKFLY_RTL_REASON_WP_FINISH=13, /* Trigger rtl mode by servo fault. | */
+   VKFLY_RTL_REASON_ENUM_END=14, /*  | */
 } VKFLY_RTL_REASON;
 #endif
 

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

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH 1575324864285451450
+#define MAVLINK_PRIMARY_XML_HASH 9052510758403855634
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

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

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Tue Jul 09 2024"
+#define MAVLINK_BUILD_DATE "Wed Jul 31 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 -844533605793930728
+#define MAVLINK_COMMON_XML_HASH 7176770833453663646
 
 #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 -844533605793930728
+#define MAVLINK_PRIMARY_XML_HASH 7176770833453663646
 
 #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 "Tue Jul 09 2024"
+#define MAVLINK_BUILD_DATE "Wed Jul 31 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 7411362621488745973
+#define MAVLINK_PRIMARY_XML_HASH -7264840984064512659
 
 #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 7411362621488745973
+#define MAVLINK_MINIMAL_XML_HASH -7264840984064512659
 
 #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 "Tue Jul 09 2024"
+#define MAVLINK_BUILD_DATE "Wed Jul 31 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 -6308459064296323263
+#define MAVLINK_PRIMARY_XML_HASH -2446954289536133969
 
 #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 -6308459064296323263
+#define MAVLINK_STANDARD_XML_HASH -2446954289536133969
 
 #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 "Tue Jul 09 2024"
+#define MAVLINK_BUILD_DATE "Wed Jul 31 2024"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22