fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 21:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mavlink autopilot_version: add vendor version

Browse Source
This commit is contained in:
Beat Küng
2019-03-28 08:47:32 +01:00
parent be8ad46fc9
commit fe0c2d1352
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+5 -1
View File
@@ -1227,8 +1227,12 @@ Mavlink::send_autopilot_capabilites()
msg.middleware_sw_version = px4_firmware_version(); msg.middleware_sw_version = px4_firmware_version();
msg.os_sw_version = px4_os_version(); msg.os_sw_version = px4_os_version();
msg.board_version = px4_board_version(); msg.board_version = px4_board_version();
uint64_t fw_git_version_binary = px4_firmware_version_binary(); /* use only first 5 bytes of git hash for firmware version */
const uint64_t fw_git_version_binary = px4_firmware_version_binary() & 0xFFFFFFFFFF000000;
const uint64_t fw_vendor_version = px4_firmware_vendor_version() >> 8;
constexpr size_t fw_vendor_version_length = 3;
memcpy(&msg.flight_custom_version, &fw_git_version_binary, sizeof(msg.flight_custom_version)); memcpy(&msg.flight_custom_version, &fw_git_version_binary, sizeof(msg.flight_custom_version));
memcpy(&msg.flight_custom_version, &fw_vendor_version, fw_vendor_version_length);
memcpy(&msg.middleware_custom_version, &fw_git_version_binary, sizeof(msg.middleware_custom_version)); memcpy(&msg.middleware_custom_version, &fw_git_version_binary, sizeof(msg.middleware_custom_version));
uint64_t os_git_version_binary = px4_os_version_binary(); uint64_t os_git_version_binary = px4_os_version_binary();
memcpy(&msg.os_custom_version, &os_git_version_binary, sizeof(msg.os_custom_version)); memcpy(&msg.os_custom_version, &os_git_version_binary, sizeof(msg.os_custom_version));