Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuriy Homyakov authored and Yuriy Homyakov committed Jun 4, 2020
2 parents 9b47504 + 7abf4df commit 3a44abc
Show file tree
Hide file tree
Showing 85 changed files with 2,470 additions and 2,480 deletions.
2 changes: 1 addition & 1 deletion examples/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import asyncio

from mavsdk import (CameraError, Mode)
from mavsdk.camera import (CameraError, Mode)
from mavsdk import System


Expand Down
2 changes: 1 addition & 1 deletion examples/mission.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import asyncio

from mavsdk import System
from mavsdk import (MissionItem, MissionPlan)
from mavsdk.mission import (MissionItem, MissionPlan)


async def run():
Expand Down
2 changes: 1 addition & 1 deletion examples/offboard_attitude.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import asyncio

from mavsdk import System
from mavsdk import (Attitude, OffboardError)
from mavsdk.offboard import (Attitude, OffboardError)


async def run():
Expand Down
2 changes: 1 addition & 1 deletion examples/offboard_position_ned.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import asyncio

from mavsdk import System
from mavsdk import (OffboardError, PositionNedYaw)
from mavsdk.offboard import (OffboardError, PositionNedYaw)


async def run():
Expand Down
2 changes: 1 addition & 1 deletion examples/offboard_velocity_body.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import asyncio

from mavsdk import System
from mavsdk import (OffboardError, VelocityBodyYawspeed)
from mavsdk.offboard import (OffboardError, VelocityBodyYawspeed)


async def run():
Expand Down
2 changes: 1 addition & 1 deletion examples/offboard_velocity_ned.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import asyncio

from mavsdk import System
from mavsdk import (OffboardError, VelocityNedYaw)
from mavsdk.offboard import (OffboardError, VelocityNedYaw)


async def run():
Expand Down
1 change: 0 additions & 1 deletion mavsdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import sys

from .system import System
from .generated import * # NOQA

# Check for compatibility
if float(".".join(platform.python_version_tuple()[0:-1])) < 3.6:
Expand Down
1 change: 1 addition & 0 deletions mavsdk/action/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .action import *
2 changes: 1 addition & 1 deletion mavsdk/generated/action.py → mavsdk/action/action.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from .._base import AsyncBase
from ..generated import action_pb2, action_pb2_grpc
from . import action_pb2, action_pb2_grpc
from enum import Enum


Expand Down
224 changes: 112 additions & 112 deletions mavsdk/generated/action_pb2.py → mavsdk/action/action_pb2.py

Large diffs are not rendered by default.

206 changes: 103 additions & 103 deletions mavsdk/generated/action_pb2_grpc.py → mavsdk/action/action_pb2_grpc.py

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions mavsdk/calibration/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .calibration import *
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from .._base import AsyncBase
from ..generated import calibration_pb2, calibration_pb2_grpc
from . import calibration_pb2, calibration_pb2_grpc
from enum import Enum


Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
import grpc

from . import calibration_pb2 as calibration__pb2
from . import calibration_pb2 as calibration_dot_calibration__pb2


class CalibrationServiceStub(object):
Expand All @@ -16,33 +16,33 @@ def __init__(self, channel):
"""
self.SubscribeCalibrateGyro = channel.unary_stream(
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGyro',
request_serializer=calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
response_deserializer=calibration__pb2.CalibrateGyroResponse.FromString,
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
response_deserializer=calibration_dot_calibration__pb2.CalibrateGyroResponse.FromString,
)
self.SubscribeCalibrateAccelerometer = channel.unary_stream(
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateAccelerometer',
request_serializer=calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
response_deserializer=calibration__pb2.CalibrateAccelerometerResponse.FromString,
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
response_deserializer=calibration_dot_calibration__pb2.CalibrateAccelerometerResponse.FromString,
)
self.SubscribeCalibrateMagnetometer = channel.unary_stream(
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateMagnetometer',
request_serializer=calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
response_deserializer=calibration__pb2.CalibrateMagnetometerResponse.FromString,
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
response_deserializer=calibration_dot_calibration__pb2.CalibrateMagnetometerResponse.FromString,
)
self.SubscribeCalibrateLevelHorizon = channel.unary_stream(
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateLevelHorizon',
request_serializer=calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
response_deserializer=calibration__pb2.CalibrateLevelHorizonResponse.FromString,
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
response_deserializer=calibration_dot_calibration__pb2.CalibrateLevelHorizonResponse.FromString,
)
self.SubscribeCalibrateGimbalAccelerometer = channel.unary_stream(
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGimbalAccelerometer',
request_serializer=calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
response_deserializer=calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
response_deserializer=calibration_dot_calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
)
self.Cancel = channel.unary_unary(
'/mavsdk.rpc.calibration.CalibrationService/Cancel',
request_serializer=calibration__pb2.CancelRequest.SerializeToString,
response_deserializer=calibration__pb2.CancelResponse.FromString,
request_serializer=calibration_dot_calibration__pb2.CancelRequest.SerializeToString,
response_deserializer=calibration_dot_calibration__pb2.CancelResponse.FromString,
)


Expand Down Expand Up @@ -97,33 +97,33 @@ def add_CalibrationServiceServicer_to_server(servicer, server):
rpc_method_handlers = {
'SubscribeCalibrateGyro': grpc.unary_stream_rpc_method_handler(
servicer.SubscribeCalibrateGyro,
request_deserializer=calibration__pb2.SubscribeCalibrateGyroRequest.FromString,
response_serializer=calibration__pb2.CalibrateGyroResponse.SerializeToString,
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateGyroRequest.FromString,
response_serializer=calibration_dot_calibration__pb2.CalibrateGyroResponse.SerializeToString,
),
'SubscribeCalibrateAccelerometer': grpc.unary_stream_rpc_method_handler(
servicer.SubscribeCalibrateAccelerometer,
request_deserializer=calibration__pb2.SubscribeCalibrateAccelerometerRequest.FromString,
response_serializer=calibration__pb2.CalibrateAccelerometerResponse.SerializeToString,
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateAccelerometerRequest.FromString,
response_serializer=calibration_dot_calibration__pb2.CalibrateAccelerometerResponse.SerializeToString,
),
'SubscribeCalibrateMagnetometer': grpc.unary_stream_rpc_method_handler(
servicer.SubscribeCalibrateMagnetometer,
request_deserializer=calibration__pb2.SubscribeCalibrateMagnetometerRequest.FromString,
response_serializer=calibration__pb2.CalibrateMagnetometerResponse.SerializeToString,
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateMagnetometerRequest.FromString,
response_serializer=calibration_dot_calibration__pb2.CalibrateMagnetometerResponse.SerializeToString,
),
'SubscribeCalibrateLevelHorizon': grpc.unary_stream_rpc_method_handler(
servicer.SubscribeCalibrateLevelHorizon,
request_deserializer=calibration__pb2.SubscribeCalibrateLevelHorizonRequest.FromString,
response_serializer=calibration__pb2.CalibrateLevelHorizonResponse.SerializeToString,
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateLevelHorizonRequest.FromString,
response_serializer=calibration_dot_calibration__pb2.CalibrateLevelHorizonResponse.SerializeToString,
),
'SubscribeCalibrateGimbalAccelerometer': grpc.unary_stream_rpc_method_handler(
servicer.SubscribeCalibrateGimbalAccelerometer,
request_deserializer=calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.FromString,
response_serializer=calibration__pb2.CalibrateGimbalAccelerometerResponse.SerializeToString,
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.FromString,
response_serializer=calibration_dot_calibration__pb2.CalibrateGimbalAccelerometerResponse.SerializeToString,
),
'Cancel': grpc.unary_unary_rpc_method_handler(
servicer.Cancel,
request_deserializer=calibration__pb2.CancelRequest.FromString,
response_serializer=calibration__pb2.CancelResponse.SerializeToString,
request_deserializer=calibration_dot_calibration__pb2.CancelRequest.FromString,
response_serializer=calibration_dot_calibration__pb2.CancelResponse.SerializeToString,
),
}
generic_handler = grpc.method_handlers_generic_handler(
Expand All @@ -147,8 +147,8 @@ def SubscribeCalibrateGyro(request,
timeout=None,
metadata=None):
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGyro',
calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
calibration__pb2.CalibrateGyroResponse.FromString,
calibration_dot_calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
calibration_dot_calibration__pb2.CalibrateGyroResponse.FromString,
options, channel_credentials,
call_credentials, compression, wait_for_ready, timeout, metadata)

Expand All @@ -163,8 +163,8 @@ def SubscribeCalibrateAccelerometer(request,
timeout=None,
metadata=None):
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateAccelerometer',
calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
calibration__pb2.CalibrateAccelerometerResponse.FromString,
calibration_dot_calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
calibration_dot_calibration__pb2.CalibrateAccelerometerResponse.FromString,
options, channel_credentials,
call_credentials, compression, wait_for_ready, timeout, metadata)

Expand All @@ -179,8 +179,8 @@ def SubscribeCalibrateMagnetometer(request,
timeout=None,
metadata=None):
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateMagnetometer',
calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
calibration__pb2.CalibrateMagnetometerResponse.FromString,
calibration_dot_calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
calibration_dot_calibration__pb2.CalibrateMagnetometerResponse.FromString,
options, channel_credentials,
call_credentials, compression, wait_for_ready, timeout, metadata)

Expand All @@ -195,8 +195,8 @@ def SubscribeCalibrateLevelHorizon(request,
timeout=None,
metadata=None):
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateLevelHorizon',
calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
calibration__pb2.CalibrateLevelHorizonResponse.FromString,
calibration_dot_calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
calibration_dot_calibration__pb2.CalibrateLevelHorizonResponse.FromString,
options, channel_credentials,
call_credentials, compression, wait_for_ready, timeout, metadata)

Expand All @@ -211,8 +211,8 @@ def SubscribeCalibrateGimbalAccelerometer(request,
timeout=None,
metadata=None):
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGimbalAccelerometer',
calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
calibration_dot_calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
calibration_dot_calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
options, channel_credentials,
call_credentials, compression, wait_for_ready, timeout, metadata)

Expand All @@ -227,7 +227,7 @@ def Cancel(request,
timeout=None,
metadata=None):
return grpc.experimental.unary_unary(request, target, '/mavsdk.rpc.calibration.CalibrationService/Cancel',
calibration__pb2.CancelRequest.SerializeToString,
calibration__pb2.CancelResponse.FromString,
calibration_dot_calibration__pb2.CancelRequest.SerializeToString,
calibration_dot_calibration__pb2.CancelResponse.FromString,
options, channel_credentials,
call_credentials, compression, wait_for_ready, timeout, metadata)
1 change: 1 addition & 0 deletions mavsdk/camera/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .camera import *
2 changes: 1 addition & 1 deletion mavsdk/generated/camera.py → mavsdk/camera/camera.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from .._base import AsyncBase
from ..generated import camera_pb2, camera_pb2_grpc
from . import camera_pb2, camera_pb2_grpc
from enum import Enum


Expand Down
Loading

0 comments on commit 3a44abc

Please sign in to comment.