Skip to content

Commit 3a44abc

Browse files
Yuriy HomyakovYuriy Homyakov
Yuriy Homyakov
authored and
Yuriy Homyakov
committed
Merge remote-tracking branch 'upstream/master'
2 parents 9b47504 + 7abf4df commit 3a44abc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2470
-2480
lines changed

‎examples/camera.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import asyncio
44

5-
from mavsdk import (CameraError, Mode)
5+
from mavsdk.camera import (CameraError, Mode)
66
from mavsdk import System
77

88

‎examples/mission.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import asyncio
44

55
from mavsdk import System
6-
from mavsdk import (MissionItem, MissionPlan)
6+
from mavsdk.mission import (MissionItem, MissionPlan)
77

88

99
async def run():

‎examples/offboard_attitude.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import asyncio
55

66
from mavsdk import System
7-
from mavsdk import (Attitude, OffboardError)
7+
from mavsdk.offboard import (Attitude, OffboardError)
88

99

1010
async def run():

‎examples/offboard_position_ned.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import asyncio
1212

1313
from mavsdk import System
14-
from mavsdk import (OffboardError, PositionNedYaw)
14+
from mavsdk.offboard import (OffboardError, PositionNedYaw)
1515

1616

1717
async def run():

‎examples/offboard_velocity_body.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import asyncio
55

66
from mavsdk import System
7-
from mavsdk import (OffboardError, VelocityBodyYawspeed)
7+
from mavsdk.offboard import (OffboardError, VelocityBodyYawspeed)
88

99

1010
async def run():

‎examples/offboard_velocity_ned.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import asyncio
55

66
from mavsdk import System
7-
from mavsdk import (OffboardError, VelocityNedYaw)
7+
from mavsdk.offboard import (OffboardError, VelocityNedYaw)
88

99

1010
async def run():

‎mavsdk/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import sys
66

77
from .system import System
8-
from .generated import * # NOQA
98

109
# Check for compatibility
1110
if float(".".join(platform.python_version_tuple()[0:-1])) < 3.6:

‎mavsdk/action/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from .action import *

‎mavsdk/generated/action.py renamed to ‎mavsdk/action/action.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
from .._base import AsyncBase
3-
from ..generated import action_pb2, action_pb2_grpc
3+
from . import action_pb2, action_pb2_grpc
44
from enum import Enum
55

66

‎mavsdk/generated/action_pb2.py renamed to ‎mavsdk/action/action_pb2.py

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

‎mavsdk/generated/action_pb2_grpc.py renamed to ‎mavsdk/action/action_pb2_grpc.py

Lines changed: 103 additions & 103 deletions
Large diffs are not rendered by default.

‎mavsdk/calibration/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from .calibration import *

‎mavsdk/generated/calibration.py renamed to ‎mavsdk/calibration/calibration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
from .._base import AsyncBase
3-
from ..generated import calibration_pb2, calibration_pb2_grpc
3+
from . import calibration_pb2, calibration_pb2_grpc
44
from enum import Enum
55

66

‎mavsdk/generated/calibration_pb2.py renamed to ‎mavsdk/calibration/calibration_pb2.py

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

‎mavsdk/generated/calibration_pb2_grpc.py renamed to ‎mavsdk/calibration/calibration_pb2_grpc.py

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
import grpc
33

4-
from . import calibration_pb2 as calibration__pb2
4+
from . import calibration_pb2 as calibration_dot_calibration__pb2
55

66

77
class CalibrationServiceStub(object):
@@ -16,33 +16,33 @@ def __init__(self, channel):
1616
"""
1717
self.SubscribeCalibrateGyro = channel.unary_stream(
1818
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGyro',
19-
request_serializer=calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
20-
response_deserializer=calibration__pb2.CalibrateGyroResponse.FromString,
19+
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
20+
response_deserializer=calibration_dot_calibration__pb2.CalibrateGyroResponse.FromString,
2121
)
2222
self.SubscribeCalibrateAccelerometer = channel.unary_stream(
2323
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateAccelerometer',
24-
request_serializer=calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
25-
response_deserializer=calibration__pb2.CalibrateAccelerometerResponse.FromString,
24+
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
25+
response_deserializer=calibration_dot_calibration__pb2.CalibrateAccelerometerResponse.FromString,
2626
)
2727
self.SubscribeCalibrateMagnetometer = channel.unary_stream(
2828
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateMagnetometer',
29-
request_serializer=calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
30-
response_deserializer=calibration__pb2.CalibrateMagnetometerResponse.FromString,
29+
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
30+
response_deserializer=calibration_dot_calibration__pb2.CalibrateMagnetometerResponse.FromString,
3131
)
3232
self.SubscribeCalibrateLevelHorizon = channel.unary_stream(
3333
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateLevelHorizon',
34-
request_serializer=calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
35-
response_deserializer=calibration__pb2.CalibrateLevelHorizonResponse.FromString,
34+
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
35+
response_deserializer=calibration_dot_calibration__pb2.CalibrateLevelHorizonResponse.FromString,
3636
)
3737
self.SubscribeCalibrateGimbalAccelerometer = channel.unary_stream(
3838
'/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGimbalAccelerometer',
39-
request_serializer=calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
40-
response_deserializer=calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
39+
request_serializer=calibration_dot_calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
40+
response_deserializer=calibration_dot_calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
4141
)
4242
self.Cancel = channel.unary_unary(
4343
'/mavsdk.rpc.calibration.CalibrationService/Cancel',
44-
request_serializer=calibration__pb2.CancelRequest.SerializeToString,
45-
response_deserializer=calibration__pb2.CancelResponse.FromString,
44+
request_serializer=calibration_dot_calibration__pb2.CancelRequest.SerializeToString,
45+
response_deserializer=calibration_dot_calibration__pb2.CancelResponse.FromString,
4646
)
4747

4848

@@ -97,33 +97,33 @@ def add_CalibrationServiceServicer_to_server(servicer, server):
9797
rpc_method_handlers = {
9898
'SubscribeCalibrateGyro': grpc.unary_stream_rpc_method_handler(
9999
servicer.SubscribeCalibrateGyro,
100-
request_deserializer=calibration__pb2.SubscribeCalibrateGyroRequest.FromString,
101-
response_serializer=calibration__pb2.CalibrateGyroResponse.SerializeToString,
100+
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateGyroRequest.FromString,
101+
response_serializer=calibration_dot_calibration__pb2.CalibrateGyroResponse.SerializeToString,
102102
),
103103
'SubscribeCalibrateAccelerometer': grpc.unary_stream_rpc_method_handler(
104104
servicer.SubscribeCalibrateAccelerometer,
105-
request_deserializer=calibration__pb2.SubscribeCalibrateAccelerometerRequest.FromString,
106-
response_serializer=calibration__pb2.CalibrateAccelerometerResponse.SerializeToString,
105+
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateAccelerometerRequest.FromString,
106+
response_serializer=calibration_dot_calibration__pb2.CalibrateAccelerometerResponse.SerializeToString,
107107
),
108108
'SubscribeCalibrateMagnetometer': grpc.unary_stream_rpc_method_handler(
109109
servicer.SubscribeCalibrateMagnetometer,
110-
request_deserializer=calibration__pb2.SubscribeCalibrateMagnetometerRequest.FromString,
111-
response_serializer=calibration__pb2.CalibrateMagnetometerResponse.SerializeToString,
110+
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateMagnetometerRequest.FromString,
111+
response_serializer=calibration_dot_calibration__pb2.CalibrateMagnetometerResponse.SerializeToString,
112112
),
113113
'SubscribeCalibrateLevelHorizon': grpc.unary_stream_rpc_method_handler(
114114
servicer.SubscribeCalibrateLevelHorizon,
115-
request_deserializer=calibration__pb2.SubscribeCalibrateLevelHorizonRequest.FromString,
116-
response_serializer=calibration__pb2.CalibrateLevelHorizonResponse.SerializeToString,
115+
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateLevelHorizonRequest.FromString,
116+
response_serializer=calibration_dot_calibration__pb2.CalibrateLevelHorizonResponse.SerializeToString,
117117
),
118118
'SubscribeCalibrateGimbalAccelerometer': grpc.unary_stream_rpc_method_handler(
119119
servicer.SubscribeCalibrateGimbalAccelerometer,
120-
request_deserializer=calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.FromString,
121-
response_serializer=calibration__pb2.CalibrateGimbalAccelerometerResponse.SerializeToString,
120+
request_deserializer=calibration_dot_calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.FromString,
121+
response_serializer=calibration_dot_calibration__pb2.CalibrateGimbalAccelerometerResponse.SerializeToString,
122122
),
123123
'Cancel': grpc.unary_unary_rpc_method_handler(
124124
servicer.Cancel,
125-
request_deserializer=calibration__pb2.CancelRequest.FromString,
126-
response_serializer=calibration__pb2.CancelResponse.SerializeToString,
125+
request_deserializer=calibration_dot_calibration__pb2.CancelRequest.FromString,
126+
response_serializer=calibration_dot_calibration__pb2.CancelResponse.SerializeToString,
127127
),
128128
}
129129
generic_handler = grpc.method_handlers_generic_handler(
@@ -147,8 +147,8 @@ def SubscribeCalibrateGyro(request,
147147
timeout=None,
148148
metadata=None):
149149
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGyro',
150-
calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
151-
calibration__pb2.CalibrateGyroResponse.FromString,
150+
calibration_dot_calibration__pb2.SubscribeCalibrateGyroRequest.SerializeToString,
151+
calibration_dot_calibration__pb2.CalibrateGyroResponse.FromString,
152152
options, channel_credentials,
153153
call_credentials, compression, wait_for_ready, timeout, metadata)
154154

@@ -163,8 +163,8 @@ def SubscribeCalibrateAccelerometer(request,
163163
timeout=None,
164164
metadata=None):
165165
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateAccelerometer',
166-
calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
167-
calibration__pb2.CalibrateAccelerometerResponse.FromString,
166+
calibration_dot_calibration__pb2.SubscribeCalibrateAccelerometerRequest.SerializeToString,
167+
calibration_dot_calibration__pb2.CalibrateAccelerometerResponse.FromString,
168168
options, channel_credentials,
169169
call_credentials, compression, wait_for_ready, timeout, metadata)
170170

@@ -179,8 +179,8 @@ def SubscribeCalibrateMagnetometer(request,
179179
timeout=None,
180180
metadata=None):
181181
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateMagnetometer',
182-
calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
183-
calibration__pb2.CalibrateMagnetometerResponse.FromString,
182+
calibration_dot_calibration__pb2.SubscribeCalibrateMagnetometerRequest.SerializeToString,
183+
calibration_dot_calibration__pb2.CalibrateMagnetometerResponse.FromString,
184184
options, channel_credentials,
185185
call_credentials, compression, wait_for_ready, timeout, metadata)
186186

@@ -195,8 +195,8 @@ def SubscribeCalibrateLevelHorizon(request,
195195
timeout=None,
196196
metadata=None):
197197
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateLevelHorizon',
198-
calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
199-
calibration__pb2.CalibrateLevelHorizonResponse.FromString,
198+
calibration_dot_calibration__pb2.SubscribeCalibrateLevelHorizonRequest.SerializeToString,
199+
calibration_dot_calibration__pb2.CalibrateLevelHorizonResponse.FromString,
200200
options, channel_credentials,
201201
call_credentials, compression, wait_for_ready, timeout, metadata)
202202

@@ -211,8 +211,8 @@ def SubscribeCalibrateGimbalAccelerometer(request,
211211
timeout=None,
212212
metadata=None):
213213
return grpc.experimental.unary_stream(request, target, '/mavsdk.rpc.calibration.CalibrationService/SubscribeCalibrateGimbalAccelerometer',
214-
calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
215-
calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
214+
calibration_dot_calibration__pb2.SubscribeCalibrateGimbalAccelerometerRequest.SerializeToString,
215+
calibration_dot_calibration__pb2.CalibrateGimbalAccelerometerResponse.FromString,
216216
options, channel_credentials,
217217
call_credentials, compression, wait_for_ready, timeout, metadata)
218218

@@ -227,7 +227,7 @@ def Cancel(request,
227227
timeout=None,
228228
metadata=None):
229229
return grpc.experimental.unary_unary(request, target, '/mavsdk.rpc.calibration.CalibrationService/Cancel',
230-
calibration__pb2.CancelRequest.SerializeToString,
231-
calibration__pb2.CancelResponse.FromString,
230+
calibration_dot_calibration__pb2.CancelRequest.SerializeToString,
231+
calibration_dot_calibration__pb2.CancelResponse.FromString,
232232
options, channel_credentials,
233233
call_credentials, compression, wait_for_ready, timeout, metadata)

‎mavsdk/camera/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from .camera import *

‎mavsdk/generated/camera.py renamed to ‎mavsdk/camera/camera.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
from .._base import AsyncBase
3-
from ..generated import camera_pb2, camera_pb2_grpc
3+
from . import camera_pb2, camera_pb2_grpc
44
from enum import Enum
55

66

0 commit comments

Comments
 (0)