Skip to content

Commit 40d8b4b

Browse files
committed
Update mavlink
Currently the PARAM_EXT param_value field is broken due to a recent pymavlink change. Until that's fixed, we have to carry another patch.
1 parent d827ca8 commit 40d8b4b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/mavsdk/plugins/camera_server/camera_server_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2151,7 +2151,7 @@ void CameraServerImpl::send_tracking_status_with_interval(uint32_t interval_us)
21512151
&message,
21522152
CAMERA_TRACKING_STATUS_FLAGS_IDLE,
21532153
CAMERA_TRACKING_MODE_NONE,
2154-
CAMERA_TRACKING_TARGET_DATA_NONE,
2154+
0, // used to be CAMERA_TRACKING_TARGET_DATA_NONE
21552155
0.0f,
21562156
0.0f,
21572157
0.0f,

third_party/mavlink/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ list(APPEND CMAKE_ARGS
99
"-DMAVLINK_DIALECT=${MAVLINK_DIALECT}"
1010
)
1111

12-
set(MAVLINK_GIT_HASH 5e3a42b8f3f53038f2779f9f69bd64767b913bb8)
12+
set(MAVLINK_GIT_HASH 3ca42d6cdab73122d9c677f88e64882ef2b0dde8)
1313

1414
if(IOS)
1515
ExternalProject_add(

third_party/mavlink/mavlink.patch

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ index 8aadc9af..0bb61919 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -2,6 +2,20 @@ cmake_minimum_required(VERSION 3.13)
6-
6+
77
project(mavlink)
8-
8+
99
+if (POLICY CMP0094)
1010
+ cmake_policy(SET CMP0094 NEW) # FindPython should return the first matching Python
1111
+endif ()
@@ -21,5 +21,6 @@ index 8aadc9af..0bb61919 100644
2121
+endif()
2222
+
2323
find_package(Python COMPONENTS Interpreter REQUIRED)
24-
24+
2525
# We automatically install the pip dependencies locally below.
26+

0 commit comments

Comments
 (0)