瀏覽代碼

增加一些VTOL相关飞行模式

Liu Yang 6 月之前
父節點
當前提交
157f623917

+ 30 - 0
msg_definitions/VKFly.xml

@@ -249,6 +249,9 @@
 
     <enum name="VKFLY_CUSTOM_MODE">
       <description>custom mode in HEARTBEAT</description>
+      <entry value="1" name="VKFLY_CUSTOM_MODE_STANDBY">
+        <description>Standby mode</description>
+      </entry>
       <entry value="3" name="VKFLY_CUSTOM_MODE_ATTITUDE">
         <description>Attitude mode</description>
       </entry>
@@ -300,6 +303,33 @@
       <entry value="28" name="VKFLY_CUSTOM_MODE_FORMATION">
         <description>Formation fly mode</description>
       </entry>
+      <entry value="51" name="VKFLY_CUSTOM_MODE_FW_MANUL">
+        <description>Fixedwing manul mode</description>
+      </entry>
+      <entry value="52" name="VKFLY_CUSTOM_MODE_FW_ATTITUDE">
+        <description>Fixedwing attitude mode</description>
+      </entry>
+      <entry value="53" name="VKFLY_CUSTOM_MODE_FW_CRUISE">
+        <description>Fixedwing cruise mode</description>
+      </entry>
+      <entry value="54" name="VKFLY_CUSTOM_MODE_FW_CIRCLE">
+        <description>Fixedwing circle mode</description>
+      </entry>
+      <entry value="55" name="VKFLY_CUSTOM_MODE_FW_TAKEOFF">
+        <description>Fixedwing circle mode</description>
+      </entry>
+      <entry value="56" name="VKFLY_CUSTOM_MODE_FW_GUIDE">
+        <description>Fixedwing guide mode</description>
+      </entry>
+      <entry value="57" name="VKFLY_CUSTOM_MODE_FW_LAND">
+        <description>Fixedwing land mode</description>
+      </entry>
+      <entry value="58" name="VKFLY_CUSTOM_MODE_FW_RTL">
+        <description>Fixedwing return to launch mode</description>
+      </entry>
+      <entry value="59" name="VKFLY_CUSTOM_MODE_FW_GPS_FS">
+        <description>Fixedwing GPS fail safe mode</description>
+      </entry>
     </enum>
 
     <enum name="VKFLY_VKINS_NAV_STATUS" bitmask="true">

+ 12 - 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 215163825287409684
+#define MAVLINK_VKFLY_XML_HASH -2184010990295071235
 
 #ifdef __cplusplus
 extern "C" {
@@ -214,6 +214,7 @@ typedef enum VKFLY_SYS_ERROR3
 #define HAVE_ENUM_VKFLY_CUSTOM_MODE
 typedef enum VKFLY_CUSTOM_MODE
 {
+   VKFLY_CUSTOM_MODE_STANDBY=1, /* Standby mode | */
    VKFLY_CUSTOM_MODE_ATTITUDE=3, /* Attitude mode | */
    VKFLY_CUSTOM_MODE_POSHOLD=4, /* Poshold mode | */
    VKFLY_CUSTOM_MODE_TAKEOFF=10, /* Auto takeoff. | */
@@ -231,7 +232,16 @@ typedef enum VKFLY_CUSTOM_MODE
    VKFLY_CUSTOM_MODE_OBAVOID=26, /* Obavoid  | */
    VKFLY_CUSTOM_MODE_OFFBOARD=27, /* Offboard command control. | */
    VKFLY_CUSTOM_MODE_FORMATION=28, /* Formation fly mode | */
-   VKFLY_CUSTOM_MODE_ENUM_END=29, /*  | */
+   VKFLY_CUSTOM_MODE_FW_MANUL=51, /* Fixedwing manul mode | */
+   VKFLY_CUSTOM_MODE_FW_ATTITUDE=52, /* Fixedwing attitude mode | */
+   VKFLY_CUSTOM_MODE_FW_CRUISE=53, /* Fixedwing cruise mode | */
+   VKFLY_CUSTOM_MODE_FW_CIRCLE=54, /* Fixedwing circle mode | */
+   VKFLY_CUSTOM_MODE_FW_TAKEOFF=55, /* Fixedwing circle mode | */
+   VKFLY_CUSTOM_MODE_FW_GUIDE=56, /* Fixedwing guide mode | */
+   VKFLY_CUSTOM_MODE_FW_LAND=57, /* Fixedwing land mode | */
+   VKFLY_CUSTOM_MODE_FW_RTL=58, /* Fixedwing return to launch mode | */
+   VKFLY_CUSTOM_MODE_FW_GPS_FS=59, /* Fixedwing GPS fail safe mode | */
+   VKFLY_CUSTOM_MODE_ENUM_END=60, /*  | */
 } VKFLY_CUSTOM_MODE;
 #endif
 

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

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH 215163825287409684
+#define MAVLINK_PRIMARY_XML_HASH -2184010990295071235
 
 #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 "Thu Jan 16 2025"
+#define MAVLINK_BUILD_DATE "Wed Jan 22 2025"
 #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 -6681941826931752784
+#define MAVLINK_COMMON_XML_HASH -6028667296654801570
 
 #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 -6681941826931752784
+#define MAVLINK_PRIMARY_XML_HASH -6028667296654801570
 
 #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 "Thu Jan 16 2025"
+#define MAVLINK_BUILD_DATE "Wed Jan 22 2025"
 #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 5124769176504212225
+#define MAVLINK_PRIMARY_XML_HASH 4602679135816657918
 
 #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 5124769176504212225
+#define MAVLINK_MINIMAL_XML_HASH 4602679135816657918
 
 #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 "Thu Jan 16 2025"
+#define MAVLINK_BUILD_DATE "Wed Jan 22 2025"
 #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 -362910411080345871
+#define MAVLINK_PRIMARY_XML_HASH -4490838721348404161
 
 #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 -362910411080345871
+#define MAVLINK_STANDARD_XML_HASH -4490838721348404161
 
 #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 "Thu Jan 16 2025"
+#define MAVLINK_BUILD_DATE "Wed Jan 22 2025"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22