Merge pull request mavlink#310 from mavlink/update-proto

Update proto submodule and generate code

Author: JonasVautherin

mavsdk/camera.py

@@ -50,6 +50,42 @@ def __str__(self):
         return self.name
 
 
+class PhotosRange(Enum):
+    """
+     Photos range type.
+
+     Values
+     ------
+     ALL
+          All the photos present on the camera
+
+     SINCE_CONNECTION
+          Photos taken since MAVSDK got connected
+
+     """
+
+    
+    ALL = 0
+    SINCE_CONNECTION = 1
+
+    def translate_to_rpc(self):
+        if self == PhotosRange.ALL:
+            return camera_pb2.PHOTOS_RANGE_ALL
+        if self == PhotosRange.SINCE_CONNECTION:
+            return camera_pb2.PHOTOS_RANGE_SINCE_CONNECTION
+
+    @staticmethod
+    def translate_from_rpc(rpc_enum_value):
+        """ Parses a gRPC response """
+        if rpc_enum_value == camera_pb2.PHOTOS_RANGE_ALL:
+            return PhotosRange.ALL
+        if rpc_enum_value == camera_pb2.PHOTOS_RANGE_SINCE_CONNECTION:
+            return PhotosRange.SINCE_CONNECTION
+
+    def __str__(self):
+        return self.name
+
+
 class CameraResult:
     """
      Result type.
@@ -1717,6 +1753,49 @@ async def set_mode(self, mode):
             raise CameraError(result, "set_mode()", mode)
 
 
+    async def list_photos(self, photos_range):
+        """
+         List photos available on the camera.
+
+         Parameters
+         ----------
+         photos_range : PhotosRange
+              Which photos should be listed (all or since connection)
+
+         Returns
+         -------
+         capture_infos : [CaptureInfo]
+              List of capture infos (representing the photos)
+
+         Raises
+         ------
+         CameraError
+             If the request fails. The error contains the reason for the failure.
+        """
+
+        request = camera_pb2.ListPhotosRequest()
+        
+            
+                
+        request.photos_range = photos_range.translate_to_rpc()
+                
+            
+        response = await self._stub.ListPhotos(request)
+
+        
+        result = self._extract_result(response)
+
+        if result.result is not CameraResult.Result.SUCCESS:
+            raise CameraError(result, "list_photos()", 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
+            
+
     async def mode(self):
         """
          Subscribe to camera mode updates.

mavsdk/camera_pb2.py

@@ -62,6 +62,11 @@ def __init__(self, channel):
                 request_serializer=camera_dot_camera__pb2.SetModeRequest.SerializeToString,
                 response_deserializer=camera_dot_camera__pb2.SetModeResponse.FromString,
                 )
+        self.ListPhotos = channel.unary_unary(
+                '/mavsdk.rpc.camera.CameraService/ListPhotos',
+                request_serializer=camera_dot_camera__pb2.ListPhotosRequest.SerializeToString,
+                response_deserializer=camera_dot_camera__pb2.ListPhotosResponse.FromString,
+                )
         self.SubscribeMode = channel.unary_stream(
                 '/mavsdk.rpc.camera.CameraService/SubscribeMode',
                 request_serializer=camera_dot_camera__pb2.SubscribeModeRequest.SerializeToString,
@@ -189,6 +194,14 @@ def SetMode(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def ListPhotos(self, request, context):
+        """
+        List photos available on the camera.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def SubscribeMode(self, request, context):
         """
         Subscribe to camera mode updates.
@@ -318,6 +331,11 @@ def add_CameraServiceServicer_to_server(servicer, server):
                     request_deserializer=camera_dot_camera__pb2.SetModeRequest.FromString,
                     response_serializer=camera_dot_camera__pb2.SetModeResponse.SerializeToString,
             ),
+            'ListPhotos': grpc.unary_unary_rpc_method_handler(
+                    servicer.ListPhotos,
+                    request_deserializer=camera_dot_camera__pb2.ListPhotosRequest.FromString,
+                    response_serializer=camera_dot_camera__pb2.ListPhotosResponse.SerializeToString,
+            ),
             'SubscribeMode': grpc.unary_stream_rpc_method_handler(
                     servicer.SubscribeMode,
                     request_deserializer=camera_dot_camera__pb2.SubscribeModeRequest.FromString,
@@ -522,6 +540,23 @@ def SetMode(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def ListPhotos(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/mavsdk.rpc.camera.CameraService/ListPhotos',
+            camera_dot_camera__pb2.ListPhotosRequest.SerializeToString,
+            camera_dot_camera__pb2.ListPhotosResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def SubscribeMode(request,
             target,

mavsdk/camera_pb2_grpc.py

@@ -24,3 +24,4 @@ Plugins
    telemetry
    tune
    failure
+   tracking_server

mavsdk/source/plugins/index.rst

@@ -0,0 +1,8 @@
+TrackingServer
+====
+
+.. automodule:: mavsdk.tracking_server
+    :members:
+    :undoc-members:
+    :show-inheritance:
+    :exclude-members: translate_from_rpc, translate_to_rpc

mavsdk/source/plugins/tracking_server.rst

@@ -21,6 +21,7 @@
 from . import param
 from . import shell
 from . import telemetry
+from . import tracking_server
 from . import tune
 
 from . import bin
@@ -115,6 +116,7 @@ async def _init_plugins(self, host, port):
         self._plugins["param"] = param.Param(plugin_manager)
         self._plugins["shell"] = shell.Shell(plugin_manager)
         self._plugins["telemetry"] = telemetry.Telemetry(plugin_manager)
+        self._plugins["tracking_server"] = tracking_server.TrackingServer(plugin_manager)
         self._plugins["tune"] = tune.Tune(plugin_manager)
 
     @staticmethod
@@ -236,6 +238,12 @@ def telemetry(self) -> telemetry.Telemetry:
             raise RuntimeError(self.error_uninitialized("Telemetry"))
         return self._plugins["telemetry"]
 
+    @property
+    def tracking_server(self) -> tracking_server.TrackingServer:
+        if "tracking_server" not in self._plugins:
+            raise RuntimeError(self.error_uninitialized("TrackingServer"))
+        return self._plugins["tracking_server"]
+
     @property
     def tune(self) -> tune.Tune:
         if "tune" not in self._plugins: