From 3ba0f2a45fc07e32a5b453af6ab1d0b822059cd3 Mon Sep 17 00:00:00 2001
From: Jonas Vautherin <jonas.vautherin@gmail.com>
Date: Wed, 22 Jun 2022 22:25:29 +0200
Subject: [PATCH] Bump mavsdk_server to 1.4.3

---
 MAVSDK_SERVER_VERSION |  2 +-
 mavsdk/system.py      | 30 +++++++++++++++++++++++-------
 proto                 |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/MAVSDK_SERVER_VERSION b/MAVSDK_SERVER_VERSION
index 75740798..92f76b42 100644
--- a/MAVSDK_SERVER_VERSION
+++ b/MAVSDK_SERVER_VERSION
@@ -1 +1 @@
-v1.3.1
+v1.4.3
diff --git a/mavsdk/system.py b/mavsdk/system.py
index 948c82a0..bb0b7d79 100644
--- a/mavsdk/system.py
+++ b/mavsdk/system.py
@@ -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
@@ -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
@@ -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)
@@ -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)
@@ -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
@@ -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:
@@ -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:
@@ -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:
diff --git a/proto b/proto
index b9a1c1a5..743aa1d2 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit b9a1c1a51fc3344ee914d0d625f1eafc4189660f
+Subproject commit 743aa1d24094db30ac3ed503d9552fb9c49ef4c4