From f520d4b3be2e0250624814e2df35818fce180876 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 7 Jan 2023 10:55:05 -0500 Subject: [PATCH] Update submodule mavlink to latest Sat Jan 7 12:38:21 UTC 2023 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - mavlink in PX4/Firmware (8bc88ed526044a864427a4b65135c3baffabb2ef): https://github.com/mavlink/mavlink/commit/0c7792edfeee7cf08e531cb4ce5b4f01854e5724 - mavlink current upstream: https://github.com/mavlink/mavlink/commit/74dee05f0cd121ae27e021d011a04b161c9d0440 - Changes: https://github.com/mavlink/mavlink/compare/0c7792edfeee7cf08e531cb4ce5b4f01854e5724...74dee05f0cd121ae27e021d011a04b161c9d0440 74dee05f 2023-01-04 Beat Küng - component_metadata: add translation schema (#1934) 0267c4cf 2023-01-04 Bob Long - common.xml: add fuel_pressure ext. to EFI_STATUS (#1938) c64818e8 2023-01-04 Mathieu Mirmont - common.xml: fix typos in AIS_TYPE enumerate (#1939) 2306bf79 2023-01-04 Hamish Willee - Update pymavlink (#1940) 0077129b 2022-10-06 Peter Hall - Development: update airspeed message fbf84c64 2022-10-05 Peter Hall - gitignore: add /.vscode 817c44d8 2022-12-15 Mathieu Mirmont - Add the MAV_TYPE_VTOL_TILTWING aircraft type (#1933) Co-authored-by: PX4 BuildBot --- src/modules/mavlink/mavlink | 2 +- src/modules/mavlink/mavlink_receiver.cpp | 2 +- src/modules/mavlink/streams/OPEN_DRONE_ID_BASIC_ID.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/mavlink/mavlink b/src/modules/mavlink/mavlink index 0c7792edfe..74dee05f0c 160000 --- a/src/modules/mavlink/mavlink +++ b/src/modules/mavlink/mavlink @@ -1 +1 @@ -Subproject commit 0c7792edfeee7cf08e531cb4ce5b4f01854e5724 +Subproject commit 74dee05f0cd121ae27e021d011a04b161c9d0440 diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index f42b0a6e1e..047d84b49f 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -1574,7 +1574,7 @@ void MavlinkReceiver::fill_thrust(float *thrust_body_array, uint8_t vehicle_type case MAV_TYPE_VTOL_TILTROTOR: case MAV_TYPE_VTOL_FIXEDROTOR: case MAV_TYPE_VTOL_TAILSITTER: - case MAV_TYPE_VTOL_RESERVED4: + case MAV_TYPE_VTOL_TILTWING: case MAV_TYPE_VTOL_RESERVED5: switch (vehicle_type) { case vehicle_status_s::VEHICLE_TYPE_FIXED_WING: diff --git a/src/modules/mavlink/streams/OPEN_DRONE_ID_BASIC_ID.hpp b/src/modules/mavlink/streams/OPEN_DRONE_ID_BASIC_ID.hpp index cfa3444a90..d7869dcbb6 100644 --- a/src/modules/mavlink/streams/OPEN_DRONE_ID_BASIC_ID.hpp +++ b/src/modules/mavlink/streams/OPEN_DRONE_ID_BASIC_ID.hpp @@ -108,7 +108,7 @@ private: case MAV_TYPE_VTOL_TAILSITTER: return MAV_ODID_UA_TYPE_HYBRID_LIFT; - case MAV_TYPE_VTOL_RESERVED4: return MAV_ODID_UA_TYPE_HYBRID_LIFT; + case MAV_TYPE_VTOL_TILTWING: return MAV_ODID_UA_TYPE_HYBRID_LIFT; case MAV_TYPE_VTOL_RESERVED5: return MAV_ODID_UA_TYPE_HYBRID_LIFT;