Browse Source

GCS_MAVLink: take sw_version from AP_FWVersion struct

master
Peter Barker 7 years ago committed by Andrew Tridgell
parent
commit
c39a622653
  1. 3
      libraries/GCS_MAVLink/GCS_Common.cpp
  2. 6
      libraries/GCS_MAVLink/GCS_Dummy.h

3
libraries/GCS_MAVLink/GCS_Common.cpp

@ -2394,7 +2394,6 @@ void GCS_MAVLINK::send_autopilot_version() const
{ {
uint32_t flight_sw_version; uint32_t flight_sw_version;
uint32_t middleware_sw_version = 0; uint32_t middleware_sw_version = 0;
uint32_t os_sw_version = 0;
uint32_t board_version = 0; uint32_t board_version = 0;
char flight_custom_version[MAVLINK_MSG_AUTOPILOT_VERSION_FIELD_FLIGHT_CUSTOM_VERSION_LEN]{}; char flight_custom_version[MAVLINK_MSG_AUTOPILOT_VERSION_FIELD_FLIGHT_CUSTOM_VERSION_LEN]{};
char middleware_custom_version[MAVLINK_MSG_AUTOPILOT_VERSION_FIELD_MIDDLEWARE_CUSTOM_VERSION_LEN]{}; char middleware_custom_version[MAVLINK_MSG_AUTOPILOT_VERSION_FIELD_MIDDLEWARE_CUSTOM_VERSION_LEN]{};
@ -2430,7 +2429,7 @@ void GCS_MAVLINK::send_autopilot_version() const
capabilities(), capabilities(),
flight_sw_version, flight_sw_version,
middleware_sw_version, middleware_sw_version,
os_sw_version, version.os_sw_version,
board_version, board_version,
(uint8_t *)flight_custom_version, (uint8_t *)flight_custom_version,
(uint8_t *)middleware_custom_version, (uint8_t *)middleware_custom_version,

6
libraries/GCS_MAVLink/GCS_Dummy.h

@ -7,7 +7,11 @@ const AP_FWVersion AP_FWVersion::fwver
minor: 1, minor: 1,
patch: 4, patch: 4,
fw_type: FIRMWARE_VERSION_TYPE_DEV, fw_type: FIRMWARE_VERSION_TYPE_DEV,
fw_string: "Dummy GCS" fw_string: "Dummy GCS",
fw_hash_str: "",
middleware_hash_str: "",
os_hash_str: "",
os_sw_version: 0
}; };
const struct GCS_MAVLINK::stream_entries GCS_MAVLINK::all_stream_entries[] {}; const struct GCS_MAVLINK::stream_entries GCS_MAVLINK::all_stream_entries[] {};

Loading…
Cancel
Save