Skip to content

Commit 1f70fec

Browse files
authored
Merge pull request #408 from mavlink/pr-update-proto-mavsdk-server
Update mavsdk_server and proto submodule
2 parents 8ca8390 + 8130e46 commit 1f70fec

File tree

7 files changed

+510
-63
lines changed

7 files changed

+510
-63
lines changed

MAVSDK_SERVER_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.46.1
1+
v0.50.0

mavsdk/mission.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ class MissionItem:
5353
yaw_deg : float
5454
Absolute yaw angle (in degrees)
5555
56+
camera_photo_distance_m : float
57+
Camera photo distance to use after this mission item (in meters)
58+
5659
"""
5760

5861

@@ -154,7 +157,8 @@ def __init__(
154157
loiter_time_s,
155158
camera_photo_interval_s,
156159
acceptance_radius_m,
157-
yaw_deg):
160+
yaw_deg,
161+
camera_photo_distance_m):
158162
""" Initializes the MissionItem object """
159163
self.latitude_deg = latitude_deg
160164
self.longitude_deg = longitude_deg
@@ -168,6 +172,7 @@ def __init__(
168172
self.camera_photo_interval_s = camera_photo_interval_s
169173
self.acceptance_radius_m = acceptance_radius_m
170174
self.yaw_deg = yaw_deg
175+
self.camera_photo_distance_m = camera_photo_distance_m
171176

172177
def __eq__(self, to_compare):
173178
""" Checks if two MissionItem are the same """
@@ -186,7 +191,8 @@ def __eq__(self, to_compare):
186191
(self.loiter_time_s == to_compare.loiter_time_s) and \
187192
(self.camera_photo_interval_s == to_compare.camera_photo_interval_s) and \
188193
(self.acceptance_radius_m == to_compare.acceptance_radius_m) and \
189-
(self.yaw_deg == to_compare.yaw_deg)
194+
(self.yaw_deg == to_compare.yaw_deg) and \
195+
(self.camera_photo_distance_m == to_compare.camera_photo_distance_m)
190196

191197
except AttributeError:
192198
return False
@@ -205,7 +211,8 @@ def __str__(self):
205211
"loiter_time_s: " + str(self.loiter_time_s),
206212
"camera_photo_interval_s: " + str(self.camera_photo_interval_s),
207213
"acceptance_radius_m: " + str(self.acceptance_radius_m),
208-
"yaw_deg: " + str(self.yaw_deg)
214+
"yaw_deg: " + str(self.yaw_deg),
215+
"camera_photo_distance_m: " + str(self.camera_photo_distance_m)
209216
])
210217

211218
return f"MissionItem: [{struct_repr}]"
@@ -248,7 +255,10 @@ def translate_from_rpc(rpcMissionItem):
248255
rpcMissionItem.acceptance_radius_m,
249256

250257

251-
rpcMissionItem.yaw_deg
258+
rpcMissionItem.yaw_deg,
259+
260+
261+
rpcMissionItem.camera_photo_distance_m
252262
)
253263

254264
def translate_to_rpc(self, rpcMissionItem):
@@ -327,6 +337,12 @@ def translate_to_rpc(self, rpcMissionItem):
327337

328338

329339

340+
341+
342+
rpcMissionItem.camera_photo_distance_m = self.camera_photo_distance_m
343+
344+
345+
330346

331347

332348
class MissionPlan:

mavsdk/mission_pb2.py

Lines changed: 22 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)