Skip to content

Commit

Permalink
Merge pull request #485 from mavlink/update-to-mavsdk-server-1.4.2
Browse files Browse the repository at this point in the history
Bump mavsdk_server to 1.4.3
  • Loading branch information
JonasVautherin authored Jun 24, 2022
2 parents 253b1c8 + 3ba0f2a commit 074433c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
2 changes: 1 addition & 1 deletion MAVSDK_SERVER_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.3.1
v1.4.3
30 changes: 23 additions & 7 deletions mavsdk/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
from . import action_server
from . import calibration
from . import camera
from . import core
from . import camera_server
from . import component_information
from . import component_information_server
from . import core
from . import failure
from . import follow_me
from . import ftp
Expand All @@ -27,6 +28,7 @@
from . import offboard
from . import param
from . import param_server
from . import rtk
from . import server_utility
from . import shell
from . import telemetry
Expand Down Expand Up @@ -130,9 +132,10 @@ async def _init_plugins(self, host, port):
self._plugins["action_server"] = action_server.ActionServer(plugin_manager)
self._plugins["calibration"] = calibration.Calibration(plugin_manager)
self._plugins["camera"] = camera.Camera(plugin_manager)
self._plugins["core"] = core.Core(plugin_manager)
self._plugins["camera_server"] = camera_server.CameraServer(plugin_manager)
self._plugins["component_information"] = component_information.ComponentInformation(plugin_manager)
self._plugins["component_information_server"] = component_information_server.ComponentInformationServer(plugin_manager)
self._plugins["core"] = core.Core(plugin_manager)
self._plugins["failure"] = failure.Failure(plugin_manager)
self._plugins["follow_me"] = follow_me.FollowMe(plugin_manager)
self._plugins["ftp"] = ftp.Ftp(plugin_manager)
Expand All @@ -148,6 +151,7 @@ async def _init_plugins(self, host, port):
self._plugins["offboard"] = offboard.Offboard(plugin_manager)
self._plugins["param"] = param.Param(plugin_manager)
self._plugins["param_server"] = param_server.ParamServer(plugin_manager)
self._plugins["rtk"] = rtk.Rtk(plugin_manager)
self._plugins["server_utility"] = server_utility.ServerUtility(plugin_manager)
self._plugins["shell"] = shell.Shell(plugin_manager)
self._plugins["telemetry"] = telemetry.Telemetry(plugin_manager)
Expand All @@ -158,7 +162,7 @@ async def _init_plugins(self, host, port):

@staticmethod
def error_uninitialized(plugin_name: str) -> str:
return "{plugin_name} plugin has not been initialized!" \
return "{plugin_name} plugin has not been initialized! " \
"Did you run `System.connect()`?"

@property
Expand Down Expand Up @@ -186,10 +190,10 @@ def camera(self) -> camera.Camera:
return self._plugins["camera"]

@property
def core(self) -> core.Core:
if "core" not in self._plugins:
raise RuntimeError(self.error_uninitialized("Core"))
return self._plugins["core"]
def camera_server(self) -> camera_server.CameraServer:
if "camera_server" not in self._plugins:
raise RuntimeError(self.error_uninitialized("CameraServer"))
return self._plugins["camera_server"]

@property
def component_information(self) -> component_information.ComponentInformation:
Expand All @@ -203,6 +207,12 @@ def component_information_server(self) -> component_information_server.Component
raise RuntimeError(self.error_uninitialized("ComponentInformationServer"))
return self._plugins["component_informationServer"]

@property
def core(self) -> core.Core:
if "core" not in self._plugins:
raise RuntimeError(self.error_uninitialized("Core"))
return self._plugins["core"]

@property
def failure(self) -> failure.Failure:
if "failure" not in self._plugins:
Expand Down Expand Up @@ -293,6 +303,12 @@ def param_server(self) -> param_server.ParamServer:
raise RuntimeError(self.error_uninitialized("ParamServer"))
return self._plugins["param_server"]

@property
def rtk(self) -> rtk.Rtk:
if "rtk" not in self._plugins:
raise RuntimeError(self.error_uninitialized("Rtk"))
return self._plugins["rtk"]

@property
def server_utility(self) -> server_utility.ServerUtility:
if "server_utility" not in self._plugins:
Expand Down
2 changes: 1 addition & 1 deletion proto
Submodule proto updated from b9a1c1 to 743aa1

0 comments on commit 074433c

Please sign in to comment.