Merge pull request #207 from mavlink/fix-200

Make modules out of the plugins

Author: julianoes

examples/camera.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from mavsdk import (CameraError, Mode)
+from mavsdk.camera import (CameraError, Mode)
 from mavsdk import System
 
 

examples/mission.py

@@ -3,7 +3,7 @@
 import asyncio
 
 from mavsdk import System
-from mavsdk import (MissionItem, MissionPlan)
+from mavsdk.mission import (MissionItem, MissionPlan)
 
 
 async def run():

examples/offboard_attitude.py

@@ -4,7 +4,7 @@
 import asyncio
 
 from mavsdk import System
-from mavsdk import (Attitude, OffboardError)
+from mavsdk.offboard import (Attitude, OffboardError)
 
 
 async def run():

examples/offboard_position_ned.py

@@ -11,7 +11,7 @@
 import asyncio
 
 from mavsdk import System
-from mavsdk import (OffboardError, PositionNedYaw)
+from mavsdk.offboard import (OffboardError, PositionNedYaw)
 
 
 async def run():

examples/offboard_velocity_body.py

@@ -4,7 +4,7 @@
 import asyncio
 
 from mavsdk import System
-from mavsdk import (OffboardError, VelocityBodyYawspeed)
+from mavsdk.offboard import (OffboardError, VelocityBodyYawspeed)
 
 
 async def run():

examples/offboard_velocity_ned.py

@@ -4,7 +4,7 @@
 import asyncio
 
 from mavsdk import System
-from mavsdk import (OffboardError, VelocityNedYaw)
+from mavsdk.offboard import (OffboardError, VelocityNedYaw)
 
 
 async def run():

mavsdk/__init__.py

@@ -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:

mavsdk/action/__init__.py

@@ -0,0 +1 @@
+from .action import *

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

@@ -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
 
 

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

@@ -0,0 +1 @@
+from .calibration import *

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

@@ -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
 
 

mavsdk/calibration/__init__.py

@@ -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):
@@ -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,
                 )
 
 
@@ -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(
@@ -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)
 
@@ -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)
 
@@ -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)
 
@@ -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)
 
@@ -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)
 
@@ -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)

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

@@ -0,0 +1 @@
+from .camera import *

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

@@ -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