Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
run: |
pipx run ruff format --check --line-length=100 examples
pipx run ruff check --select=ASYNC,RUF006,E,F --line-length=100 examples
pipx run ruff check --select=PERF --line-length=100 .
pipx run codespell .

- name: Install prerequisites
Expand Down
56 changes: 15 additions & 41 deletions mavsdk/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,7 @@ def translate_from_rpc(rpcSettingOptions):
rpcSettingOptions.component_id,
rpcSettingOptions.setting_id,
rpcSettingOptions.setting_description,
list(
map(
lambda elem: Option.translate_from_rpc(elem),
rpcSettingOptions.options,
)
),
[Option.translate_from_rpc(elem) for elem in rpcSettingOptions.options],
rpcSettingOptions.is_range,
)

Expand Down Expand Up @@ -1088,12 +1083,10 @@ def translate_from_rpc(rpcCurrentSettingsUpdate):
"""Translates a gRPC struct to the SDK equivalent"""
return CurrentSettingsUpdate(
rpcCurrentSettingsUpdate.component_id,
list(
map(
lambda elem: Setting.translate_from_rpc(elem),
rpcCurrentSettingsUpdate.current_settings,
)
),
[
Setting.translate_from_rpc(elem)
for elem in rpcCurrentSettingsUpdate.current_settings
],
)

def translate_to_rpc(self, rpcCurrentSettingsUpdate):
Expand Down Expand Up @@ -1157,12 +1150,10 @@ def translate_from_rpc(rpcPossibleSettingOptionsUpdate):
"""Translates a gRPC struct to the SDK equivalent"""
return PossibleSettingOptionsUpdate(
rpcPossibleSettingOptionsUpdate.component_id,
list(
map(
lambda elem: SettingOptions.translate_from_rpc(elem),
rpcPossibleSettingOptionsUpdate.setting_options,
)
),
[
SettingOptions.translate_from_rpc(elem)
for elem in rpcPossibleSettingOptionsUpdate.setting_options
],
)

def translate_to_rpc(self, rpcPossibleSettingOptionsUpdate):
Expand Down Expand Up @@ -1873,12 +1864,7 @@ def __str__(self):
def translate_from_rpc(rpcCameraList):
"""Translates a gRPC struct to the SDK equivalent"""
return CameraList(
list(
map(
lambda elem: Information.translate_from_rpc(elem),
rpcCameraList.cameras,
)
)
[Information.translate_from_rpc(elem) for elem in rpcCameraList.cameras]
)

def translate_to_rpc(self, rpcCameraList):
Expand Down Expand Up @@ -2183,11 +2169,7 @@ async def list_photos(self, component_id, photos_range):
if result.result != CameraResult.Result.SUCCESS:
raise CameraError(result, "list_photos()", component_id, photos_range)

capture_infos = []
for capture_infos_rpc in response.capture_infos:
capture_infos.append(CaptureInfo.translate_from_rpc(capture_infos_rpc))

return capture_infos
return [CaptureInfo.translate_from_rpc(elem) for elem in response.capture_infos]

async def camera_list(self):
"""
Expand Down Expand Up @@ -2448,11 +2430,7 @@ async def get_current_settings(self, component_id):
if result.result != CameraResult.Result.SUCCESS:
raise CameraError(result, "get_current_settings()", component_id)

current_settings = []
for current_settings_rpc in response.current_settings:
current_settings.append(Setting.translate_from_rpc(current_settings_rpc))

return current_settings
return [Setting.translate_from_rpc(elem) for elem in response.current_settings]

async def possible_setting_options(self):
"""
Expand Down Expand Up @@ -2508,13 +2486,9 @@ async def get_possible_setting_options(self, component_id):
if result.result != CameraResult.Result.SUCCESS:
raise CameraError(result, "get_possible_setting_options()", component_id)

setting_options = []
for setting_options_rpc in response.setting_options:
setting_options.append(
SettingOptions.translate_from_rpc(setting_options_rpc)
)

return setting_options
return [
SettingOptions.translate_from_rpc(elem) for elem in response.setting_options
]

async def set_setting(self, component_id, setting):
"""
Expand Down
30 changes: 12 additions & 18 deletions mavsdk/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,10 @@ def translate_from_rpc(rpcHealthAndArmingCheckMode):
return HealthAndArmingCheckMode(
rpcHealthAndArmingCheckMode.mode_name,
rpcHealthAndArmingCheckMode.can_arm_or_run,
list(
map(
lambda elem: HealthAndArmingCheckProblem.translate_from_rpc(elem),
rpcHealthAndArmingCheckMode.problems,
)
),
[
HealthAndArmingCheckProblem.translate_from_rpc(elem)
for elem in rpcHealthAndArmingCheckMode.problems
],
)

def translate_to_rpc(self, rpcHealthAndArmingCheckMode):
Expand Down Expand Up @@ -484,18 +482,14 @@ def translate_from_rpc(rpcHealthAndArmingCheckReport):
HealthAndArmingCheckMode.translate_from_rpc(
rpcHealthAndArmingCheckReport.current_mode_intention
),
list(
map(
lambda elem: HealthComponentReport.translate_from_rpc(elem),
rpcHealthAndArmingCheckReport.health_components,
)
),
list(
map(
lambda elem: HealthAndArmingCheckProblem.translate_from_rpc(elem),
rpcHealthAndArmingCheckReport.all_problems,
)
),
[
HealthComponentReport.translate_from_rpc(elem)
for elem in rpcHealthAndArmingCheckReport.health_components
],
[
HealthAndArmingCheckProblem.translate_from_rpc(elem)
for elem in rpcHealthAndArmingCheckReport.all_problems
],
)

def translate_to_rpc(self, rpcHealthAndArmingCheckReport):
Expand Down
16 changes: 3 additions & 13 deletions mavsdk/geofence.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def __str__(self):
def translate_from_rpc(rpcPolygon):
"""Translates a gRPC struct to the SDK equivalent"""
return Polygon(
list(map(lambda elem: Point.translate_from_rpc(elem), rpcPolygon.points)),
[Point.translate_from_rpc(elem) for elem in rpcPolygon.points],
FenceType.translate_from_rpc(rpcPolygon.fence_type),
)

Expand Down Expand Up @@ -268,18 +268,8 @@ def __str__(self):
def translate_from_rpc(rpcGeofenceData):
"""Translates a gRPC struct to the SDK equivalent"""
return GeofenceData(
list(
map(
lambda elem: Polygon.translate_from_rpc(elem),
rpcGeofenceData.polygons,
)
),
list(
map(
lambda elem: Circle.translate_from_rpc(elem),
rpcGeofenceData.circles,
)
),
[Polygon.translate_from_rpc(elem) for elem in rpcGeofenceData.polygons],
[Circle.translate_from_rpc(elem) for elem in rpcGeofenceData.circles],
)

def translate_to_rpc(self, rpcGeofenceData):
Expand Down
7 changes: 1 addition & 6 deletions mavsdk/gimbal.py
Original file line number Diff line number Diff line change
Expand Up @@ -594,12 +594,7 @@ def __str__(self):
def translate_from_rpc(rpcGimbalList):
"""Translates a gRPC struct to the SDK equivalent"""
return GimbalList(
list(
map(
lambda elem: GimbalItem.translate_from_rpc(elem),
rpcGimbalList.gimbals,
)
)
[GimbalItem.translate_from_rpc(elem) for elem in rpcGimbalList.gimbals]
)

def translate_to_rpc(self, rpcGimbalList):
Expand Down
6 changes: 1 addition & 5 deletions mavsdk/log_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,7 @@ async def get_entries(self):
if result.result != LogFilesResult.Result.SUCCESS:
raise LogFilesError(result, "get_entries()")

entries = []
for entries_rpc in response.entries:
entries.append(Entry.translate_from_rpc(entries_rpc))

return entries
return [Entry.translate_from_rpc(elem) for elem in response.entries]

async def download_log_file(self, entry, path):
"""
Expand Down
10 changes: 4 additions & 6 deletions mavsdk/mission.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,10 @@ def __str__(self):
def translate_from_rpc(rpcMissionPlan):
"""Translates a gRPC struct to the SDK equivalent"""
return MissionPlan(
list(
map(
lambda elem: MissionItem.translate_from_rpc(elem),
rpcMissionPlan.mission_items,
)
)
[
MissionItem.translate_from_rpc(elem)
for elem in rpcMissionPlan.mission_items
]
)

def translate_to_rpc(self, rpcMissionPlan):
Expand Down
54 changes: 19 additions & 35 deletions mavsdk/mission_raw.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,24 +284,18 @@ def __str__(self):
def translate_from_rpc(rpcMissionImportData):
"""Translates a gRPC struct to the SDK equivalent"""
return MissionImportData(
list(
map(
lambda elem: MissionItem.translate_from_rpc(elem),
rpcMissionImportData.mission_items,
)
),
list(
map(
lambda elem: MissionItem.translate_from_rpc(elem),
rpcMissionImportData.geofence_items,
)
),
list(
map(
lambda elem: MissionItem.translate_from_rpc(elem),
rpcMissionImportData.rally_items,
)
),
[
MissionItem.translate_from_rpc(elem)
for elem in rpcMissionImportData.mission_items
],
[
MissionItem.translate_from_rpc(elem)
for elem in rpcMissionImportData.geofence_items
],
[
MissionItem.translate_from_rpc(elem)
for elem in rpcMissionImportData.rally_items
],
)

def translate_to_rpc(self, rpcMissionImportData):
Expand Down Expand Up @@ -783,11 +777,7 @@ async def download_mission(self):
if result.result != MissionRawResult.Result.SUCCESS:
raise MissionRawError(result, "download_mission()")

mission_items = []
for mission_items_rpc in response.mission_items:
mission_items.append(MissionItem.translate_from_rpc(mission_items_rpc))

return mission_items
return [MissionItem.translate_from_rpc(elem) for elem in response.mission_items]

async def download_geofence(self):
"""
Expand All @@ -812,11 +802,9 @@ async def download_geofence(self):
if result.result != MissionRawResult.Result.SUCCESS:
raise MissionRawError(result, "download_geofence()")

geofence_items = []
for geofence_items_rpc in response.geofence_items:
geofence_items.append(MissionItem.translate_from_rpc(geofence_items_rpc))

return geofence_items
return [
MissionItem.translate_from_rpc(elem) for elem in response.geofence_items
]

async def download_rallypoints(self):
"""
Expand All @@ -841,13 +829,9 @@ async def download_rallypoints(self):
if result.result != MissionRawResult.Result.SUCCESS:
raise MissionRawError(result, "download_rallypoints()")

rallypoint_items = []
for rallypoint_items_rpc in response.rallypoint_items:
rallypoint_items.append(
MissionItem.translate_from_rpc(rallypoint_items_rpc)
)

return rallypoint_items
return [
MissionItem.translate_from_rpc(elem) for elem in response.rallypoint_items
]

async def cancel_mission_download(self):
"""
Expand Down
10 changes: 4 additions & 6 deletions mavsdk/mission_raw_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,10 @@ def __str__(self):
def translate_from_rpc(rpcMissionPlan):
"""Translates a gRPC struct to the SDK equivalent"""
return MissionPlan(
list(
map(
lambda elem: MissionItem.translate_from_rpc(elem),
rpcMissionPlan.mission_items,
)
)
[
MissionItem.translate_from_rpc(elem)
for elem in rpcMissionPlan.mission_items
]
)

def translate_to_rpc(self, rpcMissionPlan):
Expand Down
10 changes: 4 additions & 6 deletions mavsdk/offboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,10 @@ def __str__(self):
def translate_from_rpc(rpcActuatorControl):
"""Translates a gRPC struct to the SDK equivalent"""
return ActuatorControl(
list(
map(
lambda elem: ActuatorControlGroup.translate_from_rpc(elem),
rpcActuatorControl.groups,
)
)
[
ActuatorControlGroup.translate_from_rpc(elem)
for elem in rpcActuatorControl.groups
]
)

def translate_to_rpc(self, rpcActuatorControl):
Expand Down
24 changes: 6 additions & 18 deletions mavsdk/param.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,24 +244,12 @@ def __str__(self):
def translate_from_rpc(rpcAllParams):
"""Translates a gRPC struct to the SDK equivalent"""
return AllParams(
list(
map(
lambda elem: IntParam.translate_from_rpc(elem),
rpcAllParams.int_params,
)
),
list(
map(
lambda elem: FloatParam.translate_from_rpc(elem),
rpcAllParams.float_params,
)
),
list(
map(
lambda elem: CustomParam.translate_from_rpc(elem),
rpcAllParams.custom_params,
)
),
[IntParam.translate_from_rpc(elem) for elem in rpcAllParams.int_params],
[FloatParam.translate_from_rpc(elem) for elem in rpcAllParams.float_params],
[
CustomParam.translate_from_rpc(elem)
for elem in rpcAllParams.custom_params
],
)

def translate_to_rpc(self, rpcAllParams):
Expand Down
Loading
Loading