Merge pull request #542 from mavlink/pr-update-mavsdk-server

julianoes · web-flow · commit 0a2890d70bee · 2023-01-14T09:34:53.000+13:00
Update mavsdk_server version, bump to Python 3.7+
diff --git a/MAVSDK_SERVER_VERSION b/MAVSDK_SERVER_VERSION
@@ -1 +1 @@
-v1.4.4
+v1.4.10
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ The Python wrapper is based on a gRPC client communicating with the gRPC server
 
 ## Important Notes
 
-- Python 3.6+ is required (because the wrapper is based on [asyncio](https://docs.python.org/3.7/library/asyncio.html)).
+- Python 3.7+ is required (because the wrapper is based on [asyncio](https://docs.python.org/3.7/library/asyncio.html)).
 - You may need to run `pip3` instead of `pip` and `python3` instead of `python`, depending of your system defaults.
 - Auterion has a [Getting started with MAVSDK-Python](https://auterion.com/getting-started-with-mavsdk-python/) guide if you're a beginner and not sure where to start.
 
diff --git a/examples/calibration.py b/examples/calibration.py
@@ -31,5 +31,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/camera.py b/examples/camera.py
@@ -56,5 +56,5 @@ async def print_status(drone):
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/camera_params.py b/examples/camera_params.py
@@ -185,5 +185,5 @@ async def make_user_choose_option_range(possible_options):
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/failure_injection.py b/examples/failure_injection.py
@@ -59,5 +59,5 @@ async def run():
     await drone.param.set_param_int('SYS_FAILURE_EN', 0)
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/firmware_version.py b/examples/firmware_version.py
@@ -19,5 +19,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/follow_me_example.py b/examples/follow_me_example.py
@@ -64,5 +64,5 @@ async def fly_drone():
     await drone.action.land()
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(fly_drone())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/geofence.py b/examples/geofence.py
@@ -7,7 +7,7 @@
 """
 This example shows how to use the geofence plugin.
 
-Note: The behavior when your vehicle hits the geofence is NOT configured in this example. 
+Note: The behavior when your vehicle hits the geofence is NOT configured in this example.
 
 """
 
@@ -51,5 +51,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/gimbal.py b/examples/gimbal.py
@@ -83,6 +83,5 @@ async def print_gimbal_position(drone):
 
 
 if __name__ == "__main__":
-    # Start the main function
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/goto.py b/examples/goto.py
@@ -43,5 +43,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/logfile_download.py b/examples/logfile_download.py
@@ -42,4 +42,5 @@ async def get_entries(drone):
 
 
 if __name__ == "__main__":
-    asyncio.get_event_loop().run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/manual_control.py b/examples/manual_control.py
@@ -91,6 +91,5 @@ async def manual_controls():
 
 
 if __name__ == "__main__":
-
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(manual_controls())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/mission.py b/examples/mission.py
@@ -116,5 +116,5 @@ async def observe_is_in_air(drone, running_tasks):
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/mission_import.py b/examples/mission_import.py
@@ -24,5 +24,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/offboard_attitude.py b/examples/offboard_attitude.py
@@ -72,5 +72,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/offboard_position_ned.py b/examples/offboard_position_ned.py
@@ -71,5 +71,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/offboard_position_velocity_ned.py b/examples/offboard_position_velocity_ned.py
@@ -64,5 +64,5 @@ async def print_z_velocity(drone):
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/offboard_velocity_body.py b/examples/offboard_velocity_body.py
@@ -86,5 +86,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/offboard_velocity_ned.py b/examples/offboard_velocity_ned.py
@@ -79,5 +79,5 @@ async def run():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/send_status_message.py b/examples/send_status_message.py
@@ -29,5 +29,5 @@ async def run():
             break
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/takeoff_and_land.py b/examples/takeoff_and_land.py
@@ -47,5 +47,5 @@ async def print_status_text(drone):
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/takeoff_and_land_keyboard_control.py b/examples/takeoff_and_land_keyboard_control.py
@@ -1,6 +1,4 @@
-"""
-Author: @woosal1337
-"""
+#!/usr/bin/env python3
 
 import asyncio
 import pygame
@@ -148,6 +146,7 @@ async def print_position(drone=drone):
 
 if __name__ == "__main__":
 
+    # TODO: use new asyncio methods
     loop = asyncio.get_event_loop()
     loop.run_until_complete(setup())
     loop.run_until_complete(main())
diff --git a/examples/telemetry.py b/examples/telemetry.py
@@ -36,8 +36,5 @@ async def print_position(drone):
 
 
 if __name__ == "__main__":
-    # Start the main function
-    asyncio.ensure_future(run())
-
-    # Runs the event loop until the program is canceled with e.g. CTRL-C
-    asyncio.get_event_loop().run_forever()
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/telemetry_flight_mode.py b/examples/telemetry_flight_mode.py
@@ -19,5 +19,5 @@ async def print_flight_mode():
 
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(print_flight_mode())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/telemetry_is_armed_is_in_air.py b/examples/telemetry_is_armed_is_in_air.py
@@ -23,8 +23,5 @@ async def print_is_in_air(drone):
 
 
 if __name__ == "__main__":
-    # Start the main function
-    asyncio.ensure_future(run())
-
-    # Runs the event loop until the program is canceled with e.g. CTRL-C
-    asyncio.get_event_loop().run_forever()
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/telemetry_takeoff_and_land.py b/examples/telemetry_takeoff_and_land.py
@@ -108,4 +108,5 @@ async def observe_is_in_air(drone, running_tasks):
 
 
 if __name__ == "__main__":
-    asyncio.get_event_loop().run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/transponder.py b/examples/transponder.py
@@ -9,7 +9,7 @@ async def run():
     drone = System()
     #await drone.connect(system_address="udp://:14540")
     await drone.connect()
-    
+
     # Start the tasks
     asyncio.ensure_future(print_transponders(drone))
 
@@ -19,8 +19,5 @@ async def print_transponders(drone):
 
 
 if __name__ == "__main__":
-    # Start the main function
-    asyncio.ensure_future(run())
-
-    # Runs the event loop until the program is canceled with e.g. CTRL-C
-    asyncio.get_event_loop().run_forever()
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/examples/tune.py b/examples/tune.py
@@ -64,5 +64,5 @@ async def run():
     print("Tune played")
 
 if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run())
+    # Run the asyncio loop
+    asyncio.run(run())
diff --git a/mavsdk/log_files.py b/mavsdk/log_files.py
@@ -431,52 +431,6 @@ async def download_log_file(self, entry, path):
         finally:
             download_log_file_stream.cancel()
 
-    async def download_log_file(self, entry, path):
-        """
-         Download log file synchronously.
-
-         Parameters
-         ----------
-         entry : Entry
-              Entry of the log file to download.
-
-         path : std::string
-              Path of where to download log file to.
-
-         Returns
-         -------
-         progress : ProgressData
-              Progress if result is progress
-
-         Raises
-         ------
-         LogFilesError
-             If the request fails. The error contains the reason for the failure.
-        """
-
-        request = log_files_pb2.DownloadLogFileRequest()
-        
-            
-                
-        entry.translate_to_rpc(request.entry)
-                
-            
-        
-            
-        request.path = path
-            
-        response = await self._stub.DownloadLogFile(request)
-
-        
-        result = self._extract_result(response)
-
-        if result.result != LogFilesResult.Result.SUCCESS:
-            raise LogFilesError(result, "download_log_file()", entry, path)
-        
-
-        return ProgressData.translate_from_rpc(response.progress)
-            
-
     async def erase_all_log_files(self):
         """
          Erase all log files.
diff --git a/mavsdk/log_files_pb2.py b/mavsdk/log_files_pb2.py
diff --git a/mavsdk/log_files_pb2_grpc.py b/mavsdk/log_files_pb2_grpc.py
diff --git a/mavsdk/source/index.rst b/mavsdk/source/index.rst
diff --git a/proto b/proto
diff --git a/setup.py b/setup.py
