Merge branch 'develop' into remove-debug-appveyor

mavlink · Oct 29, 2019 · af4a5cf · af4a5cf
2 parents eb4125e + 3a886ba
commit af4a5cf
Show file tree

Hide file tree

Showing 31 changed files with 15,007 additions and 68 deletions.
diff --git a/proto b/proto
diff --git a/src/backend/src/CMakeLists.txt b/src/backend/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 
-set(COMPONENTS_LIST action calibration camera core geofence gimbal info mission offboard param telemetry)
+set(COMPONENTS_LIST action calibration camera core geofence gimbal info mission mocap offboard param shell telemetry)
 
 foreach(COMPONENT_NAME ${COMPONENTS_LIST})
     add_library(${COMPONENT_NAME}_proto_gens STATIC
@@ -51,6 +51,8 @@ target_link_libraries(mavsdk_server
     mavsdk_telemetry
     mavsdk_info
     mavsdk_param
+    mavsdk_shell
+    mavsdk_mocap
     mavsdk
     gRPC::grpc++
     ${COMPONENTS_PROTOGENS}

diff --git a/src/backend/src/core/core_service_impl.h b/src/backend/src/core/core_service_impl.h
@@ -49,15 +49,17 @@ class CoreServiceImpl final : public mavsdk::rpc::core::CoreService::Service {
         const rpc::core::ListRunningPluginsRequest* /* request */,
         mavsdk::rpc::core::ListRunningPluginsResponse* response) override
     {
-        std::string plugin_names[10] = {"action",
+        std::string plugin_names[12] = {"action",
                                         "calibration",
                                         "camera",
                                         "core",
                                         "gimbal",
                                         "info",
                                         "mission",
+                                        "mocap",
                                         "offboard",
                                         "param",
+                                        "shell",
                                         "telemetry"};
 
         for (const auto plugin_name : plugin_names) {

diff --git a/src/backend/src/generated/mocap/mocap.grpc.pb.cc b/src/backend/src/generated/mocap/mocap.grpc.pb.cc