增加 6H12 机型定义

msg_definitions/VKFly.xml

@@ -55,6 +55,9 @@
       <entry value="122" name="VKFLY_AP_TYPE_6X12">
         <description>Six axis twelve rotor, upper level X6, lower lever opposite with X6.</description>
       </entry>
+      <entry value="123" name="VKFLY_AP_TYPE_6H12">
+        <description>Six axis twelve rotor, upper level H6, lower lever opposite with H6.</description>
+      </entry>
       <entry value="161" name="VKFLY_AP_TYPE_8I16">
         <description>16 axis 8 rotor, upper level I8, lower lever opposite with I8</description>
       </entry>

readme.md

@@ -30,6 +30,7 @@ typedef enum VKFLY_AP_TYPE
     VKFLY_AP_TYPE_4X8DR=86, /* 4轴8桨*/
     VKFLY_AP_TYPE_6I12=121, /* 6轴12桨, 十字布局 */
     VKFLY_AP_TYPE_6X12=122, /* 6轴12桨, X字布局 */
+    VKFLY_AP_TYPE_6X12=123, /* 6轴12桨, H字布局 */
     VKFLY_AP_TYPE_8I16=161, /* 8轴16桨, 十字布局 */
     VKFLY_AP_TYPE_8X16=162, /* 8轴16桨, X字布局 */
     VKFLY_AP_TYPE_ENUM_END=163, /*  | */
@@ -476,7 +477,7 @@ GPS_INPUT 为普通 GPS 无融合原始定位数据. 当普通 GPS 数据接入
 
 | 字段               | 说明                   |
 | ------------------ | ---------------------- |
-| time_usec          | 数据时间戳 us              |
+| time_usec          | 数据时间戳 us          |
 | time_week_ms       | GPS 时间周内毫秒       |
 | lat                | wgs84 纬度 degE7       |
 | lon                | wgs84 纬度 degE7       |
@@ -495,7 +496,7 @@ GPS2_RAW 为 RTK 无融合的原始数据, 当 RTK 板卡定位数据接入后
 
 | 字段               | 说明                                                                    |
 | ------------------ | ----------------------------------------------------------------------- |
-| time_usec          | 数据时间戳 us                                                               |
+| time_usec          | 数据时间戳 us                                                           |
 | fix_type           | 参考 GPS_FIX_TYPE                                                       |
 | lat                | wgs84 纬度 degE7                                                        |
 | lon                | wgs84 纬度 degE7                                                        |

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 335003221625903156
+#define MAVLINK_VKFLY_XML_HASH -20221784796664669
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,6 +53,7 @@ typedef enum VKFLY_AP_TYPE
    VKFLY_AP_TYPE_4X8DR=86, /* Four axis octorotor, all rotors are opposite of 4X8M. | */
    VKFLY_AP_TYPE_6I12=121, /* Six axis twelve rotor, upper level I6, lower lever opposite with I6. | */
    VKFLY_AP_TYPE_6X12=122, /* Six axis twelve rotor, upper level X6, lower lever opposite with X6. | */
+   VKFLY_AP_TYPE_6H12=123, /* Six axis twelve rotor, upper level H6, lower lever opposite with H6. | */
    VKFLY_AP_TYPE_8I16=161, /* 16 axis 8 rotor, upper level I8, lower lever opposite with I8 | */
    VKFLY_AP_TYPE_8X16=162, /* 16 axis 8 rotor, upper level X8, lower lever opposite with X8 | */
    VKFLY_AP_TYPE_ENUM_END=163, /*  | */

v2.0/VKFly/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH 335003221625903156
+#define MAVLINK_PRIMARY_XML_HASH -20221784796664669
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

v2.0/VKFly/mavlink_msg_vk_mosaich_gps_raw.h

@@ -25,7 +25,7 @@ typedef struct __mavlink_vk_mosaich_gps_raw_t {
  uint8_t hsv_num; /*<  Number of satellites for heading ANT*/
  uint8_t att_err; /*<  refer to mosaic_h reference page 336.*/
  uint8_t att_mode; /*<  refer to mosaic_h reference page 336.*/
- uint8_t reserved; /*<  Number of satellites*/
+ uint8_t reserved; /*<  reserved*/
 } mavlink_vk_mosaich_gps_raw_t;
 
 #define MAVLINK_MSG_ID_VK_MOSAICH_GPS_RAW_LEN 52
@@ -117,7 +117,7 @@ typedef struct __mavlink_vk_mosaich_gps_raw_t {
  * @param hsv_num  Number of satellites for heading ANT
  * @param att_err  refer to mosaic_h reference page 336.
  * @param att_mode  refer to mosaic_h reference page 336.
- * @param reserved  Number of satellites
+ * @param reserved  reserved
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vk_mosaich_gps_raw_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
@@ -202,7 +202,7 @@ static inline uint16_t mavlink_msg_vk_mosaich_gps_raw_pack(uint8_t system_id, ui
  * @param hsv_num  Number of satellites for heading ANT
  * @param att_err  refer to mosaic_h reference page 336.
  * @param att_mode  refer to mosaic_h reference page 336.
- * @param reserved  Number of satellites
+ * @param reserved  reserved
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vk_mosaich_gps_raw_pack_status(uint8_t system_id, uint8_t component_id, mavlink_status_t *_status, mavlink_message_t* msg,
@@ -290,7 +290,7 @@ static inline uint16_t mavlink_msg_vk_mosaich_gps_raw_pack_status(uint8_t system
  * @param hsv_num  Number of satellites for heading ANT
  * @param att_err  refer to mosaic_h reference page 336.
  * @param att_mode  refer to mosaic_h reference page 336.
- * @param reserved  Number of satellites
+ * @param reserved  reserved
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_vk_mosaich_gps_raw_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
@@ -414,7 +414,7 @@ static inline uint16_t mavlink_msg_vk_mosaich_gps_raw_encode_status(uint8_t syst
  * @param hsv_num  Number of satellites for heading ANT
  * @param att_err  refer to mosaic_h reference page 336.
  * @param att_mode  refer to mosaic_h reference page 336.
- * @param reserved  Number of satellites
+ * @param reserved  reserved
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
@@ -733,7 +733,7 @@ static inline uint8_t mavlink_msg_vk_mosaich_gps_raw_get_att_mode(const mavlink_
 /**
  * @brief Get field reserved from vk_mosaich_gps_raw message
  *
- * @return  Number of satellites
+ * @return  reserved
  */
 static inline uint8_t mavlink_msg_vk_mosaich_gps_raw_get_reserved(const mavlink_message_t* msg)
 {

v2.0/VKFly/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Dec 27 2024"
+#define MAVLINK_BUILD_DATE "Wed Jan 15 2025"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

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 1099190160566404075
+#define MAVLINK_COMMON_XML_HASH 1329280358369995956
 
 #ifdef __cplusplus
 extern "C" {

v2.0/common/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH 1099190160566404075
+#define MAVLINK_PRIMARY_XML_HASH 1329280358369995956
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

v2.0/common/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Dec 27 2024"
+#define MAVLINK_BUILD_DATE "Wed Jan 15 2025"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

v2.0/minimal/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH 4703520707704354553
+#define MAVLINK_PRIMARY_XML_HASH -8194162153814049090
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

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 4703520707704354553
+#define MAVLINK_MINIMAL_XML_HASH -8194162153814049090
 
 #ifdef __cplusplus
 extern "C" {

v2.0/minimal/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Dec 27 2024"
+#define MAVLINK_BUILD_DATE "Wed Jan 15 2025"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22
  

v2.0/standard/mavlink.h

@@ -6,7 +6,7 @@
 #ifndef MAVLINK_H
 #define MAVLINK_H
 
-#define MAVLINK_PRIMARY_XML_HASH -8313023641701644022
+#define MAVLINK_PRIMARY_XML_HASH 5877102512431502813
 
 #ifndef MAVLINK_STX
 #define MAVLINK_STX 253

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 -8313023641701644022
+#define MAVLINK_STANDARD_XML_HASH 5877102512431502813
 
 #ifdef __cplusplus
 extern "C" {

v2.0/standard/version.h

@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Fri Dec 27 2024"
+#define MAVLINK_BUILD_DATE "Wed Jan 15 2025"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 22