Browse Source

增加报警描述

Liu Yang 10 months ago
parent
commit
2a685702ce

+ 2 - 15
msg_definitions/VKFly.xml

@@ -192,21 +192,8 @@
       <entry value="128" name="VKFLY_SYS_ERROR1_OBV_LINK_LOST">
         <description>Obv mavlink com link lost.</description>
       </entry>
-    </enum>
-
-    <enum name="VKFLY_SYS_ERROR2" bitmask="true">
-      <description>bitmap for SYS_STATUS error1 </description>
-      <entry value="1" name="VKFLY_SYS_ERROR2_PREARM_CHECK_IMU">
-        <description></description>
-      </entry>
-      <entry value="2" name="VKFLY_SYS_ERROR2_PREARM_CHECK_TILT">
-        <description></description>
-      </entry>
-      <entry value="4" name="VKFLY_SYS_ERROR2_PREARM_CHECK_VELOCITY">
-        <description></description>
-      </entry>
-      <entry value="8" name="VKFLY_SYS_ERROR2_PREARM_RC_BAD">
-        <description></description>
+      <entry value="256" name="VKFLY_SYS_ERROR1_BATBMS_LINK_LOST">
+        <description>Battery bms link lost.</description>
       </entry>
     </enum>
 

+ 4 - 6
readme.md

@@ -755,7 +755,9 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
     VKFLY_SYS_ERROR1_OVERHEAT=16, /* 飞控温度高 | */
     VKFLY_SYS_ERROR1_INS_INVALID=32, /* 飞控无INS解算定位 | */
     VKFLY_SYS_ERROR1_OUT_FENCE=64, /* 超出电子围栏范围 | */
-    VKFLY_SYS_ERROR1_ENUM_END=65, /*  | */
+    VKFLY_SYS_ERROR1_OBV_LINK_LOST=128, /* 备用链路失联 | */
+    VKFLY_SYS_ERROR1_BATBMS_LINK_LOST=256, /* 智能电池bms数据失联 | */ 
+    VKFLY_SYS_ERROR1_ENUM_END=257, /*  | */
   } VKFLY_SYS_ERROR1;
   ```
 
@@ -765,11 +767,7 @@ mavlink common 标准消息集中主要由 MAVLINK_MSG_ID_COMMAND_INT 和 MAVLIN
   ```c
   typedef enum VKFLY_SYS_ERROR2
   {
-    VKFLY_SYS_ERROR2_PREARM_CHECK_IMU=1, /* 起飞前检查, imu数据超范围| */
-    VKFLY_SYS_ERROR2_PREARM_CHECK_TILT=2, /*  起飞前检查, 倾斜姿态过大| */
-    VKFLY_SYS_ERROR2_PREARM_CHECK_VELOCITY=4, /*  起飞前检查, 速度超范围| */
-    VKFLY_SYS_ERROR2_PREARM_RC_BAD=8, /*  起飞前检查, 遥控器数据未就绪| */
-    VKFLY_SYS_ERROR2_ENUM_END=9, /*  | */
+    VKFLY_SYS_ERROR2_ENUM_END=1, /*  | */
   } VKFLY_SYS_ERROR2;
   ```
 

+ 3 - 15
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 3626662836185239078
+#define MAVLINK_VKFLY_XML_HASH 393070732020167691
 
 #ifdef __cplusplus
 extern "C" {
@@ -173,23 +173,11 @@ typedef enum VKFLY_SYS_ERROR1
    VKFLY_SYS_ERROR1_INS_INVALID=32, /* Autopilot system solved positioning not ready. | */
    VKFLY_SYS_ERROR1_OUT_FENCE=64, /* Position out of fence range. | */
    VKFLY_SYS_ERROR1_OBV_LINK_LOST=128, /* Obv mavlink com link lost. | */
-   VKFLY_SYS_ERROR1_ENUM_END=129, /*  | */
+   VKFLY_SYS_ERROR1_BATBMS_LINK_LOST=256, /* Battery bms link lost. | */
+   VKFLY_SYS_ERROR1_ENUM_END=257, /*  | */
 } VKFLY_SYS_ERROR1;
 #endif
 
-/** @brief bitmap for SYS_STATUS error1  */
-#ifndef HAVE_ENUM_VKFLY_SYS_ERROR2
-#define HAVE_ENUM_VKFLY_SYS_ERROR2
-typedef enum VKFLY_SYS_ERROR2
-{
-   VKFLY_SYS_ERROR2_PREARM_CHECK_IMU=1, /*  | */
-   VKFLY_SYS_ERROR2_PREARM_CHECK_TILT=2, /*  | */
-   VKFLY_SYS_ERROR2_PREARM_CHECK_VELOCITY=4, /*  | */
-   VKFLY_SYS_ERROR2_PREARM_RC_BAD=8, /*  | */
-   VKFLY_SYS_ERROR2_ENUM_END=9, /*  | */
-} VKFLY_SYS_ERROR2;
-#endif
-
 /** @brief bitmap for SYS_STATUS error3  */
 #ifndef HAVE_ENUM_VKFLY_SYS_ERROR3
 #define HAVE_ENUM_VKFLY_SYS_ERROR3

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

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH 3626662836185239078
+#define MAVLINK_PRIMARY_XML_HASH 393070732020167691
 
 #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 "Wed Sep 11 2024"
+#define MAVLINK_BUILD_DATE "Thu Sep 12 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 4784416552898012285
+#define MAVLINK_COMMON_XML_HASH -8897249440042139974
 
 #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 4784416552898012285
+#define MAVLINK_PRIMARY_XML_HASH -8897249440042139974
 
 #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 Sep 11 2024"
+#define MAVLINK_BUILD_DATE "Thu Sep 12 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 3920116293259174708
+#define MAVLINK_PRIMARY_XML_HASH 779815398872826732
 
 #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 3920116293259174708
+#define MAVLINK_MINIMAL_XML_HASH 779815398872826732
 
 #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 Sep 11 2024"
+#define MAVLINK_BUILD_DATE "Thu Sep 12 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 8556824078215993087
+#define MAVLINK_PRIMARY_XML_HASH 5911312776810998706
 
 #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 8556824078215993087
+#define MAVLINK_STANDARD_XML_HASH 5911312776810998706
 
 #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 Sep 11 2024"
+#define MAVLINK_BUILD_DATE "Thu Sep 12 2024"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22