Skip to content

Update mavsdk_server and proto submodule #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2021
Merged

Update mavsdk_server and proto submodule #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MAVSDK_SERVER_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.46.1
v0.50.0
24 changes: 20 additions & 4 deletions mavsdk/mission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ class MissionItem:
yaw_deg : float
Absolute yaw angle (in degrees)

camera_photo_distance_m : float
Camera photo distance to use after this mission item (in meters)

"""


Expand Down Expand Up @@ -154,7 +157,8 @@ def __init__(
loiter_time_s,
camera_photo_interval_s,
acceptance_radius_m,
yaw_deg):
yaw_deg,
camera_photo_distance_m):
""" Initializes the MissionItem object """
self.latitude_deg = latitude_deg
self.longitude_deg = longitude_deg
Expand All @@ -168,6 +172,7 @@ def __init__(
self.camera_photo_interval_s = camera_photo_interval_s
self.acceptance_radius_m = acceptance_radius_m
self.yaw_deg = yaw_deg
self.camera_photo_distance_m = camera_photo_distance_m

def __eq__(self, to_compare):
""" Checks if two MissionItem are the same """
Expand All @@ -186,7 +191,8 @@ def __eq__(self, to_compare):
(self.loiter_time_s == to_compare.loiter_time_s) and \
(self.camera_photo_interval_s == to_compare.camera_photo_interval_s) and \
(self.acceptance_radius_m == to_compare.acceptance_radius_m) and \
(self.yaw_deg == to_compare.yaw_deg)
(self.yaw_deg == to_compare.yaw_deg) and \
(self.camera_photo_distance_m == to_compare.camera_photo_distance_m)

except AttributeError:
return False
Expand All @@ -205,7 +211,8 @@ def __str__(self):
"loiter_time_s: " + str(self.loiter_time_s),
"camera_photo_interval_s: " + str(self.camera_photo_interval_s),
"acceptance_radius_m: " + str(self.acceptance_radius_m),
"yaw_deg: " + str(self.yaw_deg)
"yaw_deg: " + str(self.yaw_deg),
"camera_photo_distance_m: " + str(self.camera_photo_distance_m)
])

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


rpcMissionItem.yaw_deg
rpcMissionItem.yaw_deg,


rpcMissionItem.camera_photo_distance_m
)

def translate_to_rpc(self, rpcMissionItem):
Expand Down Expand Up @@ -327,6 +337,12 @@ def translate_to_rpc(self, rpcMissionItem):





rpcMissionItem.camera_photo_distance_m = self.camera_photo_distance_m





class MissionPlan:
Expand Down
36 changes: 22 additions & 14 deletions mavsdk/mission_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading