From 804bf018a66013a2637372ac6dfeae4bd0cb8c1d Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 10:16:31 +0200 Subject: [PATCH 01/15] core: rename files dronecode_sdk -> mavsdk --- src/core/CMakeLists.txt | 6 +++--- src/core/{dronecode_sdk.cpp => mavsdk.cpp} | 0 src/core/{dronecode_sdk.h => mavsdk.h} | 0 src/core/{dronecode_sdk_impl.cpp => mavsdk_impl.cpp} | 0 src/core/{dronecode_sdk_impl.h => mavsdk_impl.h} | 0 src/core/mocks/{dronecode_sdk_mock.h => mavsdk_mock.h} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename src/core/{dronecode_sdk.cpp => mavsdk.cpp} (100%) rename src/core/{dronecode_sdk.h => mavsdk.h} (100%) rename src/core/{dronecode_sdk_impl.cpp => mavsdk_impl.cpp} (100%) rename src/core/{dronecode_sdk_impl.h => mavsdk_impl.h} (100%) rename src/core/mocks/{dronecode_sdk_mock.h => mavsdk_mock.h} (100%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7dd08ede14..7746da593e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -12,8 +12,8 @@ add_library(dronecode_sdk curl_wrapper.cpp system.cpp system_impl.cpp - dronecode_sdk.cpp - dronecode_sdk_impl.cpp + mavsdk.cpp + mavsdk_impl.cpp global_include.cpp http_loader.cpp mavlink_parameters.cpp @@ -78,7 +78,7 @@ install(TARGETS dronecode_sdk install(FILES connection_result.h system.h - dronecode_sdk.h + mavsdk.h plugin_base.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk" ) diff --git a/src/core/dronecode_sdk.cpp b/src/core/mavsdk.cpp similarity index 100% rename from src/core/dronecode_sdk.cpp rename to src/core/mavsdk.cpp diff --git a/src/core/dronecode_sdk.h b/src/core/mavsdk.h similarity index 100% rename from src/core/dronecode_sdk.h rename to src/core/mavsdk.h diff --git a/src/core/dronecode_sdk_impl.cpp b/src/core/mavsdk_impl.cpp similarity index 100% rename from src/core/dronecode_sdk_impl.cpp rename to src/core/mavsdk_impl.cpp diff --git a/src/core/dronecode_sdk_impl.h b/src/core/mavsdk_impl.h similarity index 100% rename from src/core/dronecode_sdk_impl.h rename to src/core/mavsdk_impl.h diff --git a/src/core/mocks/dronecode_sdk_mock.h b/src/core/mocks/mavsdk_mock.h similarity index 100% rename from src/core/mocks/dronecode_sdk_mock.h rename to src/core/mocks/mavsdk_mock.h From 5b3f10aee8039f6b6a06403462d8596897b51e6b Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 10:17:05 +0200 Subject: [PATCH 02/15] backend: rename files dronecode_sdk -> mavsdk --- src/backend/src/CMakeLists.txt | 2 +- src/backend/src/{dronecode_sdk_server.cpp => mavsdk_server.cpp} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/backend/src/{dronecode_sdk_server.cpp => mavsdk_server.cpp} (100%) diff --git a/src/backend/src/CMakeLists.txt b/src/backend/src/CMakeLists.txt index 71cb16a16f..5d47adfeb6 100644 --- a/src/backend/src/CMakeLists.txt +++ b/src/backend/src/CMakeLists.txt @@ -75,7 +75,7 @@ if(IOS) ) else() add_executable(backend_bin - dronecode_sdk_server.cpp + mavsdk_server.cpp ) target_link_libraries(backend_bin diff --git a/src/backend/src/dronecode_sdk_server.cpp b/src/backend/src/mavsdk_server.cpp similarity index 100% rename from src/backend/src/dronecode_sdk_server.cpp rename to src/backend/src/mavsdk_server.cpp From 8bfae258e1b1583e6bd822849a6b5c19ef9e2200 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 10:41:05 +0200 Subject: [PATCH 03/15] src: include dronecode_sdk -> mavsdk --- src/backend/src/backend.cpp | 2 +- src/backend/src/core/core_service_impl.h | 2 +- src/backend/src/grpc_server.h | 2 +- src/core/connection.cpp | 2 +- src/core/connection.h | 2 +- src/core/curl_test.cpp | 2 +- src/core/http_loader_test.cpp | 2 +- src/core/mavsdk.cpp | 4 ++-- src/core/mavsdk_impl.cpp | 2 +- src/core/mavsdk_impl.h | 2 +- src/core/system.cpp | 2 +- src/core/system_impl.cpp | 2 +- src/core/unittests_main.cpp | 2 +- src/debug_helpers/drop_debug_main.cpp | 2 +- src/external_example/integration_tests/hello_world.cpp | 2 +- src/external_example/plugins/example/example_impl_test.cpp | 2 +- src/integration_tests/action_goto.cpp | 2 +- src/integration_tests/action_hover_async.cpp | 2 +- src/integration_tests/action_hover_sync.cpp | 2 +- src/integration_tests/action_takeoff_and_kill.cpp | 2 +- .../action_transition_multicopter_fixedwing.cpp | 2 +- src/integration_tests/calibration.cpp | 2 +- src/integration_tests/camera_format.cpp | 2 +- src/integration_tests/camera_mode.cpp | 2 +- src/integration_tests/camera_settings.cpp | 2 +- src/integration_tests/camera_status.cpp | 2 +- src/integration_tests/camera_take_photo.cpp | 2 +- src/integration_tests/camera_take_photo_interval.cpp | 2 +- src/integration_tests/camera_test_helpers.h | 2 +- src/integration_tests/follow_me.cpp | 2 +- src/integration_tests/geofence_inclusion.cpp | 2 +- src/integration_tests/gimbal.cpp | 2 +- src/integration_tests/info.cpp | 2 +- src/integration_tests/log_files.cpp | 2 +- src/integration_tests/logging.cpp | 2 +- src/integration_tests/mavlink_passthrough.cpp | 2 +- src/integration_tests/mission.cpp | 2 +- src/integration_tests/mission_cancellation.cpp | 2 +- src/integration_tests/mission_change_speed.cpp | 2 +- src/integration_tests/mission_raw_mission_changed.cpp | 2 +- src/integration_tests/mission_rtl.cpp | 2 +- src/integration_tests/mission_transfer_lossy.cpp | 2 +- src/integration_tests/offboard_attitude.cpp | 2 +- src/integration_tests/offboard_position.cpp | 2 +- src/integration_tests/offboard_velocity.cpp | 2 +- src/integration_tests/param.cpp | 2 +- src/integration_tests/path_checker.h | 2 +- src/integration_tests/system_connection_async.cpp | 2 +- src/integration_tests/system_connection_sync.cpp | 2 +- src/integration_tests/system_multi_components.cpp | 2 +- src/integration_tests/telemetry_async.cpp | 2 +- src/integration_tests/telemetry_health.cpp | 2 +- src/integration_tests/telemetry_modes.cpp | 2 +- src/integration_tests/telemetry_sync.cpp | 2 +- src/plugins/action/action_impl.cpp | 2 +- src/plugins/log_files/log_files_impl.cpp | 2 +- src/plugins/logging/logging_impl.cpp | 2 +- src/plugins/offboard/offboard_impl.cpp | 2 +- 58 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/backend/src/backend.cpp b/src/backend/src/backend.cpp index 8b335aba88..1e9fe07243 100644 --- a/src/backend/src/backend.cpp +++ b/src/backend/src/backend.cpp @@ -3,7 +3,7 @@ #include #include "connection_initiator.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "grpc_server.h" namespace dronecode_sdk { diff --git a/src/backend/src/core/core_service_impl.h b/src/backend/src/core/core_service_impl.h index ee12e6e844..494576847c 100644 --- a/src/backend/src/core/core_service_impl.h +++ b/src/backend/src/core/core_service_impl.h @@ -2,7 +2,7 @@ #include #include "core/core.grpc.pb.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" namespace dronecode_sdk { namespace backend { diff --git a/src/backend/src/grpc_server.h b/src/backend/src/grpc_server.h index 4dcd1f998b..21564033da 100644 --- a/src/backend/src/grpc_server.h +++ b/src/backend/src/grpc_server.h @@ -11,7 +11,7 @@ #include "plugins/camera/camera.h" #include "camera/camera_service_impl.h" #include "core/core_service_impl.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/mission/mission.h" #include "mission/mission_service_impl.h" #include "telemetry/telemetry_service_impl.h" diff --git a/src/core/connection.cpp b/src/core/connection.cpp index 465ff83176..acd190df3f 100644 --- a/src/core/connection.cpp +++ b/src/core/connection.cpp @@ -1,5 +1,5 @@ #include "connection.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include "mavlink_channels.h" #include "global_include.h" diff --git a/src/core/connection.h b/src/core/connection.h index 0097a5fdfc..8cb35c601c 100644 --- a/src/core/connection.h +++ b/src/core/connection.h @@ -1,6 +1,6 @@ #pragma once -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "mavlink_receiver.h" #include diff --git a/src/core/curl_test.cpp b/src/core/curl_test.cpp index d280d990bb..61c15ec6b8 100644 --- a/src/core/curl_test.cpp +++ b/src/core/curl_test.cpp @@ -1,4 +1,4 @@ -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "curl_wrapper.h" #include #include diff --git a/src/core/http_loader_test.cpp b/src/core/http_loader_test.cpp index 3504e6af0b..76f9af5d99 100644 --- a/src/core/http_loader_test.cpp +++ b/src/core/http_loader_test.cpp @@ -1,4 +1,4 @@ -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "http_loader.h" #include "curl_include.h" #include diff --git a/src/core/mavsdk.cpp b/src/core/mavsdk.cpp index 23cc197b54..f8b383ef48 100644 --- a/src/core/mavsdk.cpp +++ b/src/core/mavsdk.cpp @@ -1,6 +1,6 @@ -#include "dronecode_sdk.h" +#include "mavsdk.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include "global_include.h" namespace dronecode_sdk { diff --git a/src/core/mavsdk_impl.cpp b/src/core/mavsdk_impl.cpp index 635aacc0f4..02e36e2649 100644 --- a/src/core/mavsdk_impl.cpp +++ b/src/core/mavsdk_impl.cpp @@ -1,4 +1,4 @@ -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include diff --git a/src/core/mavsdk_impl.h b/src/core/mavsdk_impl.h index 233dd988a6..66579179ee 100644 --- a/src/core/mavsdk_impl.h +++ b/src/core/mavsdk_impl.h @@ -6,7 +6,7 @@ #include #include "connection.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "system.h" #include "mavlink_include.h" diff --git a/src/core/system.cpp b/src/core/system.cpp index 7d19c0544d..07d13d77f7 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1,6 +1,6 @@ #include "system.h" #include "global_include.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include "mavlink_include.h" #include "system_impl.h" #include "plugin_impl_base.h" diff --git a/src/core/system_impl.cpp b/src/core/system_impl.cpp index c69cf9eeea..164231b088 100644 --- a/src/core/system_impl.cpp +++ b/src/core/system_impl.cpp @@ -1,6 +1,6 @@ #include "system.h" #include "global_include.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include "mavlink_include.h" #include "system_impl.h" #include "plugin_impl_base.h" diff --git a/src/core/unittests_main.cpp b/src/core/unittests_main.cpp index ef6557758c..46b789c7dd 100644 --- a/src/core/unittests_main.cpp +++ b/src/core/unittests_main.cpp @@ -1,6 +1,6 @@ #include #include -#include "dronecode_sdk.h" +#include "mavsdk.h" using namespace dronecode_sdk; diff --git a/src/debug_helpers/drop_debug_main.cpp b/src/debug_helpers/drop_debug_main.cpp index cd7d385bac..f9956f61ac 100644 --- a/src/debug_helpers/drop_debug_main.cpp +++ b/src/debug_helpers/drop_debug_main.cpp @@ -1,6 +1,6 @@ #include #include -#include "dronecode_sdk.h" +#include "mavsdk.h" #include #if DROP_DEBUG != 1 diff --git a/src/external_example/integration_tests/hello_world.cpp b/src/external_example/integration_tests/hello_world.cpp index 0b280f8b02..c9de247e0b 100644 --- a/src/external_example/integration_tests/hello_world.cpp +++ b/src/external_example/integration_tests/hello_world.cpp @@ -1,6 +1,6 @@ #include #include -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/example/example.h" #include "integration_test_helper.h" diff --git a/src/external_example/plugins/example/example_impl_test.cpp b/src/external_example/plugins/example/example_impl_test.cpp index 3dae4829b4..42982faf21 100644 --- a/src/external_example/plugins/example/example_impl_test.cpp +++ b/src/external_example/plugins/example/example_impl_test.cpp @@ -1,5 +1,5 @@ #include "example_impl.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "global_include.h" #include diff --git a/src/integration_tests/action_goto.cpp b/src/integration_tests/action_goto.cpp index e4c0e2332b..3f394d64cd 100644 --- a/src/integration_tests/action_goto.cpp +++ b/src/integration_tests/action_goto.cpp @@ -1,7 +1,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" diff --git a/src/integration_tests/action_hover_async.cpp b/src/integration_tests/action_hover_async.cpp index 1c0f6e4ce0..24cf9d695b 100644 --- a/src/integration_tests/action_hover_async.cpp +++ b/src/integration_tests/action_hover_async.cpp @@ -1,6 +1,6 @@ #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" diff --git a/src/integration_tests/action_hover_sync.cpp b/src/integration_tests/action_hover_sync.cpp index 40bf72ba79..4bbddafab1 100644 --- a/src/integration_tests/action_hover_sync.cpp +++ b/src/integration_tests/action_hover_sync.cpp @@ -1,7 +1,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" diff --git a/src/integration_tests/action_takeoff_and_kill.cpp b/src/integration_tests/action_takeoff_and_kill.cpp index 0630c4bb88..1ad7e8ee7e 100644 --- a/src/integration_tests/action_takeoff_and_kill.cpp +++ b/src/integration_tests/action_takeoff_and_kill.cpp @@ -1,6 +1,6 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" diff --git a/src/integration_tests/action_transition_multicopter_fixedwing.cpp b/src/integration_tests/action_transition_multicopter_fixedwing.cpp index 182e5a2c56..d5347c0327 100644 --- a/src/integration_tests/action_transition_multicopter_fixedwing.cpp +++ b/src/integration_tests/action_transition_multicopter_fixedwing.cpp @@ -1,6 +1,6 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" diff --git a/src/integration_tests/calibration.cpp b/src/integration_tests/calibration.cpp index b0cbeeb808..f525182a5a 100644 --- a/src/integration_tests/calibration.cpp +++ b/src/integration_tests/calibration.cpp @@ -2,7 +2,7 @@ #include #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/calibration/calibration.h" #include "plugins/param/param.h" #include "plugins/telemetry/telemetry.h" diff --git a/src/integration_tests/camera_format.cpp b/src/integration_tests/camera_format.cpp index 14bd30935d..e0ef71c218 100644 --- a/src/integration_tests/camera_format.cpp +++ b/src/integration_tests/camera_format.cpp @@ -1,5 +1,5 @@ #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include #include #include diff --git a/src/integration_tests/camera_mode.cpp b/src/integration_tests/camera_mode.cpp index 5f81fb1411..32a00f1e42 100644 --- a/src/integration_tests/camera_mode.cpp +++ b/src/integration_tests/camera_mode.cpp @@ -2,7 +2,7 @@ #include #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "system.h" #include "camera_test_helpers.h" diff --git a/src/integration_tests/camera_settings.cpp b/src/integration_tests/camera_settings.cpp index d869d922b0..ecb7d450f4 100644 --- a/src/integration_tests/camera_settings.cpp +++ b/src/integration_tests/camera_settings.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "system.h" #include "integration_test_helper.h" #include "camera_test_helpers.h" diff --git a/src/integration_tests/camera_status.cpp b/src/integration_tests/camera_status.cpp index d381b41538..7ab3a4aff9 100644 --- a/src/integration_tests/camera_status.cpp +++ b/src/integration_tests/camera_status.cpp @@ -1,5 +1,5 @@ #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include #include #include diff --git a/src/integration_tests/camera_take_photo.cpp b/src/integration_tests/camera_take_photo.cpp index d6c3a34557..5acda8050f 100644 --- a/src/integration_tests/camera_take_photo.cpp +++ b/src/integration_tests/camera_take_photo.cpp @@ -5,7 +5,7 @@ #include #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "system.h" #include "camera_test_helpers.h" diff --git a/src/integration_tests/camera_take_photo_interval.cpp b/src/integration_tests/camera_take_photo_interval.cpp index 3d574668ff..d61310afde 100644 --- a/src/integration_tests/camera_take_photo_interval.cpp +++ b/src/integration_tests/camera_take_photo_interval.cpp @@ -5,7 +5,7 @@ #include #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "system.h" #include "camera_test_helpers.h" diff --git a/src/integration_tests/camera_test_helpers.h b/src/integration_tests/camera_test_helpers.h index dc9d38e145..0e2de4bd56 100644 --- a/src/integration_tests/camera_test_helpers.h +++ b/src/integration_tests/camera_test_helpers.h @@ -1,6 +1,6 @@ #pragma once -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/camera/camera.h" dronecode_sdk::Camera::Mode get_mode(std::shared_ptr camera); diff --git a/src/integration_tests/follow_me.cpp b/src/integration_tests/follow_me.cpp index 3a5378f1f5..7feff228ff 100644 --- a/src/integration_tests/follow_me.cpp +++ b/src/integration_tests/follow_me.cpp @@ -5,7 +5,7 @@ #include #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" #include "plugins/action/action.h" #include "plugins/follow_me/follow_me.h" diff --git a/src/integration_tests/geofence_inclusion.cpp b/src/integration_tests/geofence_inclusion.cpp index 341f7e8c96..16bb26d5cc 100644 --- a/src/integration_tests/geofence_inclusion.cpp +++ b/src/integration_tests/geofence_inclusion.cpp @@ -3,7 +3,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" #include "plugins/geofence/geofence.h" diff --git a/src/integration_tests/gimbal.cpp b/src/integration_tests/gimbal.cpp index b2e6ba4f83..741019e1b2 100644 --- a/src/integration_tests/gimbal.cpp +++ b/src/integration_tests/gimbal.cpp @@ -4,7 +4,7 @@ #include #include -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "integration_test_helper.h" #include "plugins/action/action.h" #include "plugins/gimbal/gimbal.h" diff --git a/src/integration_tests/info.cpp b/src/integration_tests/info.cpp index 342222be5b..2f30afb77b 100644 --- a/src/integration_tests/info.cpp +++ b/src/integration_tests/info.cpp @@ -1,6 +1,6 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/info/info.h" using namespace dronecode_sdk; diff --git a/src/integration_tests/log_files.cpp b/src/integration_tests/log_files.cpp index a07edfd8c2..8860fe252e 100644 --- a/src/integration_tests/log_files.cpp +++ b/src/integration_tests/log_files.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "integration_test_helper.h" #include "plugins/log_files/log_files.h" diff --git a/src/integration_tests/logging.cpp b/src/integration_tests/logging.cpp index 98b2cb951f..0a3035eb89 100644 --- a/src/integration_tests/logging.cpp +++ b/src/integration_tests/logging.cpp @@ -1,5 +1,5 @@ #include -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "integration_test_helper.h" #include "plugins/logging/logging.h" diff --git a/src/integration_tests/mavlink_passthrough.cpp b/src/integration_tests/mavlink_passthrough.cpp index d85df9b477..e675aa9b24 100644 --- a/src/integration_tests/mavlink_passthrough.cpp +++ b/src/integration_tests/mavlink_passthrough.cpp @@ -2,7 +2,7 @@ #include #include "log.h" #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/mavlink_passthrough/mavlink_passthrough.h" using namespace dronecode_sdk; diff --git a/src/integration_tests/mission.cpp b/src/integration_tests/mission.cpp index 29a619c234..2377b4f4ee 100644 --- a/src/integration_tests/mission.cpp +++ b/src/integration_tests/mission.cpp @@ -5,7 +5,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" #include "plugins/action/action.h" #include "plugins/mission/mission.h" diff --git a/src/integration_tests/mission_cancellation.cpp b/src/integration_tests/mission_cancellation.cpp index afe18a4d86..1dad3ff6bf 100644 --- a/src/integration_tests/mission_cancellation.cpp +++ b/src/integration_tests/mission_cancellation.cpp @@ -4,7 +4,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" #include "plugins/action/action.h" #include "plugins/mission/mission.h" diff --git a/src/integration_tests/mission_change_speed.cpp b/src/integration_tests/mission_change_speed.cpp index 326de15447..12fd4430b7 100644 --- a/src/integration_tests/mission_change_speed.cpp +++ b/src/integration_tests/mission_change_speed.cpp @@ -4,7 +4,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" #include "plugins/action/action.h" #include "plugins/mission/mission.h" diff --git a/src/integration_tests/mission_raw_mission_changed.cpp b/src/integration_tests/mission_raw_mission_changed.cpp index bd32b1e5bd..fb5567035e 100644 --- a/src/integration_tests/mission_raw_mission_changed.cpp +++ b/src/integration_tests/mission_raw_mission_changed.cpp @@ -1,5 +1,5 @@ #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/mission/mission.h" #include "plugins/mission_raw/mission_raw.h" #include diff --git a/src/integration_tests/mission_rtl.cpp b/src/integration_tests/mission_rtl.cpp index 76c6ef0a2d..fb2a218b43 100644 --- a/src/integration_tests/mission_rtl.cpp +++ b/src/integration_tests/mission_rtl.cpp @@ -6,7 +6,7 @@ #include #include "integration_test_helper.h" #include "path_checker.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" #include "plugins/action/action.h" #include "plugins/mission/mission.h" diff --git a/src/integration_tests/mission_transfer_lossy.cpp b/src/integration_tests/mission_transfer_lossy.cpp index 37086268b6..df392dc2e6 100644 --- a/src/integration_tests/mission_transfer_lossy.cpp +++ b/src/integration_tests/mission_transfer_lossy.cpp @@ -3,7 +3,7 @@ #include #include "log.h" #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/mission/mission.h" #include "plugins/mavlink_passthrough/mavlink_passthrough.h" diff --git a/src/integration_tests/offboard_attitude.cpp b/src/integration_tests/offboard_attitude.cpp index 714eefebcd..331ca47180 100644 --- a/src/integration_tests/offboard_attitude.cpp +++ b/src/integration_tests/offboard_attitude.cpp @@ -1,7 +1,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" #include "plugins/offboard/offboard.h" diff --git a/src/integration_tests/offboard_position.cpp b/src/integration_tests/offboard_position.cpp index ecead774ab..1652a27702 100644 --- a/src/integration_tests/offboard_position.cpp +++ b/src/integration_tests/offboard_position.cpp @@ -1,7 +1,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" #include "plugins/offboard/offboard.h" diff --git a/src/integration_tests/offboard_velocity.cpp b/src/integration_tests/offboard_velocity.cpp index 98e9f6be4e..7fcb0a5ea1 100644 --- a/src/integration_tests/offboard_velocity.cpp +++ b/src/integration_tests/offboard_velocity.cpp @@ -1,7 +1,7 @@ #include #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" #include "plugins/offboard/offboard.h" diff --git a/src/integration_tests/param.cpp b/src/integration_tests/param.cpp index 87647a561b..1820de1f75 100644 --- a/src/integration_tests/param.cpp +++ b/src/integration_tests/param.cpp @@ -1,6 +1,6 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/param/param.h" using namespace dronecode_sdk; diff --git a/src/integration_tests/path_checker.h b/src/integration_tests/path_checker.h index 5393420182..bde9c7ed59 100644 --- a/src/integration_tests/path_checker.h +++ b/src/integration_tests/path_checker.h @@ -1,6 +1,6 @@ #pragma once -#include "dronecode_sdk.h" +#include "mavsdk.h" #include namespace dronecode_sdk { diff --git a/src/integration_tests/system_connection_async.cpp b/src/integration_tests/system_connection_async.cpp index 330df8e799..5bc05cac47 100644 --- a/src/integration_tests/system_connection_async.cpp +++ b/src/integration_tests/system_connection_async.cpp @@ -1,7 +1,7 @@ #include #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" using namespace dronecode_sdk; using namespace std::placeholders; // for _1 diff --git a/src/integration_tests/system_connection_sync.cpp b/src/integration_tests/system_connection_sync.cpp index 0763d38194..f0f0655656 100644 --- a/src/integration_tests/system_connection_sync.cpp +++ b/src/integration_tests/system_connection_sync.cpp @@ -1,7 +1,7 @@ #include #include "integration_test_helper.h" #include "global_include.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" using namespace dronecode_sdk; diff --git a/src/integration_tests/system_multi_components.cpp b/src/integration_tests/system_multi_components.cpp index 402cd0748b..00b995d279 100644 --- a/src/integration_tests/system_multi_components.cpp +++ b/src/integration_tests/system_multi_components.cpp @@ -5,7 +5,7 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "system.h" using namespace dronecode_sdk; diff --git a/src/integration_tests/telemetry_async.cpp b/src/integration_tests/telemetry_async.cpp index 4b290eda94..8ad3693ddc 100644 --- a/src/integration_tests/telemetry_async.cpp +++ b/src/integration_tests/telemetry_async.cpp @@ -1,6 +1,6 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" #define CAMERA_AVAILABLE 0 // Set to 1 if camera is available and should be tested. diff --git a/src/integration_tests/telemetry_health.cpp b/src/integration_tests/telemetry_health.cpp index 6a267ec3d6..851ce2b978 100644 --- a/src/integration_tests/telemetry_health.cpp +++ b/src/integration_tests/telemetry_health.cpp @@ -1,6 +1,6 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" using namespace dronecode_sdk; diff --git a/src/integration_tests/telemetry_modes.cpp b/src/integration_tests/telemetry_modes.cpp index 914b8d2c30..abf3eaa3ff 100644 --- a/src/integration_tests/telemetry_modes.cpp +++ b/src/integration_tests/telemetry_modes.cpp @@ -1,5 +1,5 @@ #include -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" #include "integration_test_helper.h" diff --git a/src/integration_tests/telemetry_sync.cpp b/src/integration_tests/telemetry_sync.cpp index c51e398aa8..a3c98c298d 100644 --- a/src/integration_tests/telemetry_sync.cpp +++ b/src/integration_tests/telemetry_sync.cpp @@ -1,6 +1,6 @@ #include #include "integration_test_helper.h" -#include "dronecode_sdk.h" +#include "mavsdk.h" #include "plugins/telemetry/telemetry.h" using namespace dronecode_sdk; diff --git a/src/plugins/action/action_impl.cpp b/src/plugins/action/action_impl.cpp index e0e0d3bfd8..6f61de536a 100644 --- a/src/plugins/action/action_impl.cpp +++ b/src/plugins/action/action_impl.cpp @@ -1,5 +1,5 @@ #include "action_impl.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include "global_include.h" #include "px4_custom_mode.h" #include diff --git a/src/plugins/log_files/log_files_impl.cpp b/src/plugins/log_files/log_files_impl.cpp index cb7c6aeba2..8675d82ddb 100644 --- a/src/plugins/log_files/log_files_impl.cpp +++ b/src/plugins/log_files/log_files_impl.cpp @@ -1,6 +1,6 @@ #include "global_include.h" #include "log_files_impl.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include #include #include diff --git a/src/plugins/logging/logging_impl.cpp b/src/plugins/logging/logging_impl.cpp index 45e618c9df..7f1b4064bd 100644 --- a/src/plugins/logging/logging_impl.cpp +++ b/src/plugins/logging/logging_impl.cpp @@ -1,6 +1,6 @@ #include "global_include.h" #include "logging_impl.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include "px4_custom_mode.h" namespace dronecode_sdk { diff --git a/src/plugins/offboard/offboard_impl.cpp b/src/plugins/offboard/offboard_impl.cpp index 29696ab885..6f8dffcade 100644 --- a/src/plugins/offboard/offboard_impl.cpp +++ b/src/plugins/offboard/offboard_impl.cpp @@ -1,6 +1,6 @@ #include "global_include.h" #include "offboard_impl.h" -#include "dronecode_sdk_impl.h" +#include "mavsdk_impl.h" #include "px4_custom_mode.h" namespace dronecode_sdk { From 5b6e8b387fc04f964670b6dce5a0669e722a729e Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 10:42:29 +0200 Subject: [PATCH 04/15] src: namespace dronecode_sdk -> mavsdk --- src/backend/src/backend.cpp | 4 ++-- src/backend/src/backend.h | 4 ++-- src/backend/src/connection_initiator.h | 4 ++-- src/backend/src/core/core_service_impl.h | 4 ++-- src/backend/src/grpc_server.cpp | 4 ++-- src/backend/src/grpc_server.h | 4 ++-- src/backend/src/plugins/action/action_service_impl.h | 4 ++-- .../src/plugins/calibration/calibration_service_impl.h | 4 ++-- src/backend/src/plugins/camera/camera_service_impl.h | 4 ++-- src/backend/src/plugins/gimbal/gimbal_service_impl.h | 4 ++-- src/backend/src/plugins/info/info_service_impl.h | 4 ++-- src/backend/src/plugins/mission/mission_service_impl.h | 4 ++-- src/backend/src/plugins/offboard/offboard_service_impl.h | 4 ++-- src/backend/src/plugins/param/param_service_impl.h | 4 ++-- src/backend/src/plugins/telemetry/telemetry_service_impl.h | 4 ++-- src/core/any.h | 4 ++-- src/core/any_test.cpp | 2 +- src/core/call_every_handler.cpp | 4 ++-- src/core/call_every_handler.h | 4 ++-- src/core/call_every_handler_test.cpp | 2 +- src/core/cli_arg.cpp | 4 ++-- src/core/cli_arg.h | 4 ++-- src/core/cli_arg_test.cpp | 2 +- src/core/connection.cpp | 4 ++-- src/core/connection.h | 4 ++-- src/core/connection_result.h | 4 ++-- src/core/curl_test.cpp | 2 +- src/core/curl_wrapper.cpp | 4 ++-- src/core/curl_wrapper.h | 4 ++-- src/core/curl_wrapper_types.h | 4 ++-- src/core/error_handling.cpp | 4 ++-- src/core/global_include.cpp | 4 ++-- src/core/global_include.h | 4 ++-- src/core/global_include_test.cpp | 2 +- src/core/http_loader.cpp | 4 ++-- src/core/http_loader.h | 4 ++-- src/core/http_loader_test.cpp | 2 +- src/core/locked_queue.h | 4 ++-- src/core/locked_queue_test.cpp | 2 +- src/core/log.cpp | 4 ++-- src/core/log.h | 4 ++-- src/core/mavlink_channels.cpp | 4 ++-- src/core/mavlink_channels.h | 4 ++-- src/core/mavlink_channels_test.cpp | 2 +- src/core/mavlink_commands.cpp | 4 ++-- src/core/mavlink_commands.h | 4 ++-- src/core/mavlink_parameters.cpp | 4 ++-- src/core/mavlink_parameters.h | 4 ++-- src/core/mavlink_receiver.cpp | 4 ++-- src/core/mavlink_receiver.h | 4 ++-- src/core/mavsdk.cpp | 4 ++-- src/core/mavsdk.h | 4 ++-- src/core/mavsdk_impl.cpp | 4 ++-- src/core/mavsdk_impl.h | 4 ++-- src/core/mocks/mavsdk_mock.h | 4 ++-- src/core/plugin_base.h | 4 ++-- src/core/plugin_impl_base.cpp | 4 ++-- src/core/plugin_impl_base.h | 4 ++-- src/core/safe_queue.h | 4 ++-- src/core/serial_connection.cpp | 4 ++-- src/core/serial_connection.h | 4 ++-- src/core/system.cpp | 4 ++-- src/core/system.h | 4 ++-- src/core/system_impl.cpp | 4 ++-- src/core/system_impl.h | 4 ++-- src/core/tcp_connection.cpp | 4 ++-- src/core/tcp_connection.h | 4 ++-- src/core/thread_pool.cpp | 4 ++-- src/core/thread_pool.h | 4 ++-- src/core/thread_pool_test.cpp | 2 +- src/core/timeout_handler.cpp | 4 ++-- src/core/timeout_handler.h | 4 ++-- src/core/timeout_handler_test.cpp | 2 +- src/core/udp_connection.cpp | 4 ++-- src/core/udp_connection.h | 4 ++-- src/core/unittests_main.cpp | 2 +- src/core/version.h.in | 4 ++-- src/external_example/integration_tests/hello_world.cpp | 2 +- src/external_example/plugins/example/example.cpp | 4 ++-- src/external_example/plugins/example/example.h | 4 ++-- src/external_example/plugins/example/example_impl.cpp | 4 ++-- src/external_example/plugins/example/example_impl.h | 4 ++-- src/external_example/plugins/example/example_impl_test.cpp | 4 ++-- src/integration_tests/action_goto.cpp | 2 +- src/integration_tests/action_hover_async.cpp | 2 +- src/integration_tests/action_hover_sync.cpp | 2 +- src/integration_tests/action_takeoff_and_kill.cpp | 2 +- .../action_transition_multicopter_fixedwing.cpp | 2 +- src/integration_tests/calibration.cpp | 2 +- src/integration_tests/camera_format.cpp | 2 +- src/integration_tests/camera_mode.cpp | 2 +- src/integration_tests/camera_settings.cpp | 2 +- src/integration_tests/camera_status.cpp | 2 +- src/integration_tests/camera_take_photo.cpp | 2 +- src/integration_tests/camera_take_photo_interval.cpp | 2 +- src/integration_tests/camera_test_helpers.cpp | 2 +- src/integration_tests/follow_me.cpp | 2 +- src/integration_tests/geofence_inclusion.cpp | 2 +- src/integration_tests/gimbal.cpp | 2 +- src/integration_tests/info.cpp | 2 +- src/integration_tests/log_files.cpp | 2 +- src/integration_tests/logging.cpp | 2 +- src/integration_tests/mavlink_passthrough.cpp | 2 +- src/integration_tests/mission.cpp | 2 +- src/integration_tests/mission_cancellation.cpp | 2 +- src/integration_tests/mission_change_speed.cpp | 2 +- src/integration_tests/mission_raw_mission_changed.cpp | 2 +- src/integration_tests/mission_rtl.cpp | 2 +- src/integration_tests/mission_transfer_lossy.cpp | 2 +- src/integration_tests/offboard_attitude.cpp | 2 +- src/integration_tests/offboard_position.cpp | 2 +- src/integration_tests/offboard_velocity.cpp | 2 +- src/integration_tests/param.cpp | 2 +- src/integration_tests/path_checker.cpp | 2 +- src/integration_tests/path_checker.h | 4 ++-- src/integration_tests/system_connection_async.cpp | 2 +- src/integration_tests/system_connection_sync.cpp | 2 +- src/integration_tests/system_multi_components.cpp | 2 +- src/integration_tests/telemetry_async.cpp | 2 +- src/integration_tests/telemetry_health.cpp | 2 +- src/integration_tests/telemetry_modes.cpp | 2 +- src/integration_tests/telemetry_sync.cpp | 2 +- src/plugins/action/action.cpp | 4 ++-- src/plugins/action/action_impl.cpp | 4 ++-- src/plugins/action/action_impl.h | 4 ++-- src/plugins/action/include/plugins/action/action.h | 4 ++-- src/plugins/action/mocks/action_mock.h | 4 ++-- src/plugins/calibration/calibration.cpp | 4 ++-- src/plugins/calibration/calibration_impl.cpp | 4 ++-- src/plugins/calibration/calibration_impl.h | 4 ++-- src/plugins/calibration/calibration_statustext_parser.cpp | 4 ++-- src/plugins/calibration/calibration_statustext_parser.h | 4 ++-- .../calibration/calibration_statustext_parser_test.cpp | 2 +- .../calibration/include/plugins/calibration/calibration.h | 4 ++-- src/plugins/camera/camera.cpp | 4 ++-- src/plugins/camera/camera_definition.cpp | 4 ++-- src/plugins/camera/camera_definition.h | 4 ++-- src/plugins/camera/camera_definition_test.cpp | 2 +- src/plugins/camera/camera_impl.cpp | 4 ++-- src/plugins/camera/camera_impl.h | 4 ++-- src/plugins/camera/include/plugins/camera/camera.h | 4 ++-- src/plugins/camera/mocks/camera_mock.h | 4 ++-- src/plugins/follow_me/follow_me.cpp | 4 ++-- src/plugins/follow_me/follow_me_impl.cpp | 4 ++-- src/plugins/follow_me/follow_me_impl.h | 4 ++-- src/plugins/follow_me/include/plugins/follow_me/follow_me.h | 4 ++-- src/plugins/geofence/geofence.cpp | 4 ++-- src/plugins/geofence/geofence_impl.cpp | 4 ++-- src/plugins/geofence/geofence_impl.h | 4 ++-- src/plugins/geofence/include/plugins/geofence/geofence.h | 4 ++-- src/plugins/gimbal/gimbal.cpp | 4 ++-- src/plugins/gimbal/gimbal_impl.cpp | 4 ++-- src/plugins/gimbal/gimbal_impl.h | 4 ++-- src/plugins/gimbal/include/plugins/gimbal/gimbal.h | 4 ++-- src/plugins/info/include/plugins/info/info.h | 4 ++-- src/plugins/info/info.cpp | 4 ++-- src/plugins/info/info_impl.cpp | 4 ++-- src/plugins/info/info_impl.h | 4 ++-- src/plugins/info/mocks/info_mock.h | 4 ++-- src/plugins/log_files/include/plugins/log_files/log_files.h | 4 ++-- src/plugins/log_files/log_files.cpp | 4 ++-- src/plugins/log_files/log_files_impl.cpp | 4 ++-- src/plugins/log_files/log_files_impl.h | 4 ++-- src/plugins/logging/logging.cpp | 4 ++-- src/plugins/logging/logging.h | 4 ++-- src/plugins/logging/logging_impl.cpp | 4 ++-- src/plugins/logging/logging_impl.h | 4 ++-- .../include/plugins/mavlink_passthrough/mavlink_passthrough.h | 4 ++-- src/plugins/mavlink_passthrough/mavlink_passthrough.cpp | 4 ++-- src/plugins/mavlink_passthrough/mavlink_passthrough_impl.cpp | 4 ++-- src/plugins/mavlink_passthrough/mavlink_passthrough_impl.h | 4 ++-- src/plugins/mission/include/plugins/mission/mission.h | 4 ++-- src/plugins/mission/include/plugins/mission/mission_item.h | 4 ++-- src/plugins/mission/mission.cpp | 4 ++-- src/plugins/mission/mission_impl.cpp | 4 ++-- src/plugins/mission/mission_impl.h | 4 ++-- src/plugins/mission/mission_import_qgc_test.cpp | 2 +- src/plugins/mission/mission_item.cpp | 4 ++-- src/plugins/mission/mission_item_impl.cpp | 4 ++-- src/plugins/mission/mission_item_impl.h | 4 ++-- src/plugins/mission/mocks/mission_mock.h | 4 ++-- .../mission_raw/include/plugins/mission_raw/mission_raw.h | 4 ++-- src/plugins/mission_raw/mission_raw.cpp | 4 ++-- src/plugins/mission_raw/mission_raw_impl.cpp | 4 ++-- src/plugins/mission_raw/mission_raw_impl.h | 4 ++-- src/plugins/offboard/include/plugins/offboard/offboard.h | 4 ++-- src/plugins/offboard/mocks/offboard_mock.h | 4 ++-- src/plugins/offboard/offboard.cpp | 4 ++-- src/plugins/offboard/offboard_impl.cpp | 4 ++-- src/plugins/offboard/offboard_impl.h | 4 ++-- src/plugins/param/include/plugins/param/param.h | 4 ++-- src/plugins/param/param.cpp | 4 ++-- src/plugins/param/param_impl.cpp | 4 ++-- src/plugins/param/param_impl.h | 4 ++-- src/plugins/telemetry/include/plugins/telemetry/telemetry.h | 4 ++-- src/plugins/telemetry/math_conversions.cpp | 4 ++-- src/plugins/telemetry/math_conversions.h | 4 ++-- src/plugins/telemetry/mocks/telemetry_mock.h | 4 ++-- src/plugins/telemetry/telemetry.cpp | 4 ++-- src/plugins/telemetry/telemetry_impl.cpp | 4 ++-- src/plugins/telemetry/telemetry_impl.h | 4 ++-- 201 files changed, 349 insertions(+), 349 deletions(-) diff --git a/src/backend/src/backend.cpp b/src/backend/src/backend.cpp index 1e9fe07243..31a197aa42 100644 --- a/src/backend/src/backend.cpp +++ b/src/backend/src/backend.cpp @@ -6,7 +6,7 @@ #include "mavsdk.h" #include "grpc_server.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { class DronecodeSDKBackend::Impl { @@ -51,4 +51,4 @@ void DronecodeSDKBackend::wait() } } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/backend.h b/src/backend/src/backend.h index 8a2e2a2284..299f4f7d25 100644 --- a/src/backend/src/backend.h +++ b/src/backend/src/backend.h @@ -3,7 +3,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { namespace backend { class DronecodeSDKBackend { @@ -23,4 +23,4 @@ class DronecodeSDKBackend { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/connection_initiator.h b/src/backend/src/connection_initiator.h index 36111c573f..144a08f200 100644 --- a/src/backend/src/connection_initiator.h +++ b/src/backend/src/connection_initiator.h @@ -6,7 +6,7 @@ #include "connection_result.h" #include "log.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template class ConnectionInitiator { @@ -73,4 +73,4 @@ template class ConnectionInitiator { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/core/core_service_impl.h b/src/backend/src/core/core_service_impl.h index 494576847c..9c5cf99d77 100644 --- a/src/backend/src/core/core_service_impl.h +++ b/src/backend/src/core/core_service_impl.h @@ -4,7 +4,7 @@ #include "core/core.grpc.pb.h" #include "mavsdk.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -87,4 +87,4 @@ class CoreServiceImpl final : public dronecode_sdk::rpc::core::CoreService::Serv }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/grpc_server.cpp b/src/backend/src/grpc_server.cpp index a5b7241471..6607176d66 100644 --- a/src/backend/src/grpc_server.cpp +++ b/src/backend/src/grpc_server.cpp @@ -5,7 +5,7 @@ #include "log.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { void GRPCServer::run() @@ -45,4 +45,4 @@ void GRPCServer::setup_port(grpc::ServerBuilder &builder) } } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/grpc_server.h b/src/backend/src/grpc_server.h index 21564033da..ef879a419a 100644 --- a/src/backend/src/grpc_server.h +++ b/src/backend/src/grpc_server.h @@ -23,7 +23,7 @@ #include "plugins/offboard/offboard.h" #include "offboard/offboard_service_impl.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { class GRPCServer { @@ -83,4 +83,4 @@ class GRPCServer { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/action/action_service_impl.h b/src/backend/src/plugins/action/action_service_impl.h index 1c18ad2550..b7329612cc 100644 --- a/src/backend/src/plugins/action/action_service_impl.h +++ b/src/backend/src/plugins/action/action_service_impl.h @@ -1,7 +1,7 @@ #include "action/action.grpc.pb.h" #include "plugins/action/action.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -260,4 +260,4 @@ class ActionServiceImpl final : public rpc::action::ActionService::Service { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/calibration/calibration_service_impl.h b/src/backend/src/plugins/calibration/calibration_service_impl.h index 7c9c0b1162..6273496122 100644 --- a/src/backend/src/plugins/calibration/calibration_service_impl.h +++ b/src/backend/src/plugins/calibration/calibration_service_impl.h @@ -3,7 +3,7 @@ #include "calibration/calibration.grpc.pb.h" #include "plugins/calibration/calibration.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -183,4 +183,4 @@ class CalibrationServiceImpl final : public rpc::calibration::CalibrationService }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/camera/camera_service_impl.h b/src/backend/src/plugins/camera/camera_service_impl.h index 3c48a20413..d328f006d2 100644 --- a/src/backend/src/plugins/camera/camera_service_impl.h +++ b/src/backend/src/plugins/camera/camera_service_impl.h @@ -3,7 +3,7 @@ #include "plugins/camera/camera.h" #include "camera/camera.grpc.pb.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -706,4 +706,4 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/gimbal/gimbal_service_impl.h b/src/backend/src/plugins/gimbal/gimbal_service_impl.h index 76c8ebfb77..fb297c7666 100644 --- a/src/backend/src/plugins/gimbal/gimbal_service_impl.h +++ b/src/backend/src/plugins/gimbal/gimbal_service_impl.h @@ -1,7 +1,7 @@ #include "gimbal/gimbal.grpc.pb.h" #include "plugins/gimbal/gimbal.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -38,4 +38,4 @@ class GimbalServiceImpl final : public rpc::gimbal::GimbalService::Service { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/info/info_service_impl.h b/src/backend/src/plugins/info/info_service_impl.h index 160f5434b5..354d578651 100644 --- a/src/backend/src/plugins/info/info_service_impl.h +++ b/src/backend/src/plugins/info/info_service_impl.h @@ -1,7 +1,7 @@ #include "info/info.grpc.pb.h" #include "plugins/info/info.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -44,4 +44,4 @@ class InfoServiceImpl final : public rpc::info::InfoService::Service { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/mission/mission_service_impl.h b/src/backend/src/plugins/mission/mission_service_impl.h index d4eb41ed37..0a70284d8d 100644 --- a/src/backend/src/plugins/mission/mission_service_impl.h +++ b/src/backend/src/plugins/mission/mission_service_impl.h @@ -7,7 +7,7 @@ #include "mission/mission.grpc.pb.h" #include "plugins/mission/mission_item.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -338,4 +338,4 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/offboard/offboard_service_impl.h b/src/backend/src/plugins/offboard/offboard_service_impl.h index fe53aa5ef5..5aec4efcf0 100644 --- a/src/backend/src/plugins/offboard/offboard_service_impl.h +++ b/src/backend/src/plugins/offboard/offboard_service_impl.h @@ -1,7 +1,7 @@ #include "offboard/offboard.grpc.pb.h" #include "plugins/offboard/offboard.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -193,4 +193,4 @@ class OffboardServiceImpl final : public rpc::offboard::OffboardService::Service }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/param/param_service_impl.h b/src/backend/src/plugins/param/param_service_impl.h index 6d23fa5358..fe78c59fff 100644 --- a/src/backend/src/plugins/param/param_service_impl.h +++ b/src/backend/src/plugins/param/param_service_impl.h @@ -1,7 +1,7 @@ #include "param/param.grpc.pb.h" #include "plugins/param/param.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -110,4 +110,4 @@ class ParamServiceImpl final : public rpc::param::ParamService::Service { }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/backend/src/plugins/telemetry/telemetry_service_impl.h b/src/backend/src/plugins/telemetry/telemetry_service_impl.h index df06f5872e..8ea96ea41a 100644 --- a/src/backend/src/plugins/telemetry/telemetry_service_impl.h +++ b/src/backend/src/plugins/telemetry/telemetry_service_impl.h @@ -3,7 +3,7 @@ #include "plugins/telemetry/telemetry.h" #include "telemetry/telemetry.grpc.pb.h" -namespace dronecode_sdk { +namespace mavsdk { namespace backend { template @@ -388,4 +388,4 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet }; } // namespace backend -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/any.h b/src/core/any.h index dfe821b104..27e69fca1a 100644 --- a/src/core/any.h +++ b/src/core/any.h @@ -6,7 +6,7 @@ #include #include "log.h" -namespace dronecode_sdk { +namespace mavsdk { // Any class taken from: // https://codereview.stackexchange.com/questions/20058/c11-any-class @@ -116,4 +116,4 @@ struct Any { Base *ptr; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/any_test.cpp b/src/core/any_test.cpp index aa475bdd1c..4701af8b3c 100644 --- a/src/core/any_test.cpp +++ b/src/core/any_test.cpp @@ -3,7 +3,7 @@ #include "any.h" #include -using namespace dronecode_sdk; +using namespace mavsdk; TEST(Any, StringAndInt) { diff --git a/src/core/call_every_handler.cpp b/src/core/call_every_handler.cpp index 236a3af5c8..9f9b21a086 100644 --- a/src/core/call_every_handler.cpp +++ b/src/core/call_every_handler.cpp @@ -1,6 +1,6 @@ #include "call_every_handler.h" -namespace dronecode_sdk { +namespace mavsdk { CallEveryHandler::CallEveryHandler(Time &time) : _time(time) {} @@ -85,4 +85,4 @@ void CallEveryHandler::run_once() _entries_mutex.unlock(); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/call_every_handler.h b/src/core/call_every_handler.h index c3a7b4306d..6765b7c336 100644 --- a/src/core/call_every_handler.h +++ b/src/core/call_every_handler.h @@ -6,7 +6,7 @@ #include #include "global_include.h" -namespace dronecode_sdk { +namespace mavsdk { class CallEveryHandler { public: @@ -40,4 +40,4 @@ class CallEveryHandler { Time &_time; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/call_every_handler_test.cpp b/src/core/call_every_handler_test.cpp index a7cc5be841..e1a9dcc62a 100644 --- a/src/core/call_every_handler_test.cpp +++ b/src/core/call_every_handler_test.cpp @@ -7,7 +7,7 @@ #define Time FakeTime #endif -using namespace dronecode_sdk; +using namespace mavsdk; TEST(CallEveryHandler, Single) { diff --git a/src/core/cli_arg.cpp b/src/core/cli_arg.cpp index e18a9f5e7d..7d7c0a1de2 100644 --- a/src/core/cli_arg.cpp +++ b/src/core/cli_arg.cpp @@ -5,7 +5,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { void CliArg::reset() { @@ -158,4 +158,4 @@ bool CliArg::find_baudrate(std::string &rest) return true; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/cli_arg.h b/src/core/cli_arg.h index 08df0e0cdd..4d5dac1d3d 100644 --- a/src/core/cli_arg.h +++ b/src/core/cli_arg.h @@ -2,7 +2,7 @@ #include -namespace dronecode_sdk { +namespace mavsdk { class CliArg { public: @@ -31,4 +31,4 @@ class CliArg { int _baudrate{0}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/cli_arg_test.cpp b/src/core/cli_arg_test.cpp index 8f85a0d511..a550e5fca1 100644 --- a/src/core/cli_arg_test.cpp +++ b/src/core/cli_arg_test.cpp @@ -2,7 +2,7 @@ #include "cli_arg.h" #include -using namespace dronecode_sdk; +using namespace mavsdk; TEST(CliArg, UDPConnections) { diff --git a/src/core/connection.cpp b/src/core/connection.cpp index acd190df3f..b6b56d443d 100644 --- a/src/core/connection.cpp +++ b/src/core/connection.cpp @@ -3,7 +3,7 @@ #include "mavlink_channels.h" #include "global_include.h" -namespace dronecode_sdk { +namespace mavsdk { Connection::Connection(receiver_callback_t receiver_callback) : _receiver_callback(receiver_callback), @@ -43,4 +43,4 @@ void Connection::receive_message(mavlink_message_t &message) _receiver_callback(message); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/connection.h b/src/core/connection.h index 8cb35c601c..254c2a0684 100644 --- a/src/core/connection.h +++ b/src/core/connection.h @@ -4,7 +4,7 @@ #include "mavlink_receiver.h" #include -namespace dronecode_sdk { +namespace mavsdk { class Connection { public: @@ -33,4 +33,4 @@ class Connection { // void received_mavlink_message(mavlink_message_t &); }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/connection_result.h b/src/core/connection_result.h index 1b3fa977c9..cd450b9612 100644 --- a/src/core/connection_result.h +++ b/src/core/connection_result.h @@ -3,7 +3,7 @@ /** * @brief Namespace for all dronecode_sdk types. */ -namespace dronecode_sdk { +namespace mavsdk { /** * @brief Result type returned when adding a connection. @@ -70,4 +70,4 @@ inline const char *connection_result_str(const ConnectionResult result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/curl_test.cpp b/src/core/curl_test.cpp index 61c15ec6b8..115fb06cdd 100644 --- a/src/core/curl_test.cpp +++ b/src/core/curl_test.cpp @@ -6,7 +6,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; class CurlTest : public testing::Test { protected: diff --git a/src/core/curl_wrapper.cpp b/src/core/curl_wrapper.cpp index f173a164d3..f710aff000 100644 --- a/src/core/curl_wrapper.cpp +++ b/src/core/curl_wrapper.cpp @@ -7,7 +7,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { CurlWrapper::CurlWrapper() {} @@ -225,4 +225,4 @@ bool CurlWrapper::download_file_to_path(const std::string &url, } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/curl_wrapper.h b/src/core/curl_wrapper.h index cafa85a980..5c401f9255 100644 --- a/src/core/curl_wrapper.h +++ b/src/core/curl_wrapper.h @@ -10,7 +10,7 @@ using namespace testing; #endif // TESTING -namespace dronecode_sdk { +namespace mavsdk { class ICurlWrapper { public: @@ -55,4 +55,4 @@ class CurlWrapperMock : public ICurlWrapper { }; #endif // TESTING -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/curl_wrapper_types.h b/src/core/curl_wrapper_types.h index 23a4e2946d..e9dcc9e834 100644 --- a/src/core/curl_wrapper_types.h +++ b/src/core/curl_wrapper_types.h @@ -2,7 +2,7 @@ #include "curl_include.h" #include -namespace dronecode_sdk { +namespace mavsdk { enum class Status { Idle = 0, Downloading = 1, Uploading = 2, Finished = 3, Error = 4 }; @@ -13,4 +13,4 @@ struct dl_up_progress { progress_callback_t progress_callback{nullptr}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/error_handling.cpp b/src/core/error_handling.cpp index b000db2e53..cdfb15412b 100644 --- a/src/core/error_handling.cpp +++ b/src/core/error_handling.cpp @@ -1,6 +1,6 @@ #include "error_handling.h" -namespace dronecode_sdk { +namespace mavsdk { const char *result_str(Result res) { @@ -28,4 +28,4 @@ const char *result_str(Result res) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/global_include.cpp b/src/core/global_include.cpp index 102c828ac6..55314a71f6 100644 --- a/src/core/global_include.cpp +++ b/src/core/global_include.cpp @@ -5,7 +5,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { using std::chrono::steady_clock; @@ -158,4 +158,4 @@ bool are_equal(double one, double two) return (std::fabs(one - two) < std::numeric_limits::epsilon()); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/global_include.h b/src/core/global_include.h index 17603b7075..f3562c0e27 100644 --- a/src/core/global_include.h +++ b/src/core/global_include.h @@ -22,7 +22,7 @@ constexpr float M_PI_F = float(M_PI); #define STRNCPY strncpy #endif -namespace dronecode_sdk { +namespace mavsdk { typedef std::chrono::time_point dl_time_t; @@ -72,4 +72,4 @@ float to_deg_from_rad(float rad); bool are_equal(float one, float two); bool are_equal(double one, double two); -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/global_include_test.cpp b/src/core/global_include_test.cpp index 3d89600cf0..3ef3770773 100644 --- a/src/core/global_include_test.cpp +++ b/src/core/global_include_test.cpp @@ -8,7 +8,7 @@ #define Time FakeTime #endif -using namespace dronecode_sdk; +using namespace mavsdk; TEST(GlobalInclude, SteadyTimeIncreasing) { diff --git a/src/core/http_loader.cpp b/src/core/http_loader.cpp index ccb541ab37..4236f95d9c 100644 --- a/src/core/http_loader.cpp +++ b/src/core/http_loader.cpp @@ -1,7 +1,7 @@ #include "http_loader.h" #include "curl_wrapper.h" -namespace dronecode_sdk { +namespace mavsdk { #ifdef TESTING HttpLoader::HttpLoader(const std::shared_ptr &curl_wrapper) : @@ -118,4 +118,4 @@ bool HttpLoader::download_text_sync(const std::string &url, std::string &content return success; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/http_loader.h b/src/core/http_loader.h index d347270171..a69c532aba 100644 --- a/src/core/http_loader.h +++ b/src/core/http_loader.h @@ -7,7 +7,7 @@ #include "safe_queue.h" #include "curl_wrapper.h" -namespace dronecode_sdk { +namespace mavsdk { class ICurlWrapper; @@ -127,4 +127,4 @@ class HttpLoader { std::atomic _should_exit{false}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/http_loader_test.cpp b/src/core/http_loader_test.cpp index 76f9af5d99..a2610af5af 100644 --- a/src/core/http_loader_test.cpp +++ b/src/core/http_loader_test.cpp @@ -8,7 +8,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; class HttpLoaderTest : public testing::Test { protected: diff --git a/src/core/locked_queue.h b/src/core/locked_queue.h index 3af1b74b9b..7964759d99 100644 --- a/src/core/locked_queue.h +++ b/src/core/locked_queue.h @@ -4,7 +4,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { template class LockedQueue { public: @@ -65,4 +65,4 @@ template class LockedQueue { std::mutex _mutex{}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/locked_queue_test.cpp b/src/core/locked_queue_test.cpp index 00df3f95fe..33e1cf8022 100644 --- a/src/core/locked_queue_test.cpp +++ b/src/core/locked_queue_test.cpp @@ -5,7 +5,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; TEST(LockedQueue, FillAndEmpty) { diff --git a/src/core/log.cpp b/src/core/log.cpp index e7c041cf29..2153713c03 100644 --- a/src/core/log.cpp +++ b/src/core/log.cpp @@ -18,7 +18,7 @@ #define ANSI_COLOR_RESET "\x1b[0m" #endif -namespace dronecode_sdk { +namespace mavsdk { void set_color(Color color) { @@ -70,4 +70,4 @@ void set_color(Color color) #endif } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/log.h b/src/core/log.h index d5dab728f2..6d5c6aa7e8 100644 --- a/src/core/log.h +++ b/src/core/log.h @@ -22,7 +22,7 @@ #define LogWarn() LogWarnDetailed(__FILENAME__, __LINE__) #define LogErr() LogErrDetailed(__FILENAME__, __LINE__) -namespace dronecode_sdk { +namespace mavsdk { enum class Color { RED, GREEN, YELLOW, BLUE, GRAY, RESET }; @@ -156,4 +156,4 @@ class LogErrDetailed : public LogDetailed { } }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_channels.cpp b/src/core/mavlink_channels.cpp index e313084c2c..3dee24b740 100644 --- a/src/core/mavlink_channels.cpp +++ b/src/core/mavlink_channels.cpp @@ -1,6 +1,6 @@ #include "mavlink_channels.h" -namespace dronecode_sdk { +namespace mavsdk { MAVLinkChannels::MAVLinkChannels() : _channels_used{}, _channels_used_mutex() {} @@ -31,4 +31,4 @@ void MAVLinkChannels::checkin_used_channel(uint8_t used_channel) _channels_used[used_channel] = false; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_channels.h b/src/core/mavlink_channels.h index d51e21d0ff..d91625f275 100644 --- a/src/core/mavlink_channels.h +++ b/src/core/mavlink_channels.h @@ -3,7 +3,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { class MAVLinkChannels { public: @@ -49,4 +49,4 @@ class MAVLinkChannels { std::mutex _channels_used_mutex; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_channels_test.cpp b/src/core/mavlink_channels_test.cpp index dd07169baf..c86447dd68 100644 --- a/src/core/mavlink_channels_test.cpp +++ b/src/core/mavlink_channels_test.cpp @@ -1,7 +1,7 @@ #include "mavlink_channels.h" #include -using namespace dronecode_sdk; +using namespace mavsdk; TEST(MAVLinkChannels, MaxChannelsSanity) { diff --git a/src/core/mavlink_commands.cpp b/src/core/mavlink_commands.cpp index 3b38e76893..1f729055ed 100644 --- a/src/core/mavlink_commands.cpp +++ b/src/core/mavlink_commands.cpp @@ -3,7 +3,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { // TODO: Currently the mavlink command handling is made in a way to only // process one command at any time. Therefore, the work state is global @@ -278,4 +278,4 @@ void MAVLinkCommands::call_callback(const command_result_callback_t &callback, _parent.call_user_callback([callback, result, progress]() { callback(result, progress); }); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_commands.h b/src/core/mavlink_commands.h index da35c9cb8b..ab828676c3 100644 --- a/src/core/mavlink_commands.h +++ b/src/core/mavlink_commands.h @@ -7,7 +7,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { class SystemImpl; @@ -125,4 +125,4 @@ class MAVLinkCommands { void *_timeout_cookie = nullptr; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_parameters.cpp b/src/core/mavlink_parameters.cpp index 8ff1bb783f..9cd3c30dda 100644 --- a/src/core/mavlink_parameters.cpp +++ b/src/core/mavlink_parameters.cpp @@ -3,7 +3,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { MAVLinkParameters::MAVLinkParameters(SystemImpl &parent) : _parent(parent) { @@ -493,4 +493,4 @@ std::ostream &operator<<(std::ostream &strm, const MAVLinkParameters::ParamValue return strm; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_parameters.h b/src/core/mavlink_parameters.h index 0883e9f744..98e64e44dc 100644 --- a/src/core/mavlink_parameters.h +++ b/src/core/mavlink_parameters.h @@ -11,7 +11,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { class SystemImpl; @@ -543,4 +543,4 @@ class MAVLinkParameters { // dl_time_t _last_request_time = {}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_receiver.cpp b/src/core/mavlink_receiver.cpp index 282f6f4d78..5a24fc647a 100644 --- a/src/core/mavlink_receiver.cpp +++ b/src/core/mavlink_receiver.cpp @@ -5,7 +5,7 @@ #include #endif -namespace dronecode_sdk { +namespace mavsdk { MAVLinkReceiver::MAVLinkReceiver(uint8_t channel) : _channel(channel) @@ -121,4 +121,4 @@ void MAVLinkReceiver::print_line(const char *index, } #endif -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavlink_receiver.h b/src/core/mavlink_receiver.h index a325b267b8..50d92b428d 100644 --- a/src/core/mavlink_receiver.h +++ b/src/core/mavlink_receiver.h @@ -4,7 +4,7 @@ #include "global_include.h" #include -namespace dronecode_sdk { +namespace mavsdk { class MAVLinkReceiver { public: @@ -51,4 +51,4 @@ class MAVLinkReceiver { #endif }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavsdk.cpp b/src/core/mavsdk.cpp index f8b383ef48..e34e02acd4 100644 --- a/src/core/mavsdk.cpp +++ b/src/core/mavsdk.cpp @@ -3,7 +3,7 @@ #include "mavsdk_impl.h" #include "global_include.h" -namespace dronecode_sdk { +namespace mavsdk { DronecodeSDK::DronecodeSDK() : _impl{new DronecodeSDKImpl()} {} @@ -77,4 +77,4 @@ void DronecodeSDK::register_on_timeout(const event_callback_t callback) _impl->register_on_timeout(callback); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavsdk.h b/src/core/mavsdk.h index 96372f964e..c9a17b696c 100644 --- a/src/core/mavsdk.h +++ b/src/core/mavsdk.h @@ -8,7 +8,7 @@ #include "system.h" #include "connection_result.h" -namespace dronecode_sdk { +namespace mavsdk { class DronecodeSDKImpl; class System; @@ -233,4 +233,4 @@ class DronecodeSDK { const DronecodeSDK &operator=(const DronecodeSDK &) = delete; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavsdk_impl.cpp b/src/core/mavsdk_impl.cpp index 02e36e2649..3dbed5847d 100644 --- a/src/core/mavsdk_impl.cpp +++ b/src/core/mavsdk_impl.cpp @@ -12,7 +12,7 @@ #include "cli_arg.h" #include "version.h" -namespace dronecode_sdk { +namespace mavsdk { DronecodeSDKImpl::DronecodeSDKImpl() : _connections_mutex(), @@ -394,4 +394,4 @@ void DronecodeSDKImpl::register_on_timeout(const DronecodeSDK::event_callback_t _on_timeout_callback = callback; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mavsdk_impl.h b/src/core/mavsdk_impl.h index 66579179ee..2ecf499ca6 100644 --- a/src/core/mavsdk_impl.h +++ b/src/core/mavsdk_impl.h @@ -10,7 +10,7 @@ #include "system.h" #include "mavlink_include.h" -namespace dronecode_sdk { +namespace mavsdk { class DronecodeSDKImpl { public: @@ -68,4 +68,4 @@ class DronecodeSDKImpl { std::atomic _should_exit = {false}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/mocks/mavsdk_mock.h b/src/core/mocks/mavsdk_mock.h index 63ba8b068d..06ea0fcce9 100644 --- a/src/core/mocks/mavsdk_mock.h +++ b/src/core/mocks/mavsdk_mock.h @@ -3,7 +3,7 @@ #include "connection_result.h" -namespace dronecode_sdk { +namespace mavsdk { namespace testing { typedef std::function event_callback_t; @@ -16,4 +16,4 @@ class MockDronecodeSDK { }; } // namespace testing -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/plugin_base.h b/src/core/plugin_base.h index fd0be2d536..fed33e778a 100644 --- a/src/core/plugin_base.h +++ b/src/core/plugin_base.h @@ -1,6 +1,6 @@ #pragma once -namespace dronecode_sdk { +namespace mavsdk { /** * @brief Base class for every plugin. @@ -28,4 +28,4 @@ class PluginBase { const PluginBase &operator=(const PluginBase &) = delete; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/plugin_impl_base.cpp b/src/core/plugin_impl_base.cpp index 0d44f9c7d0..cef6c38455 100644 --- a/src/core/plugin_impl_base.cpp +++ b/src/core/plugin_impl_base.cpp @@ -2,8 +2,8 @@ #include "global_include.h" #include "plugin_impl_base.h" -namespace dronecode_sdk { +namespace mavsdk { PluginImplBase::PluginImplBase(System &system) : _parent(system.system_impl()) {} -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/plugin_impl_base.h b/src/core/plugin_impl_base.h index 6b331a6ce2..0eaf1d4f13 100644 --- a/src/core/plugin_impl_base.h +++ b/src/core/plugin_impl_base.h @@ -2,7 +2,7 @@ #include "system_impl.h" #include -namespace dronecode_sdk { +namespace mavsdk { class System; class SystemImpl; @@ -61,4 +61,4 @@ class PluginImplBase { std::shared_ptr _parent; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/safe_queue.h b/src/core/safe_queue.h index 02b8ab9f16..d7656cdd4d 100644 --- a/src/core/safe_queue.h +++ b/src/core/safe_queue.h @@ -5,7 +5,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { /* * Thread-safe queue taken from: @@ -55,4 +55,4 @@ template class SafeQueue { bool _should_exit{false}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/serial_connection.cpp b/src/core/serial_connection.cpp index 8337daa21b..9f99be5be3 100644 --- a/src/core/serial_connection.cpp +++ b/src/core/serial_connection.cpp @@ -8,7 +8,7 @@ #include #endif -namespace dronecode_sdk { +namespace mavsdk { #ifndef WINDOWS #define GET_ERROR() strerror(errno) @@ -344,4 +344,4 @@ int SerialConnection::define_from_baudrate(int baudrate) } #endif -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/serial_connection.h b/src/core/serial_connection.h index e0cade16e8..df8d56af4e 100644 --- a/src/core/serial_connection.h +++ b/src/core/serial_connection.h @@ -8,7 +8,7 @@ #include #endif -namespace dronecode_sdk { +namespace mavsdk { class SerialConnection : public Connection { public: @@ -48,4 +48,4 @@ class SerialConnection : public Connection { std::atomic_bool _should_exit{false}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/system.cpp b/src/core/system.cpp index 07d13d77f7..2e98564790 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -11,7 +11,7 @@ // Set to 1 to log incoming/outgoing mavlink messages. #define MESSAGE_DEBUGGING 0 -namespace dronecode_sdk { +namespace mavsdk { using namespace std::placeholders; // for `_1` @@ -57,4 +57,4 @@ void System::register_component_discovered_callback(discover_callback_t callback return _system_impl->register_component_discovered_callback(callback); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/system.h b/src/core/system.h index fd42014e09..1a7f59f3f3 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -3,7 +3,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { /** * @brief Component Types @@ -119,4 +119,4 @@ class System { std::shared_ptr _system_impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/system_impl.cpp b/src/core/system_impl.cpp index 164231b088..6d25106f32 100644 --- a/src/core/system_impl.cpp +++ b/src/core/system_impl.cpp @@ -12,7 +12,7 @@ // Set to 1 to log incoming/outgoing mavlink messages. #define MESSAGE_DEBUGGING 0 -namespace dronecode_sdk { +namespace mavsdk { using namespace std::placeholders; // for `_1` @@ -1205,4 +1205,4 @@ void SystemImpl::intercept_outgoing_messages(std::function _outgoing_messages_intercept_callback{nullptr}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/tcp_connection.cpp b/src/core/tcp_connection.cpp index f67c1c44c5..a081f75331 100644 --- a/src/core/tcp_connection.cpp +++ b/src/core/tcp_connection.cpp @@ -22,7 +22,7 @@ #define GET_ERROR(_x) WSAGetLastError() #endif -namespace dronecode_sdk { +namespace mavsdk { /* change to remote_ip and remote_port */ TcpConnection::TcpConnection(Connection::receiver_callback_t receiver_callback, @@ -207,4 +207,4 @@ void TcpConnection::receive() } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/tcp_connection.h b/src/core/tcp_connection.h index b7b1383e47..79c1bfc42d 100644 --- a/src/core/tcp_connection.h +++ b/src/core/tcp_connection.h @@ -13,7 +13,7 @@ #undef SOCKET_ERROR #endif -namespace dronecode_sdk { +namespace mavsdk { class TcpConnection : public Connection { public: @@ -47,4 +47,4 @@ class TcpConnection : public Connection { std::atomic_bool _is_ok{false}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/thread_pool.cpp b/src/core/thread_pool.cpp index c230d3627b..60d19cab4a 100644 --- a/src/core/thread_pool.cpp +++ b/src/core/thread_pool.cpp @@ -1,6 +1,6 @@ #include "thread_pool.h" -namespace dronecode_sdk { +namespace mavsdk { ThreadPool::ThreadPool(unsigned num_threads) : _num_threads(num_threads) {} @@ -47,4 +47,4 @@ void ThreadPool::worker() } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/thread_pool.h b/src/core/thread_pool.h index 2a0b66633e..27de70d899 100644 --- a/src/core/thread_pool.h +++ b/src/core/thread_pool.h @@ -9,7 +9,7 @@ #include "global_include.h" #include "safe_queue.h" -namespace dronecode_sdk { +namespace mavsdk { class ThreadPool { public: @@ -35,4 +35,4 @@ class ThreadPool { SafeQueue> _work_queue{}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/thread_pool_test.cpp b/src/core/thread_pool_test.cpp index 51bb7c7a7e..45482159b2 100644 --- a/src/core/thread_pool_test.cpp +++ b/src/core/thread_pool_test.cpp @@ -8,7 +8,7 @@ //#define Time FakeTime //#endif -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; static std::atomic task_one_ran{false}; diff --git a/src/core/timeout_handler.cpp b/src/core/timeout_handler.cpp index 605927f2a4..648c834086 100644 --- a/src/core/timeout_handler.cpp +++ b/src/core/timeout_handler.cpp @@ -1,6 +1,6 @@ #include "timeout_handler.h" -namespace dronecode_sdk { +namespace mavsdk { TimeoutHandler::TimeoutHandler(Time &time) : _time(time) {} @@ -82,4 +82,4 @@ void TimeoutHandler::run_once() _timeouts_mutex.unlock(); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/timeout_handler.h b/src/core/timeout_handler.h index b940af51c4..e4641d6401 100644 --- a/src/core/timeout_handler.h +++ b/src/core/timeout_handler.h @@ -6,7 +6,7 @@ #include #include "global_include.h" -namespace dronecode_sdk { +namespace mavsdk { class TimeoutHandler { public: @@ -39,4 +39,4 @@ class TimeoutHandler { Time &_time; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/timeout_handler_test.cpp b/src/core/timeout_handler_test.cpp index 261a289788..6d98f33e20 100644 --- a/src/core/timeout_handler_test.cpp +++ b/src/core/timeout_handler_test.cpp @@ -6,7 +6,7 @@ #define Time FakeTime #endif -using namespace dronecode_sdk; +using namespace mavsdk; TEST(TimeoutHandler, Timeout) { diff --git a/src/core/udp_connection.cpp b/src/core/udp_connection.cpp index 290504bcf2..f5d74bac07 100644 --- a/src/core/udp_connection.cpp +++ b/src/core/udp_connection.cpp @@ -26,7 +26,7 @@ #define GET_ERROR(_x) strerror(_x) #endif -namespace dronecode_sdk { +namespace mavsdk { UdpConnection::UdpConnection(Connection::receiver_callback_t receiver_callback, const std::string &local_ip, @@ -241,4 +241,4 @@ void UdpConnection::receive() } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/udp_connection.h b/src/core/udp_connection.h index 4eeb3cfe46..ffcc946967 100644 --- a/src/core/udp_connection.h +++ b/src/core/udp_connection.h @@ -8,7 +8,7 @@ #include #include "connection.h" -namespace dronecode_sdk { +namespace mavsdk { class UdpConnection : public Connection { public: @@ -53,4 +53,4 @@ class UdpConnection : public Connection { std::atomic_bool _should_exit{false}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/core/unittests_main.cpp b/src/core/unittests_main.cpp index 46b789c7dd..c11ee32960 100644 --- a/src/core/unittests_main.cpp +++ b/src/core/unittests_main.cpp @@ -2,7 +2,7 @@ #include #include "mavsdk.h" -using namespace dronecode_sdk; +using namespace mavsdk; int main(int argc, char *argv[]) { diff --git a/src/core/version.h.in b/src/core/version.h.in index f788ee946b..3ad11fa76f 100644 --- a/src/core/version.h.in +++ b/src/core/version.h.in @@ -1,7 +1,7 @@ #pragma once -namespace dronecode_sdk { +namespace mavsdk { constexpr auto dronecode_sdk_version = "@VERSION_STR@"; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/external_example/integration_tests/hello_world.cpp b/src/external_example/integration_tests/hello_world.cpp index c9de247e0b..0a26a5617d 100644 --- a/src/external_example/integration_tests/hello_world.cpp +++ b/src/external_example/integration_tests/hello_world.cpp @@ -4,7 +4,7 @@ #include "plugins/example/example.h" #include "integration_test_helper.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, ExampleHello) { diff --git a/src/external_example/plugins/example/example.cpp b/src/external_example/plugins/example/example.cpp index 430e11d6a9..cccf427d71 100644 --- a/src/external_example/plugins/example/example.cpp +++ b/src/external_example/plugins/example/example.cpp @@ -1,7 +1,7 @@ #include "example.h" #include "example_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Example::Example(System &system) : PluginBase() { @@ -18,4 +18,4 @@ void Example::say_hello() const _impl->say_hello(); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/external_example/plugins/example/example.h b/src/external_example/plugins/example/example.h index 0fc54cdf85..bb2695c0a9 100644 --- a/src/external_example/plugins/example/example.h +++ b/src/external_example/plugins/example/example.h @@ -2,7 +2,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class System; class ExampleImpl; @@ -23,4 +23,4 @@ class Example : public PluginBase { ExampleImpl *_impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/external_example/plugins/example/example_impl.cpp b/src/external_example/plugins/example/example_impl.cpp index 5fe2c900e4..202ff4c685 100644 --- a/src/external_example/plugins/example/example_impl.cpp +++ b/src/external_example/plugins/example/example_impl.cpp @@ -2,7 +2,7 @@ #include "global_include.h" #include -namespace dronecode_sdk { +namespace mavsdk { ExampleImpl::ExampleImpl(System &system) : PluginImplBase(system) { @@ -43,4 +43,4 @@ void ExampleImpl::process_heartbeat(const mavlink_message_t &message) LogDebug() << "I received a heartbeat"; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/external_example/plugins/example/example_impl.h b/src/external_example/plugins/example/example_impl.h index a1baedb5b4..3503402628 100644 --- a/src/external_example/plugins/example/example_impl.h +++ b/src/external_example/plugins/example/example_impl.h @@ -5,7 +5,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class ExampleImpl : public PluginImplBase { public: @@ -24,4 +24,4 @@ class ExampleImpl : public PluginImplBase { void process_heartbeat(const mavlink_message_t &message); }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/external_example/plugins/example/example_impl_test.cpp b/src/external_example/plugins/example/example_impl_test.cpp index 42982faf21..b1d32d1f3c 100644 --- a/src/external_example/plugins/example/example_impl_test.cpp +++ b/src/external_example/plugins/example/example_impl_test.cpp @@ -3,11 +3,11 @@ #include "global_include.h" #include -namespace dronecode_sdk { +namespace mavsdk { TEST(ExampleImpl, NoTest) { ASSERT_TRUE(true); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/integration_tests/action_goto.cpp b/src/integration_tests/action_goto.cpp index 3f394d64cd..c4886714f3 100644 --- a/src/integration_tests/action_goto.cpp +++ b/src/integration_tests/action_goto.cpp @@ -5,7 +5,7 @@ #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, ActionGoto) { diff --git a/src/integration_tests/action_hover_async.cpp b/src/integration_tests/action_hover_async.cpp index 24cf9d695b..53ff31a4dc 100644 --- a/src/integration_tests/action_hover_async.cpp +++ b/src/integration_tests/action_hover_async.cpp @@ -6,7 +6,7 @@ #include -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, ActionHoverAsync) { diff --git a/src/integration_tests/action_hover_sync.cpp b/src/integration_tests/action_hover_sync.cpp index 4bbddafab1..f699aafb1a 100644 --- a/src/integration_tests/action_hover_sync.cpp +++ b/src/integration_tests/action_hover_sync.cpp @@ -5,7 +5,7 @@ #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; static void takeoff_and_hover_at_altitude(float altitude_m); diff --git a/src/integration_tests/action_takeoff_and_kill.cpp b/src/integration_tests/action_takeoff_and_kill.cpp index 1ad7e8ee7e..8e47e2d04f 100644 --- a/src/integration_tests/action_takeoff_and_kill.cpp +++ b/src/integration_tests/action_takeoff_and_kill.cpp @@ -4,7 +4,7 @@ #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, ActionTakeoffAndKill) { diff --git a/src/integration_tests/action_transition_multicopter_fixedwing.cpp b/src/integration_tests/action_transition_multicopter_fixedwing.cpp index d5347c0327..d56bfeeb43 100644 --- a/src/integration_tests/action_transition_multicopter_fixedwing.cpp +++ b/src/integration_tests/action_transition_multicopter_fixedwing.cpp @@ -4,7 +4,7 @@ #include "plugins/action/action.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; // static void connect(DronecodeSDK); static void takeoff(std::shared_ptr action, std::shared_ptr telemetry); diff --git a/src/integration_tests/calibration.cpp b/src/integration_tests/calibration.cpp index f525182a5a..577a04304f 100644 --- a/src/integration_tests/calibration.cpp +++ b/src/integration_tests/calibration.cpp @@ -7,7 +7,7 @@ #include "plugins/param/param.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` static void receive_calibration_callback(const Calibration::Result result, diff --git a/src/integration_tests/camera_format.cpp b/src/integration_tests/camera_format.cpp index e0ef71c218..b20aa1c6b9 100644 --- a/src/integration_tests/camera_format.cpp +++ b/src/integration_tests/camera_format.cpp @@ -5,7 +5,7 @@ #include #include "plugins/camera/camera.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST(CameraTest, Format) { diff --git a/src/integration_tests/camera_mode.cpp b/src/integration_tests/camera_mode.cpp index 32a00f1e42..6b69e66055 100644 --- a/src/integration_tests/camera_mode.cpp +++ b/src/integration_tests/camera_mode.cpp @@ -6,7 +6,7 @@ #include "system.h" #include "camera_test_helpers.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST(CameraTest, SetModeSync) { diff --git a/src/integration_tests/camera_settings.cpp b/src/integration_tests/camera_settings.cpp index ecb7d450f4..3a77af6a6d 100644 --- a/src/integration_tests/camera_settings.cpp +++ b/src/integration_tests/camera_settings.cpp @@ -7,7 +7,7 @@ #include "integration_test_helper.h" #include "camera_test_helpers.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` // To run specific tests for Yuneec cameras. diff --git a/src/integration_tests/camera_status.cpp b/src/integration_tests/camera_status.cpp index 7ab3a4aff9..79eac8fa5b 100644 --- a/src/integration_tests/camera_status.cpp +++ b/src/integration_tests/camera_status.cpp @@ -5,7 +5,7 @@ #include #include "plugins/camera/camera.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` static void receive_camera_status(Camera::Result result, const Camera::Status status); diff --git a/src/integration_tests/camera_take_photo.cpp b/src/integration_tests/camera_take_photo.cpp index 5acda8050f..c6de03df45 100644 --- a/src/integration_tests/camera_take_photo.cpp +++ b/src/integration_tests/camera_take_photo.cpp @@ -9,7 +9,7 @@ #include "system.h" #include "camera_test_helpers.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` static void receive_camera_result(Camera::Result result); diff --git a/src/integration_tests/camera_take_photo_interval.cpp b/src/integration_tests/camera_take_photo_interval.cpp index d61310afde..7f16e00d0f 100644 --- a/src/integration_tests/camera_take_photo_interval.cpp +++ b/src/integration_tests/camera_take_photo_interval.cpp @@ -9,7 +9,7 @@ #include "system.h" #include "camera_test_helpers.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` static void receive_camera_result(Camera::Result result); diff --git a/src/integration_tests/camera_test_helpers.cpp b/src/integration_tests/camera_test_helpers.cpp index 8295c4099e..6ea24f5415 100644 --- a/src/integration_tests/camera_test_helpers.cpp +++ b/src/integration_tests/camera_test_helpers.cpp @@ -3,7 +3,7 @@ #include "integration_test_helper.h" #include "camera_test_helpers.h" -using namespace dronecode_sdk; +using namespace mavsdk; Camera::Mode get_mode(std::shared_ptr camera) { diff --git a/src/integration_tests/follow_me.cpp b/src/integration_tests/follow_me.cpp index 7feff228ff..56a672f78e 100644 --- a/src/integration_tests/follow_me.cpp +++ b/src/integration_tests/follow_me.cpp @@ -10,7 +10,7 @@ #include "plugins/action/action.h" #include "plugins/follow_me/follow_me.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::chrono; using namespace std::this_thread; using namespace std::placeholders; diff --git a/src/integration_tests/geofence_inclusion.cpp b/src/integration_tests/geofence_inclusion.cpp index 16bb26d5cc..0fde862145 100644 --- a/src/integration_tests/geofence_inclusion.cpp +++ b/src/integration_tests/geofence_inclusion.cpp @@ -7,7 +7,7 @@ #include "plugins/telemetry/telemetry.h" #include "plugins/geofence/geofence.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` static void receive_send_geofence_result(Geofence::Result result); diff --git a/src/integration_tests/gimbal.cpp b/src/integration_tests/gimbal.cpp index 741019e1b2..fdeaeaf85a 100644 --- a/src/integration_tests/gimbal.cpp +++ b/src/integration_tests/gimbal.cpp @@ -11,7 +11,7 @@ #include "plugins/offboard/offboard.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; void send_new_gimbal_command(std::shared_ptr gimbal, int i); void send_gimbal_roi_location(std::shared_ptr gimbal, diff --git a/src/integration_tests/info.cpp b/src/integration_tests/info.cpp index 2f30afb77b..80c101c8dc 100644 --- a/src/integration_tests/info.cpp +++ b/src/integration_tests/info.cpp @@ -3,7 +3,7 @@ #include "mavsdk.h" #include "plugins/info/info.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, Info) { diff --git a/src/integration_tests/log_files.cpp b/src/integration_tests/log_files.cpp index 8860fe252e..f3a71213dc 100644 --- a/src/integration_tests/log_files.cpp +++ b/src/integration_tests/log_files.cpp @@ -5,7 +5,7 @@ #include "integration_test_helper.h" #include "plugins/log_files/log_files.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST(HardwareTest, LogFiles) { diff --git a/src/integration_tests/logging.cpp b/src/integration_tests/logging.cpp index 0a3035eb89..0eca90483b 100644 --- a/src/integration_tests/logging.cpp +++ b/src/integration_tests/logging.cpp @@ -3,7 +3,7 @@ #include "integration_test_helper.h" #include "plugins/logging/logging.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, Logging) { diff --git a/src/integration_tests/mavlink_passthrough.cpp b/src/integration_tests/mavlink_passthrough.cpp index e675aa9b24..4836f64bb4 100644 --- a/src/integration_tests/mavlink_passthrough.cpp +++ b/src/integration_tests/mavlink_passthrough.cpp @@ -5,7 +5,7 @@ #include "mavsdk.h" #include "plugins/mavlink_passthrough/mavlink_passthrough.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, MavlinkPassthrough) { diff --git a/src/integration_tests/mission.cpp b/src/integration_tests/mission.cpp index 2377b4f4ee..75e0cf0f0c 100644 --- a/src/integration_tests/mission.cpp +++ b/src/integration_tests/mission.cpp @@ -10,7 +10,7 @@ #include "plugins/action/action.h" #include "plugins/mission/mission.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` static void test_mission(std::shared_ptr telemetry, diff --git a/src/integration_tests/mission_cancellation.cpp b/src/integration_tests/mission_cancellation.cpp index 1dad3ff6bf..6de4bb4103 100644 --- a/src/integration_tests/mission_cancellation.cpp +++ b/src/integration_tests/mission_cancellation.cpp @@ -9,7 +9,7 @@ #include "plugins/action/action.h" #include "plugins/mission/mission.h" -using namespace dronecode_sdk; +using namespace mavsdk; static std::shared_ptr add_waypoint(double latitude_deg, double longitude_deg, diff --git a/src/integration_tests/mission_change_speed.cpp b/src/integration_tests/mission_change_speed.cpp index 12fd4430b7..c2517a9944 100644 --- a/src/integration_tests/mission_change_speed.cpp +++ b/src/integration_tests/mission_change_speed.cpp @@ -9,7 +9,7 @@ #include "plugins/action/action.h" #include "plugins/mission/mission.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` static void receive_upload_mission_result(Mission::Result result); diff --git a/src/integration_tests/mission_raw_mission_changed.cpp b/src/integration_tests/mission_raw_mission_changed.cpp index fb5567035e..6eb86b85e0 100644 --- a/src/integration_tests/mission_raw_mission_changed.cpp +++ b/src/integration_tests/mission_raw_mission_changed.cpp @@ -5,7 +5,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; static constexpr double SOME_LATITUDES[] = {47.398170, 47.398175}; static constexpr double SOME_LONGITUDES[] = {8.545649, 8.545654}; diff --git a/src/integration_tests/mission_rtl.cpp b/src/integration_tests/mission_rtl.cpp index fb2a218b43..48d962acab 100644 --- a/src/integration_tests/mission_rtl.cpp +++ b/src/integration_tests/mission_rtl.cpp @@ -11,7 +11,7 @@ #include "plugins/action/action.h" #include "plugins/mission/mission.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` // TODO: add checks that verify the return altitude diff --git a/src/integration_tests/mission_transfer_lossy.cpp b/src/integration_tests/mission_transfer_lossy.cpp index df392dc2e6..bb83c4b74a 100644 --- a/src/integration_tests/mission_transfer_lossy.cpp +++ b/src/integration_tests/mission_transfer_lossy.cpp @@ -7,7 +7,7 @@ #include "plugins/mission/mission.h" #include "plugins/mavlink_passthrough/mavlink_passthrough.h" -using namespace dronecode_sdk; +using namespace mavsdk; static void set_link_lossy(std::shared_ptr mavlink_passthrough); static std::vector> create_mission_items(); diff --git a/src/integration_tests/offboard_attitude.cpp b/src/integration_tests/offboard_attitude.cpp index 331ca47180..403f09743f 100644 --- a/src/integration_tests/offboard_attitude.cpp +++ b/src/integration_tests/offboard_attitude.cpp @@ -6,7 +6,7 @@ #include "plugins/telemetry/telemetry.h" #include "plugins/offboard/offboard.h" -using namespace dronecode_sdk; +using namespace mavsdk; static void arm_and_takeoff(std::shared_ptr action, std::shared_ptr telemetry); static void disarm_and_land(std::shared_ptr action, std::shared_ptr telemetry); diff --git a/src/integration_tests/offboard_position.cpp b/src/integration_tests/offboard_position.cpp index 1652a27702..c4fd5c4668 100644 --- a/src/integration_tests/offboard_position.cpp +++ b/src/integration_tests/offboard_position.cpp @@ -7,7 +7,7 @@ #include "plugins/offboard/offboard.h" #include "plugins/mission/mission.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, OffboardPositionNED) { diff --git a/src/integration_tests/offboard_velocity.cpp b/src/integration_tests/offboard_velocity.cpp index 7fcb0a5ea1..852be8269a 100644 --- a/src/integration_tests/offboard_velocity.cpp +++ b/src/integration_tests/offboard_velocity.cpp @@ -7,7 +7,7 @@ #include "plugins/offboard/offboard.h" #include "plugins/mission/mission.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, OffboardVelocityNED) { diff --git a/src/integration_tests/param.cpp b/src/integration_tests/param.cpp index 1820de1f75..d2f8574016 100644 --- a/src/integration_tests/param.cpp +++ b/src/integration_tests/param.cpp @@ -3,7 +3,7 @@ #include "mavsdk.h" #include "plugins/param/param.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, ParamSad) { diff --git a/src/integration_tests/path_checker.cpp b/src/integration_tests/path_checker.cpp index a12bc3ac0e..7c661113ce 100644 --- a/src/integration_tests/path_checker.cpp +++ b/src/integration_tests/path_checker.cpp @@ -1,7 +1,7 @@ #include "path_checker.h" #include "integration_test_helper.h" -using namespace dronecode_sdk; +using namespace mavsdk; void PathChecker::set_max_altitude(float relative_altitude_m) { diff --git a/src/integration_tests/path_checker.h b/src/integration_tests/path_checker.h index bde9c7ed59..61a7964e69 100644 --- a/src/integration_tests/path_checker.h +++ b/src/integration_tests/path_checker.h @@ -3,7 +3,7 @@ #include "mavsdk.h" #include -namespace dronecode_sdk { +namespace mavsdk { class PathChecker { public: @@ -22,4 +22,4 @@ class PathChecker { float _margin_m = 1.0f; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/integration_tests/system_connection_async.cpp b/src/integration_tests/system_connection_async.cpp index 5bc05cac47..0e8abc8927 100644 --- a/src/integration_tests/system_connection_async.cpp +++ b/src/integration_tests/system_connection_async.cpp @@ -3,7 +3,7 @@ #include "global_include.h" #include "mavsdk.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for _1 // For now we don't test the timing out because the starting and stopping of diff --git a/src/integration_tests/system_connection_sync.cpp b/src/integration_tests/system_connection_sync.cpp index f0f0655656..ff009c9d95 100644 --- a/src/integration_tests/system_connection_sync.cpp +++ b/src/integration_tests/system_connection_sync.cpp @@ -3,7 +3,7 @@ #include "global_include.h" #include "mavsdk.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST(SitlTestMultiple, SystemConnectionMultiple) { diff --git a/src/integration_tests/system_multi_components.cpp b/src/integration_tests/system_multi_components.cpp index 00b995d279..919e47b26f 100644 --- a/src/integration_tests/system_multi_components.cpp +++ b/src/integration_tests/system_multi_components.cpp @@ -8,7 +8,7 @@ #include "mavsdk.h" #include "system.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::this_thread; using namespace std::chrono; diff --git a/src/integration_tests/telemetry_async.cpp b/src/integration_tests/telemetry_async.cpp index 8ad3693ddc..4757a19bff 100644 --- a/src/integration_tests/telemetry_async.cpp +++ b/src/integration_tests/telemetry_async.cpp @@ -6,7 +6,7 @@ #define CAMERA_AVAILABLE 0 // Set to 1 if camera is available and should be tested. using namespace std::placeholders; // for `_1` -using namespace dronecode_sdk; +using namespace mavsdk; static void receive_result(Telemetry::Result result); static void print_position(Telemetry::Position position); diff --git a/src/integration_tests/telemetry_health.cpp b/src/integration_tests/telemetry_health.cpp index 851ce2b978..2b95806ce4 100644 --- a/src/integration_tests/telemetry_health.cpp +++ b/src/integration_tests/telemetry_health.cpp @@ -3,7 +3,7 @@ #include "mavsdk.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; void print_health(Telemetry::Health health); diff --git a/src/integration_tests/telemetry_modes.cpp b/src/integration_tests/telemetry_modes.cpp index abf3eaa3ff..909c6ff3d2 100644 --- a/src/integration_tests/telemetry_modes.cpp +++ b/src/integration_tests/telemetry_modes.cpp @@ -4,7 +4,7 @@ #include "plugins/telemetry/telemetry.h" #include "integration_test_helper.h" -using namespace dronecode_sdk; +using namespace mavsdk; void print_mode(Telemetry::FlightMode flight_mode); static Telemetry::FlightMode _flight_mode = Telemetry::FlightMode::UNKNOWN; diff --git a/src/integration_tests/telemetry_sync.cpp b/src/integration_tests/telemetry_sync.cpp index a3c98c298d..b48e0dcbae 100644 --- a/src/integration_tests/telemetry_sync.cpp +++ b/src/integration_tests/telemetry_sync.cpp @@ -3,7 +3,7 @@ #include "mavsdk.h" #include "plugins/telemetry/telemetry.h" -using namespace dronecode_sdk; +using namespace mavsdk; TEST_F(SitlTest, TelemetrySync) { diff --git a/src/plugins/action/action.cpp b/src/plugins/action/action.cpp index 8b0443d5df..3d1b6bec45 100644 --- a/src/plugins/action/action.cpp +++ b/src/plugins/action/action.cpp @@ -1,7 +1,7 @@ #include "action_impl.h" #include "plugins/action/action.h" -namespace dronecode_sdk { +namespace mavsdk { Action::Action(System &system) : PluginBase(), _impl{new ActionImpl(system)} {} @@ -161,4 +161,4 @@ const char *Action::result_str(Action::Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/action/action_impl.cpp b/src/plugins/action/action_impl.cpp index 6f61de536a..3925e575ec 100644 --- a/src/plugins/action/action_impl.cpp +++ b/src/plugins/action/action_impl.cpp @@ -4,7 +4,7 @@ #include "px4_custom_mode.h" #include -namespace dronecode_sdk { +namespace mavsdk { using namespace std::placeholders; // for `_1` @@ -538,4 +538,4 @@ void ActionImpl::command_result_callback(MAVLinkCommands::Result command_result, } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/action/action_impl.h b/src/plugins/action/action_impl.h index 9a9228e765..f179fc07b3 100644 --- a/src/plugins/action/action_impl.h +++ b/src/plugins/action/action_impl.h @@ -6,7 +6,7 @@ #include "plugins/action/action.h" #include "plugin_impl_base.h" -namespace dronecode_sdk { +namespace mavsdk { class ActionImpl : public PluginImplBase { public: @@ -81,4 +81,4 @@ class ActionImpl : public PluginImplBase { static constexpr auto RTL_RETURN_ALTITUDE_PARAM = "RTL_RETURN_ALT"; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/action/include/plugins/action/action.h b/src/plugins/action/include/plugins/action/action.h index fb6bd8ad31..360b9849a1 100644 --- a/src/plugins/action/include/plugins/action/action.h +++ b/src/plugins/action/include/plugins/action/action.h @@ -5,7 +5,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class System; class ActionImpl; @@ -341,4 +341,4 @@ class Action : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/action/mocks/action_mock.h b/src/plugins/action/mocks/action_mock.h index 258996c39b..6e6089109a 100644 --- a/src/plugins/action/mocks/action_mock.h +++ b/src/plugins/action/mocks/action_mock.h @@ -2,7 +2,7 @@ #include "plugins/action/action.h" -namespace dronecode_sdk { +namespace mavsdk { namespace testing { class MockAction { @@ -25,4 +25,4 @@ class MockAction { }; } // namespace testing -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/calibration/calibration.cpp b/src/plugins/calibration/calibration.cpp index 0d72eaad20..f8c0a67cb9 100644 --- a/src/plugins/calibration/calibration.cpp +++ b/src/plugins/calibration/calibration.cpp @@ -3,7 +3,7 @@ #include "calibration_impl.h" #include "calibration_messages.h" -namespace dronecode_sdk { +namespace mavsdk { Calibration::Calibration(System &system) : PluginBase(), _impl(new CalibrationImpl(system)) {} @@ -66,4 +66,4 @@ const char *Calibration::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/calibration/calibration_impl.cpp b/src/plugins/calibration/calibration_impl.cpp index a36c492ae8..c307d73d85 100644 --- a/src/plugins/calibration/calibration_impl.cpp +++ b/src/plugins/calibration/calibration_impl.cpp @@ -7,7 +7,7 @@ #include "px4_custom_mode.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { using namespace std::placeholders; @@ -376,4 +376,4 @@ void CalibrationImpl::report_instruction(const std::string &instruction) call_user_callback(_calibration_callback, Calibration::Result::INSTRUCTION, progress_data); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/calibration/calibration_impl.h b/src/plugins/calibration/calibration_impl.h index 97bf887b0f..8ee28e54aa 100644 --- a/src/plugins/calibration/calibration_impl.h +++ b/src/plugins/calibration/calibration_impl.h @@ -6,7 +6,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class CalibrationImpl : public PluginImplBase { public: @@ -68,4 +68,4 @@ class CalibrationImpl : public PluginImplBase { Calibration::calibration_callback_t _calibration_callback{nullptr}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/calibration/calibration_statustext_parser.cpp b/src/plugins/calibration/calibration_statustext_parser.cpp index d23bc0cc88..c9b3c90b1e 100644 --- a/src/plugins/calibration/calibration_statustext_parser.cpp +++ b/src/plugins/calibration/calibration_statustext_parser.cpp @@ -3,7 +3,7 @@ #include "calibration_messages.h" #include "log.h" -namespace dronecode_sdk { +namespace mavsdk { CalibrationStatustextParser::CalibrationStatustextParser() {} @@ -142,4 +142,4 @@ bool CalibrationStatustextParser::check_instruction(const std::string &statustex return false; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/calibration/calibration_statustext_parser.h b/src/plugins/calibration/calibration_statustext_parser.h index 5eec2f8d1e..fb3e31017d 100644 --- a/src/plugins/calibration/calibration_statustext_parser.h +++ b/src/plugins/calibration/calibration_statustext_parser.h @@ -3,7 +3,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { class CalibrationStatustextParser { public: @@ -42,4 +42,4 @@ class CalibrationStatustextParser { char _tmp_str[64]; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/calibration/calibration_statustext_parser_test.cpp b/src/plugins/calibration/calibration_statustext_parser_test.cpp index c69f1f4c6c..b42a238ac5 100644 --- a/src/plugins/calibration/calibration_statustext_parser_test.cpp +++ b/src/plugins/calibration/calibration_statustext_parser_test.cpp @@ -1,7 +1,7 @@ #include "calibration_statustext_parser.h" #include -using namespace dronecode_sdk; +using namespace mavsdk; TEST(CalibrationStatustextParser, Validity) { diff --git a/src/plugins/calibration/include/plugins/calibration/calibration.h b/src/plugins/calibration/include/plugins/calibration/calibration.h index c3f2fef833..94bcd201da 100644 --- a/src/plugins/calibration/include/plugins/calibration/calibration.h +++ b/src/plugins/calibration/include/plugins/calibration/calibration.h @@ -5,7 +5,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class CalibrationImpl; class System; @@ -143,4 +143,4 @@ class Calibration : public PluginBase { CalibrationImpl *_impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/camera/camera.cpp b/src/plugins/camera/camera.cpp index 642edbc37f..a99341778e 100644 --- a/src/plugins/camera/camera.cpp +++ b/src/plugins/camera/camera.cpp @@ -1,7 +1,7 @@ #include "camera_impl.h" #include "plugins/camera/camera.h" -namespace dronecode_sdk { +namespace mavsdk { Camera::Camera(System &system) : PluginBase(), _impl{new CameraImpl(system)} {} @@ -396,4 +396,4 @@ std::ostream &operator<<(std::ostream &str, Camera::SettingOptions const &settin return str; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/camera/camera_definition.cpp b/src/plugins/camera/camera_definition.cpp index e2b51aa039..ded146c061 100644 --- a/src/plugins/camera/camera_definition.cpp +++ b/src/plugins/camera/camera_definition.cpp @@ -2,7 +2,7 @@ #include "log.h" #include "camera_definition.h" -namespace dronecode_sdk { +namespace mavsdk { CameraDefinition::CameraDefinition() {} @@ -651,4 +651,4 @@ bool CameraDefinition::get_option_str(const std::string &setting_name, return false; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/camera/camera_definition.h b/src/plugins/camera/camera_definition.h index 9812643ed3..bbb3bcc901 100644 --- a/src/plugins/camera/camera_definition.h +++ b/src/plugins/camera/camera_definition.h @@ -8,7 +8,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { class CameraDefinition { public: @@ -94,4 +94,4 @@ class CameraDefinition { std::string _vendor{}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/camera/camera_definition_test.cpp b/src/plugins/camera/camera_definition_test.cpp index 82cacddb3a..a2d9092876 100644 --- a/src/plugins/camera/camera_definition_test.cpp +++ b/src/plugins/camera/camera_definition_test.cpp @@ -6,7 +6,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; static const std::string e90_unit_test_file = "src/plugins/camera/e90_unit_test.xml"; diff --git a/src/plugins/camera/camera_impl.cpp b/src/plugins/camera/camera_impl.cpp index 98176bccb9..4fd46f37bc 100644 --- a/src/plugins/camera/camera_impl.cpp +++ b/src/plugins/camera/camera_impl.cpp @@ -10,7 +10,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { using namespace std::placeholders; // for `_1` @@ -1523,4 +1523,4 @@ void CameraImpl::format_storage_async(Camera::result_callback_t callback) std::bind(&CameraImpl::receive_command_result, _1, callback)); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/camera/camera_impl.h b/src/plugins/camera/camera_impl.h index 4db44335a6..8d0068f094 100644 --- a/src/plugins/camera/camera_impl.h +++ b/src/plugins/camera/camera_impl.h @@ -6,7 +6,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class CameraImpl : public PluginImplBase { public: @@ -222,4 +222,4 @@ class CameraImpl : public PluginImplBase { } _subscribe_possible_setting_options{}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/camera/include/plugins/camera/camera.h b/src/plugins/camera/include/plugins/camera/camera.h index abd39a2246..23cbd1d0a4 100644 --- a/src/plugins/camera/include/plugins/camera/camera.h +++ b/src/plugins/camera/include/plugins/camera/camera.h @@ -12,7 +12,7 @@ #undef ERROR #endif -namespace dronecode_sdk { +namespace mavsdk { class CameraImpl; class System; @@ -744,4 +744,4 @@ bool operator==(const Camera::SettingOptions &lhs, const Camera::SettingOptions */ std::ostream &operator<<(std::ostream &str, Camera::SettingOptions const &setting_options); -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/camera/mocks/camera_mock.h b/src/plugins/camera/mocks/camera_mock.h index c140e18584..1368c6d423 100644 --- a/src/plugins/camera/mocks/camera_mock.h +++ b/src/plugins/camera/mocks/camera_mock.h @@ -2,7 +2,7 @@ #include "plugins/camera/camera.h" -namespace dronecode_sdk { +namespace mavsdk { namespace testing { class MockCamera { @@ -32,4 +32,4 @@ class MockCamera { }; } // namespace testing -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/follow_me/follow_me.cpp b/src/plugins/follow_me/follow_me.cpp index a81910f9e8..9304a28184 100644 --- a/src/plugins/follow_me/follow_me.cpp +++ b/src/plugins/follow_me/follow_me.cpp @@ -1,7 +1,7 @@ #include "follow_me_impl.h" #include "plugins/follow_me/follow_me.h" -namespace dronecode_sdk { +namespace mavsdk { FollowMe::FollowMe(System &system) : PluginBase(), _impl{new FollowMeImpl(system)} {} @@ -84,4 +84,4 @@ std::string FollowMe::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/follow_me/follow_me_impl.cpp b/src/plugins/follow_me/follow_me_impl.cpp index 39418f40e7..1d2f48e339 100644 --- a/src/plugins/follow_me/follow_me_impl.cpp +++ b/src/plugins/follow_me/follow_me_impl.cpp @@ -4,7 +4,7 @@ #include "px4_custom_mode.h" #include -namespace dronecode_sdk { +namespace mavsdk { FollowMeImpl::FollowMeImpl(System &system) : PluginImplBase(system) { @@ -336,4 +336,4 @@ void FollowMeImpl::process_heartbeat(const mavlink_message_t &message) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/follow_me/follow_me_impl.h b/src/plugins/follow_me/follow_me_impl.h index 71b6f0b49f..7742ede530 100644 --- a/src/plugins/follow_me/follow_me_impl.h +++ b/src/plugins/follow_me/follow_me_impl.h @@ -8,7 +8,7 @@ #include "system.h" #include "timeout_handler.h" -namespace dronecode_sdk { +namespace mavsdk { class FollowMeImpl : public PluginImplBase { public: @@ -92,4 +92,4 @@ class FollowMeImpl : public PluginImplBase { std::string debug_str = "FollowMe: "; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/follow_me/include/plugins/follow_me/follow_me.h b/src/plugins/follow_me/include/plugins/follow_me/follow_me.h index da488a447e..c132c9da0a 100644 --- a/src/plugins/follow_me/include/plugins/follow_me/follow_me.h +++ b/src/plugins/follow_me/include/plugins/follow_me/follow_me.h @@ -8,7 +8,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class FollowMeImpl; class System; @@ -199,4 +199,4 @@ class FollowMe : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/geofence/geofence.cpp b/src/plugins/geofence/geofence.cpp index d96d58acdd..56608a7953 100644 --- a/src/plugins/geofence/geofence.cpp +++ b/src/plugins/geofence/geofence.cpp @@ -2,7 +2,7 @@ #include "geofence_impl.h" #include -namespace dronecode_sdk { +namespace mavsdk { Geofence::Geofence(System &system) : PluginBase(), _impl{new GeofenceImpl(system)} {} @@ -42,4 +42,4 @@ const char *Geofence::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/geofence/geofence_impl.cpp b/src/plugins/geofence/geofence_impl.cpp index 205069615d..25dd866d51 100644 --- a/src/plugins/geofence/geofence_impl.cpp +++ b/src/plugins/geofence/geofence_impl.cpp @@ -3,7 +3,7 @@ #include "log.h" #include -namespace dronecode_sdk { +namespace mavsdk { GeofenceImpl::GeofenceImpl(System &system) : PluginImplBase(system), @@ -240,4 +240,4 @@ void GeofenceImpl::report_geofence_result(const Geofence::result_callback_t &cal callback(result); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/geofence/geofence_impl.h b/src/plugins/geofence/geofence_impl.h index 86c88b8f3d..c6815e8800 100644 --- a/src/plugins/geofence/geofence_impl.h +++ b/src/plugins/geofence/geofence_impl.h @@ -9,7 +9,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class GeofenceImpl : public PluginImplBase { public: @@ -53,4 +53,4 @@ class GeofenceImpl : public PluginImplBase { std::atomic _active{false}; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/geofence/include/plugins/geofence/geofence.h b/src/plugins/geofence/include/plugins/geofence/geofence.h index 57e0f3be0e..a714af9fdb 100644 --- a/src/plugins/geofence/include/plugins/geofence/geofence.h +++ b/src/plugins/geofence/include/plugins/geofence/geofence.h @@ -6,7 +6,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class GeofenceImpl; class System; @@ -120,4 +120,4 @@ class Geofence : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/gimbal/gimbal.cpp b/src/plugins/gimbal/gimbal.cpp index 8f3d3d39ab..9e1f223a8d 100644 --- a/src/plugins/gimbal/gimbal.cpp +++ b/src/plugins/gimbal/gimbal.cpp @@ -1,7 +1,7 @@ #include "plugins/gimbal/gimbal.h" #include "gimbal_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Gimbal::Gimbal(System &system) : PluginBase(), _impl{new GimbalImpl(system)} {} @@ -45,4 +45,4 @@ const char *Gimbal::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/gimbal/gimbal_impl.cpp b/src/plugins/gimbal/gimbal_impl.cpp index fc3ee45283..f7f62e1bdc 100644 --- a/src/plugins/gimbal/gimbal_impl.cpp +++ b/src/plugins/gimbal/gimbal_impl.cpp @@ -3,7 +3,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { GimbalImpl::GimbalImpl(System &system) : PluginImplBase(system) { @@ -113,4 +113,4 @@ Gimbal::Result GimbalImpl::gimbal_result_from_command_result(MAVLinkCommands::Re } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/gimbal/gimbal_impl.h b/src/plugins/gimbal/gimbal_impl.h index 2b639aebf0..f235882ab8 100644 --- a/src/plugins/gimbal/gimbal_impl.h +++ b/src/plugins/gimbal/gimbal_impl.h @@ -4,7 +4,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class GimbalImpl : public PluginImplBase { public: @@ -40,4 +40,4 @@ class GimbalImpl : public PluginImplBase { const Gimbal::result_callback_t &callback); }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/gimbal/include/plugins/gimbal/gimbal.h b/src/plugins/gimbal/include/plugins/gimbal/gimbal.h index 21de5b463f..fe45b56e0b 100644 --- a/src/plugins/gimbal/include/plugins/gimbal/gimbal.h +++ b/src/plugins/gimbal/include/plugins/gimbal/gimbal.h @@ -5,7 +5,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class GimbalImpl; class System; @@ -134,4 +134,4 @@ class Gimbal : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/info/include/plugins/info/info.h b/src/plugins/info/include/plugins/info/info.h index 61f6f59e1b..fe74ed0c41 100644 --- a/src/plugins/info/include/plugins/info/info.h +++ b/src/plugins/info/include/plugins/info/info.h @@ -6,7 +6,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class System; class InfoImpl; @@ -138,4 +138,4 @@ class Info : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/info/info.cpp b/src/plugins/info/info.cpp index 9a073cfec1..8af06c3ceb 100644 --- a/src/plugins/info/info.cpp +++ b/src/plugins/info/info.cpp @@ -1,7 +1,7 @@ #include "plugins/info/info.h" #include "info_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Info::Info(System &system) : PluginBase(), _impl{new InfoImpl(system)} {} @@ -36,4 +36,4 @@ std::string Info::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/info/info_impl.cpp b/src/plugins/info/info_impl.cpp index 1aeb8d0167..889c45f4fe 100644 --- a/src/plugins/info/info_impl.cpp +++ b/src/plugins/info/info_impl.cpp @@ -4,7 +4,7 @@ #include "system.h" #include "global_include.h" -namespace dronecode_sdk { +namespace mavsdk { InfoImpl::InfoImpl(System &system) : PluginImplBase(system) { @@ -181,4 +181,4 @@ const char *InfoImpl::product_id_str(uint16_t product_id) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/info/info_impl.h b/src/plugins/info/info_impl.h index f3b74ff6d6..f99ef6b59f 100644 --- a/src/plugins/info/info_impl.h +++ b/src/plugins/info/info_impl.h @@ -6,7 +6,7 @@ #include "plugins/info/info.h" #include "plugin_impl_base.h" -namespace dronecode_sdk { +namespace mavsdk { class InfoImpl : public PluginImplBase { public: @@ -47,4 +47,4 @@ class InfoImpl : public PluginImplBase { translate_binary_to_str(uint8_t *binary, unsigned binary_len, char *str, unsigned str_len); }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/info/mocks/info_mock.h b/src/plugins/info/mocks/info_mock.h index 6e2f1c6735..2b32ce9054 100644 --- a/src/plugins/info/mocks/info_mock.h +++ b/src/plugins/info/mocks/info_mock.h @@ -2,7 +2,7 @@ #include "plugins/info/info.h" -namespace dronecode_sdk { +namespace mavsdk { namespace testing { class MockInfo { @@ -11,4 +11,4 @@ class MockInfo { }; } // namespace testing -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/log_files/include/plugins/log_files/log_files.h b/src/plugins/log_files/include/plugins/log_files/log_files.h index 3fdfd1cba4..2495923d1a 100644 --- a/src/plugins/log_files/include/plugins/log_files/log_files.h +++ b/src/plugins/log_files/include/plugins/log_files/log_files.h @@ -7,7 +7,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class LogFilesImpl; class System; @@ -127,4 +127,4 @@ class LogFiles : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/log_files/log_files.cpp b/src/plugins/log_files/log_files.cpp index c1897a5d73..dde924abc5 100644 --- a/src/plugins/log_files/log_files.cpp +++ b/src/plugins/log_files/log_files.cpp @@ -1,7 +1,7 @@ #include "plugins/log_files/log_files.h" #include "log_files_impl.h" -namespace dronecode_sdk { +namespace mavsdk { LogFiles::LogFiles(System &system) : PluginBase(), _impl{new LogFilesImpl(system)} {} @@ -44,4 +44,4 @@ const char *LogFiles::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/log_files/log_files_impl.cpp b/src/plugins/log_files/log_files_impl.cpp index 8675d82ddb..86ef7274c6 100644 --- a/src/plugins/log_files/log_files_impl.cpp +++ b/src/plugins/log_files/log_files_impl.cpp @@ -5,7 +5,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { LogFilesImpl::LogFilesImpl(System &system) : PluginImplBase(system) { @@ -412,4 +412,4 @@ void LogFilesImpl::write_log_data_to_disk() out_file.close(); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/log_files/log_files_impl.h b/src/plugins/log_files/log_files_impl.h index a329364d1b..d708368128 100644 --- a/src/plugins/log_files/log_files_impl.h +++ b/src/plugins/log_files/log_files_impl.h @@ -5,7 +5,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class LogFilesImpl : public PluginImplBase { public: @@ -70,4 +70,4 @@ class LogFilesImpl : public PluginImplBase { static constexpr unsigned CHUNK_SIZE = 90; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/logging/logging.cpp b/src/plugins/logging/logging.cpp index 7515ad2b9c..3ae4ddff04 100644 --- a/src/plugins/logging/logging.cpp +++ b/src/plugins/logging/logging.cpp @@ -1,7 +1,7 @@ #include "logging.h" #include "logging_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Logging::Logging(System &system) : PluginBase(), _impl{new LoggingImpl(system)} {} @@ -48,4 +48,4 @@ const char *Logging::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/logging/logging.h b/src/plugins/logging/logging.h index 30d72ba6b5..617a091f54 100644 --- a/src/plugins/logging/logging.h +++ b/src/plugins/logging/logging.h @@ -5,7 +5,7 @@ #include -namespace dronecode_sdk { +namespace mavsdk { class LoggingImpl; class System; @@ -112,4 +112,4 @@ class Logging : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/logging/logging_impl.cpp b/src/plugins/logging/logging_impl.cpp index 7f1b4064bd..3b823bbfe0 100644 --- a/src/plugins/logging/logging_impl.cpp +++ b/src/plugins/logging/logging_impl.cpp @@ -3,7 +3,7 @@ #include "mavsdk_impl.h" #include "px4_custom_mode.h" -namespace dronecode_sdk { +namespace mavsdk { LoggingImpl::LoggingImpl(System &system) : PluginImplBase(system) { @@ -133,4 +133,4 @@ void LoggingImpl::command_result_callback(MAVLinkCommands::Result command_result callback(action_result); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/logging/logging_impl.h b/src/plugins/logging/logging_impl.h index 7243070461..03a690c9b5 100644 --- a/src/plugins/logging/logging_impl.h +++ b/src/plugins/logging/logging_impl.h @@ -5,7 +5,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class LoggingImpl : public PluginImplBase { public: @@ -34,4 +34,4 @@ class LoggingImpl : public PluginImplBase { const Logging::result_callback_t &callback); }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h b/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h index ba5d0dce3b..732cd4f3bf 100644 --- a/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h +++ b/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h @@ -8,7 +8,7 @@ #include "mavlink/v2.0/common/mavlink.h" #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class System; class MavlinkPassthroughImpl; @@ -153,4 +153,4 @@ class MavlinkPassthrough : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mavlink_passthrough/mavlink_passthrough.cpp b/src/plugins/mavlink_passthrough/mavlink_passthrough.cpp index 7447158ac8..20074f6c6c 100644 --- a/src/plugins/mavlink_passthrough/mavlink_passthrough.cpp +++ b/src/plugins/mavlink_passthrough/mavlink_passthrough.cpp @@ -1,7 +1,7 @@ #include "plugins/mavlink_passthrough/mavlink_passthrough.h" #include "mavlink_passthrough_impl.h" -namespace dronecode_sdk { +namespace mavsdk { MavlinkPassthrough::MavlinkPassthrough(System &system) : PluginBase(), @@ -66,4 +66,4 @@ void MavlinkPassthrough::intercept_outgoing_messages_async( _impl->intercept_outgoing_messages_async(callback); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.cpp b/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.cpp index 57394d0a7c..983953dd5c 100644 --- a/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.cpp +++ b/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.cpp @@ -3,7 +3,7 @@ #include "system.h" #include "global_include.h" -namespace dronecode_sdk { +namespace mavsdk { MavlinkPassthroughImpl::MavlinkPassthroughImpl(System &system) : PluginImplBase(system) { @@ -83,4 +83,4 @@ void MavlinkPassthroughImpl::intercept_outgoing_messages_async( _parent->intercept_outgoing_messages(callback); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.h b/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.h index 6e4b331f56..4c2893f8c9 100644 --- a/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.h +++ b/src/plugins/mavlink_passthrough/mavlink_passthrough_impl.h @@ -6,7 +6,7 @@ #include "plugins/mavlink_passthrough/mavlink_passthrough.h" #include "plugin_impl_base.h" -namespace dronecode_sdk { +namespace mavsdk { class MavlinkPassthroughImpl : public PluginImplBase { public: @@ -35,4 +35,4 @@ class MavlinkPassthroughImpl : public PluginImplBase { private: }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/include/plugins/mission/mission.h b/src/plugins/mission/include/plugins/mission/mission.h index 30494e4283..e15fb7f5dc 100644 --- a/src/plugins/mission/include/plugins/mission/mission.h +++ b/src/plugins/mission/include/plugins/mission/mission.h @@ -11,7 +11,7 @@ #undef ERROR #endif -namespace dronecode_sdk { +namespace mavsdk { class MissionImpl; class System; @@ -252,4 +252,4 @@ class Mission : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/include/plugins/mission/mission_item.h b/src/plugins/mission/include/plugins/mission/mission_item.h index c469f186eb..8492072df3 100644 --- a/src/plugins/mission/include/plugins/mission/mission_item.h +++ b/src/plugins/mission/include/plugins/mission/mission_item.h @@ -4,7 +4,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { class MissionItemImpl; class MissionImpl; @@ -254,4 +254,4 @@ std::ostream &operator<<(std::ostream &str, MissionItem const &mission_item); */ std::ostream &operator<<(std::ostream &str, MissionItem::CameraAction const &camera_action); -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/mission.cpp b/src/plugins/mission/mission.cpp index 8000bc39ac..b022f17d79 100644 --- a/src/plugins/mission/mission.cpp +++ b/src/plugins/mission/mission.cpp @@ -5,7 +5,7 @@ #include "mavlink_include.h" #include "mission_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Mission::Mission(System &system) : PluginBase(), _impl{new MissionImpl(system)} {} @@ -116,4 +116,4 @@ Mission::Result Mission::import_qgroundcontrol_mission(Mission::mission_items_t return MissionImpl::import_qgroundcontrol_mission(mission_items, qgc_plan_file); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/mission_impl.cpp b/src/plugins/mission/mission_impl.cpp index 6b49d251ee..d39fdf0a08 100644 --- a/src/plugins/mission/mission_impl.cpp +++ b/src/plugins/mission/mission_impl.cpp @@ -6,7 +6,7 @@ #include // for `std::stringstream` #include -namespace dronecode_sdk { +namespace mavsdk { using namespace std::placeholders; // for `_1` @@ -1489,4 +1489,4 @@ Mission::Result MissionImpl::import_mission_items(Mission::mission_items_t &all_ return result; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/mission_impl.h b/src/plugins/mission/mission_impl.h index eb8cae055c..d3e07e2960 100644 --- a/src/plugins/mission/mission_impl.h +++ b/src/plugins/mission/mission_impl.h @@ -12,7 +12,7 @@ using namespace json11; -namespace dronecode_sdk { +namespace mavsdk { class MissionImpl : public PluginImplBase { public: @@ -149,4 +149,4 @@ class MissionImpl : public PluginImplBase { static constexpr double RETRY_TIMEOUT_S = 0.250; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/mission_import_qgc_test.cpp b/src/plugins/mission/mission_import_qgc_test.cpp index f03b1fe6a5..2cdd79c6dd 100644 --- a/src/plugins/mission/mission_import_qgc_test.cpp +++ b/src/plugins/mission/mission_import_qgc_test.cpp @@ -7,7 +7,7 @@ #include "mavlink_include.h" #include "plugins/mission/mission.h" -using namespace dronecode_sdk; +using namespace mavsdk; static const std::string QGC_SAMPLE_PLAN = "src/plugins/mission/qgroundcontrol_sample.plan"; diff --git a/src/plugins/mission/mission_item.cpp b/src/plugins/mission/mission_item.cpp index 8693dc70b6..d37c4ed0fb 100644 --- a/src/plugins/mission/mission_item.cpp +++ b/src/plugins/mission/mission_item.cpp @@ -8,7 +8,7 @@ #include "mission_item_impl.h" -namespace dronecode_sdk { +namespace mavsdk { MissionItem::MissionItem() : _impl{new MissionItemImpl()} {} @@ -251,4 +251,4 @@ std::ostream &operator<<(std::ostream &str, MissionItem::CameraAction const &cam } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/mission_item_impl.cpp b/src/plugins/mission/mission_item_impl.cpp index 41950654f9..506c74a389 100644 --- a/src/plugins/mission/mission_item_impl.cpp +++ b/src/plugins/mission/mission_item_impl.cpp @@ -3,7 +3,7 @@ #include "log.h" #include -namespace dronecode_sdk { +namespace mavsdk { MissionItemImpl::MissionItemImpl() {} @@ -136,4 +136,4 @@ bool MissionItemImpl::is_position_finite() const std::isfinite(_relative_altitude_m); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/mission_item_impl.h b/src/plugins/mission/mission_item_impl.h index 05ff077058..e023e3f843 100644 --- a/src/plugins/mission/mission_item_impl.h +++ b/src/plugins/mission/mission_item_impl.h @@ -3,7 +3,7 @@ #include "mavlink_include.h" #include "plugins/mission/mission_item.h" -namespace dronecode_sdk { +namespace mavsdk { class MissionItemImpl { public: @@ -58,4 +58,4 @@ class MissionItemImpl { double _camera_photo_interval_s = 1.0; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission/mocks/mission_mock.h b/src/plugins/mission/mocks/mission_mock.h index 65b901cb44..e07461dfea 100644 --- a/src/plugins/mission/mocks/mission_mock.h +++ b/src/plugins/mission/mocks/mission_mock.h @@ -5,7 +5,7 @@ #include "plugins/mission/mission.h" #include "plugins/mission/mission_item.h" -namespace dronecode_sdk { +namespace mavsdk { namespace testing { class MockMission { @@ -30,4 +30,4 @@ class MockMission { }; } // namespace testing -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission_raw/include/plugins/mission_raw/mission_raw.h b/src/plugins/mission_raw/include/plugins/mission_raw/mission_raw.h index edcd4899c8..74af85ff5c 100644 --- a/src/plugins/mission_raw/include/plugins/mission_raw/mission_raw.h +++ b/src/plugins/mission_raw/include/plugins/mission_raw/mission_raw.h @@ -6,7 +6,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class MissionRawImpl; class System; @@ -141,4 +141,4 @@ class MissionRaw : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission_raw/mission_raw.cpp b/src/plugins/mission_raw/mission_raw.cpp index cf0bf5081e..4c84e444f1 100644 --- a/src/plugins/mission_raw/mission_raw.cpp +++ b/src/plugins/mission_raw/mission_raw.cpp @@ -3,7 +3,7 @@ #include "plugins/mission_raw/mission_raw.h" #include "mission_raw_impl.h" -namespace dronecode_sdk { +namespace mavsdk { MissionRaw::MissionRaw(System &system) : PluginBase(), _impl{new MissionRawImpl(system)} {} @@ -45,4 +45,4 @@ void MissionRaw::subscribe_mission_changed(mission_changed_callback_t callback) _impl->subscribe_mission_changed(callback); } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission_raw/mission_raw_impl.cpp b/src/plugins/mission_raw/mission_raw_impl.cpp index 080bec9d62..0d821d07e6 100644 --- a/src/plugins/mission_raw/mission_raw_impl.cpp +++ b/src/plugins/mission_raw/mission_raw_impl.cpp @@ -5,7 +5,7 @@ #include // for `std::stringstream` #include -namespace dronecode_sdk { +namespace mavsdk { using namespace std::placeholders; // for `_1` @@ -332,4 +332,4 @@ void MissionRawImpl::subscribe_mission_changed(MissionRaw::mission_changed_callb _mission_changed.callback = callback; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/mission_raw/mission_raw_impl.h b/src/plugins/mission_raw/mission_raw_impl.h index 420b374195..7f4cc95bed 100644 --- a/src/plugins/mission_raw/mission_raw_impl.h +++ b/src/plugins/mission_raw/mission_raw_impl.h @@ -7,7 +7,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class MissionRawImpl : public PluginImplBase { public: @@ -57,4 +57,4 @@ class MissionRawImpl : public PluginImplBase { static constexpr double RETRY_TIMEOUT_S = 0.250; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/offboard/include/plugins/offboard/offboard.h b/src/plugins/offboard/include/plugins/offboard/offboard.h index f39e6b1029..3859c59754 100644 --- a/src/plugins/offboard/include/plugins/offboard/offboard.h +++ b/src/plugins/offboard/include/plugins/offboard/offboard.h @@ -5,7 +5,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class OffboardImpl; class System; @@ -300,4 +300,4 @@ bool operator==(const Offboard::VelocityNEDYaw &lhs, const Offboard::VelocityNED */ std::ostream &operator<<(std::ostream &str, Offboard::VelocityNEDYaw const &velocity_ned_yaw); -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/offboard/mocks/offboard_mock.h b/src/plugins/offboard/mocks/offboard_mock.h index f1c39b099f..d520b824a2 100644 --- a/src/plugins/offboard/mocks/offboard_mock.h +++ b/src/plugins/offboard/mocks/offboard_mock.h @@ -2,7 +2,7 @@ #include "plugins/offboard/offboard.h" -namespace dronecode_sdk { +namespace mavsdk { namespace testing { class MockOffboard { @@ -18,4 +18,4 @@ class MockOffboard { }; } // namespace testing -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/offboard/offboard.cpp b/src/plugins/offboard/offboard.cpp index 6907704d2c..df3434d9e0 100644 --- a/src/plugins/offboard/offboard.cpp +++ b/src/plugins/offboard/offboard.cpp @@ -1,7 +1,7 @@ #include "plugins/offboard/offboard.h" #include "offboard_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Offboard::Offboard(System &system) : PluginBase(), _impl{new OffboardImpl(system)} {} @@ -149,4 +149,4 @@ std::ostream &operator<<(std::ostream &str, Offboard::VelocityNEDYaw const &velo << ", yaw_deg: " << velocity_ned_yaw.yaw_deg << "]"; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/offboard/offboard_impl.cpp b/src/plugins/offboard/offboard_impl.cpp index 6f8dffcade..6adbdd1479 100644 --- a/src/plugins/offboard/offboard_impl.cpp +++ b/src/plugins/offboard/offboard_impl.cpp @@ -3,7 +3,7 @@ #include "mavsdk_impl.h" #include "px4_custom_mode.h" -namespace dronecode_sdk { +namespace mavsdk { OffboardImpl::OffboardImpl(System &system) : PluginImplBase(system) { @@ -540,4 +540,4 @@ Offboard::Result OffboardImpl::offboard_result_from_command_result(MAVLinkComman } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/offboard/offboard_impl.h b/src/plugins/offboard/offboard_impl.h index b5e39e74c0..4f5e2afb15 100644 --- a/src/plugins/offboard/offboard_impl.h +++ b/src/plugins/offboard/offboard_impl.h @@ -7,7 +7,7 @@ #include "plugin_impl_base.h" #include "system.h" -namespace dronecode_sdk { +namespace mavsdk { class OffboardImpl : public PluginImplBase { public: @@ -72,4 +72,4 @@ class OffboardImpl : public PluginImplBase { const float SEND_INTERVAL_S = 0.05f; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/param/include/plugins/param/param.h b/src/plugins/param/include/plugins/param/param.h index f429b71307..1508f6c79f 100644 --- a/src/plugins/param/include/plugins/param/param.h +++ b/src/plugins/param/include/plugins/param/param.h @@ -6,7 +6,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class System; class ParamImpl; @@ -104,4 +104,4 @@ class Param : public PluginBase { std::unique_ptr _impl; }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/param/param.cpp b/src/plugins/param/param.cpp index 7eb40303d6..2d7699004b 100644 --- a/src/plugins/param/param.cpp +++ b/src/plugins/param/param.cpp @@ -1,7 +1,7 @@ #include "plugins/param/param.h" #include "param_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Param::Param(System &system) : PluginBase(), _impl{new ParamImpl(system)} {} @@ -47,4 +47,4 @@ std::string Param::result_str(Result result) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/param/param_impl.cpp b/src/plugins/param/param_impl.cpp index 16ff1e116e..97f82cdeb3 100644 --- a/src/plugins/param/param_impl.cpp +++ b/src/plugins/param/param_impl.cpp @@ -3,7 +3,7 @@ #include "system.h" #include "global_include.h" -namespace dronecode_sdk { +namespace mavsdk { ParamImpl::ParamImpl(System &system) : PluginImplBase(system) { @@ -66,4 +66,4 @@ Param::Result ParamImpl::result_from_mavlink_parameters_result(MAVLinkParameters } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/param/param_impl.h b/src/plugins/param/param_impl.h index 594e120d86..a7ec1ee60b 100644 --- a/src/plugins/param/param_impl.h +++ b/src/plugins/param/param_impl.h @@ -6,7 +6,7 @@ #include "plugins/param/param.h" #include "plugin_impl_base.h" -namespace dronecode_sdk { +namespace mavsdk { class ParamImpl : public PluginImplBase { public: @@ -31,4 +31,4 @@ class ParamImpl : public PluginImplBase { static Param::Result result_from_mavlink_parameters_result(MAVLinkParameters::Result result); }; -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/telemetry/include/plugins/telemetry/telemetry.h b/src/plugins/telemetry/include/plugins/telemetry/telemetry.h index 00b17657f6..58cb0a3252 100644 --- a/src/plugins/telemetry/include/plugins/telemetry/telemetry.h +++ b/src/plugins/telemetry/include/plugins/telemetry/telemetry.h @@ -6,7 +6,7 @@ #include "plugin_base.h" -namespace dronecode_sdk { +namespace mavsdk { class TelemetryImpl; class System; @@ -900,4 +900,4 @@ std::ostream &operator<<(std::ostream &str, Telemetry::RCStatus const &rc_status */ std::ostream &operator<<(std::ostream &str, Telemetry::StatusText const &status_text); -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/telemetry/math_conversions.cpp b/src/plugins/telemetry/math_conversions.cpp index 546109e323..b0e4a71360 100644 --- a/src/plugins/telemetry/math_conversions.cpp +++ b/src/plugins/telemetry/math_conversions.cpp @@ -2,7 +2,7 @@ #include "math_conversions.h" #include -namespace dronecode_sdk { +namespace mavsdk { // TODO: this needs to be unit tested. @@ -37,4 +37,4 @@ Telemetry::Quaternion to_quaternion_from_euler_angle(Telemetry::EulerAngle euler return quaternion; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/telemetry/math_conversions.h b/src/plugins/telemetry/math_conversions.h index 3a73861105..c0c345842a 100644 --- a/src/plugins/telemetry/math_conversions.h +++ b/src/plugins/telemetry/math_conversions.h @@ -2,9 +2,9 @@ #include "plugins/telemetry/telemetry.h" -namespace dronecode_sdk { +namespace mavsdk { Telemetry::EulerAngle to_euler_angle_from_quaternion(Telemetry::Quaternion quaternion); Telemetry::Quaternion to_quaternion_from_euler_angle(Telemetry::EulerAngle euler_angle); -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/telemetry/mocks/telemetry_mock.h b/src/plugins/telemetry/mocks/telemetry_mock.h index 5f57a6b7a7..b190c62d83 100644 --- a/src/plugins/telemetry/mocks/telemetry_mock.h +++ b/src/plugins/telemetry/mocks/telemetry_mock.h @@ -2,7 +2,7 @@ #include "plugins/telemetry/telemetry.h" -namespace dronecode_sdk { +namespace mavsdk { namespace testing { class MockTelemetry { @@ -29,4 +29,4 @@ class MockTelemetry { }; } // namespace testing -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/telemetry/telemetry.cpp b/src/plugins/telemetry/telemetry.cpp index bdafdba82f..5efa100df9 100644 --- a/src/plugins/telemetry/telemetry.cpp +++ b/src/plugins/telemetry/telemetry.cpp @@ -4,7 +4,7 @@ #include "plugins/telemetry/telemetry.h" #include "telemetry_impl.h" -namespace dronecode_sdk { +namespace mavsdk { Telemetry::Telemetry(System &system) : PluginBase(), _impl{new TelemetryImpl(system)} {} @@ -491,4 +491,4 @@ std::ostream &operator<<(std::ostream &str, Telemetry::StatusText const &status_ return str << "[statustext: " << status_text.text << "]"; } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/telemetry/telemetry_impl.cpp b/src/plugins/telemetry/telemetry_impl.cpp index ed298d65b2..1235032a16 100644 --- a/src/plugins/telemetry/telemetry_impl.cpp +++ b/src/plugins/telemetry/telemetry_impl.cpp @@ -7,7 +7,7 @@ #include #include -namespace dronecode_sdk { +namespace mavsdk { TelemetryImpl::TelemetryImpl(System &system) : PluginImplBase(system) { @@ -1051,4 +1051,4 @@ void TelemetryImpl::process_parameter_update(const std::string &name) } } -} // namespace dronecode_sdk +} // namespace mavsdk diff --git a/src/plugins/telemetry/telemetry_impl.h b/src/plugins/telemetry/telemetry_impl.h index f82c30e8cb..97cbfdeb0b 100644 --- a/src/plugins/telemetry/telemetry_impl.h +++ b/src/plugins/telemetry/telemetry_impl.h @@ -12,7 +12,7 @@ // is disabled for now. //#define LEVEL_CALIBRATION -namespace dronecode_sdk { +namespace mavsdk { class System; @@ -213,4 +213,4 @@ class TelemetryImpl : public PluginImplBase { void *_timeout_cookie{nullptr}; }; -} // namespace dronecode_sdk +} // namespace mavsdk From d4fc6c00d2a8f0f79429612cc384b021e451b1d6 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 10:45:03 +0200 Subject: [PATCH 05/15] example: namespace dronecode_sdk -> mavsdk --- example/battery/battery.cpp | 2 +- example/calibrate/calibrate.cpp | 2 +- example/fly_mission/fly_mission.cpp | 2 +- example/fly_multiple_drones/fly_multiple_drones.cpp | 2 +- example/fly_qgc_mission/fly_qgc_mission.cpp | 2 +- example/follow_me/follow_me.cpp | 2 +- example/geofence_inclusion/geofence_inclusion.cpp | 2 +- example/multiple_drones/multiple_drones.cpp | 2 +- example/offboard_velocity/offboard_velocity.cpp | 2 +- example/takeoff_land/takeoff_and_land.cpp | 2 +- .../transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/example/battery/battery.cpp b/example/battery/battery.cpp index 5eb3133e9f..2aa0c5548f 100644 --- a/example/battery/battery.cpp +++ b/example/battery/battery.cpp @@ -12,7 +12,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; static void subscribe_armed(std::shared_ptr telemetry); static void send_battery_status(std::shared_ptr mavlink_passthrough); diff --git a/example/calibrate/calibrate.cpp b/example/calibrate/calibrate.cpp index d65fc8c59e..79abef94a8 100644 --- a/example/calibrate/calibrate.cpp +++ b/example/calibrate/calibrate.cpp @@ -3,7 +3,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; bool are_arguments_valid(int argc, char **argv); void print_usage(const std::string &); diff --git a/example/fly_mission/fly_mission.cpp b/example/fly_mission/fly_mission.cpp index edcc4dcf07..642ac877ef 100644 --- a/example/fly_mission/fly_mission.cpp +++ b/example/fly_mission/fly_mission.cpp @@ -27,7 +27,7 @@ #define TELEMETRY_CONSOLE_TEXT "\033[34m" // Turn text on console blue #define NORMAL_CONSOLE_TEXT "\033[0m" // Restore normal console colour -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` using namespace std::chrono; // for seconds(), milliseconds() using namespace std::this_thread; // for sleep_for() diff --git a/example/fly_multiple_drones/fly_multiple_drones.cpp b/example/fly_multiple_drones/fly_multiple_drones.cpp index 7ee56b9d62..df7471d228 100644 --- a/example/fly_multiple_drones/fly_multiple_drones.cpp +++ b/example/fly_multiple_drones/fly_multiple_drones.cpp @@ -25,7 +25,7 @@ Author: Shusil Shapkota (Air Matrix) #include #include -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::this_thread; using namespace std::chrono; diff --git a/example/fly_qgc_mission/fly_qgc_mission.cpp b/example/fly_qgc_mission/fly_qgc_mission.cpp index b46852ada7..4ec57a8861 100644 --- a/example/fly_qgc_mission/fly_qgc_mission.cpp +++ b/example/fly_qgc_mission/fly_qgc_mission.cpp @@ -38,7 +38,7 @@ #define TELEMETRY_CONSOLE_TEXT "\033[34m" // Turn text on console blue #define NORMAL_CONSOLE_TEXT "\033[0m" // Restore normal console colour -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::chrono; // for seconds(), milliseconds() using namespace std::this_thread; // for sleep_for() diff --git a/example/follow_me/follow_me.cpp b/example/follow_me/follow_me.cpp index d2a0518ef9..bce9b6baf8 100644 --- a/example/follow_me/follow_me.cpp +++ b/example/follow_me/follow_me.cpp @@ -21,7 +21,7 @@ #include "fake_location_provider.h" -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` using namespace std::chrono; // for seconds(), milliseconds(), etc using namespace std::this_thread; // for sleep_for() diff --git a/example/geofence_inclusion/geofence_inclusion.cpp b/example/geofence_inclusion/geofence_inclusion.cpp index 7b83966d89..4dedce257a 100644 --- a/example/geofence_inclusion/geofence_inclusion.cpp +++ b/example/geofence_inclusion/geofence_inclusion.cpp @@ -25,7 +25,7 @@ #define TELEMETRY_CONSOLE_TEXT "\033[34m" // Turn text on console blue #define NORMAL_CONSOLE_TEXT "\033[0m" // Restore normal console colour -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::placeholders; // for `_1` using namespace std::chrono; // for seconds(), milliseconds() using namespace std::this_thread; // for sleep_for() diff --git a/example/multiple_drones/multiple_drones.cpp b/example/multiple_drones/multiple_drones.cpp index dcd6b8da05..a31b874f4b 100644 --- a/example/multiple_drones/multiple_drones.cpp +++ b/example/multiple_drones/multiple_drones.cpp @@ -13,7 +13,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::this_thread; using namespace std::chrono; diff --git a/example/offboard_velocity/offboard_velocity.cpp b/example/offboard_velocity/offboard_velocity.cpp index 94520d577e..b6ee1a6b5c 100644 --- a/example/offboard_velocity/offboard_velocity.cpp +++ b/example/offboard_velocity/offboard_velocity.cpp @@ -17,7 +17,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; using std::this_thread::sleep_for; using std::chrono::milliseconds; using std::chrono::seconds; diff --git a/example/takeoff_land/takeoff_and_land.cpp b/example/takeoff_land/takeoff_and_land.cpp index 0ca76974d8..403aef85bd 100644 --- a/example/takeoff_land/takeoff_and_land.cpp +++ b/example/takeoff_land/takeoff_and_land.cpp @@ -11,7 +11,7 @@ #include #include -using namespace dronecode_sdk; +using namespace mavsdk; using namespace std::this_thread; using namespace std::chrono; diff --git a/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp b/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp index 1fcdf8f481..51b57febd0 100644 --- a/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp +++ b/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp @@ -10,7 +10,7 @@ using std::this_thread::sleep_for; using std::chrono::seconds; using std::chrono::milliseconds; -using namespace dronecode_sdk; +using namespace mavsdk; static constexpr auto ERROR_CONSOLE_TEXT = "\033[31m"; static constexpr auto TELEMETRY_CONSOLE_TEXT = "\033[34m"; From 9e3c3dfad146b753ac9088c34e2ab7964b37f7f2 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 10:49:49 +0200 Subject: [PATCH 06/15] src: dronecode_sdk:: -> mavsdk:: --- src/backend/src/backend.cpp | 2 +- src/backend/src/backend_api.cpp | 2 +- src/backend/src/connection_initiator.h | 2 +- src/backend/src/core/core_service_impl.h | 8 +- .../src/plugins/action/action_service_impl.h | 17 +- .../calibration/calibration_service_impl.h | 23 +- .../src/plugins/camera/camera_service_impl.h | 185 ++++--- .../src/plugins/gimbal/gimbal_service_impl.h | 2 +- .../src/plugins/info/info_service_impl.h | 2 +- .../plugins/mission/mission_service_impl.h | 26 +- .../plugins/offboard/offboard_service_impl.h | 24 +- .../src/plugins/param/param_service_impl.h | 10 +- .../telemetry/telemetry_service_impl.h | 261 +++++----- src/backend/test/action_service_impl_test.cpp | 128 +++-- src/backend/test/camera_service_impl_test.cpp | 455 +++++++++--------- .../test/connection_initiator_test.cpp | 6 +- src/backend/test/core_service_impl_test.cpp | 28 +- src/backend/test/info_service_impl_test.cpp | 22 +- .../test/mission_service_impl_test.cpp | 26 +- .../test/offboard_service_impl_test.cpp | 103 ++-- .../test/telemetry_service_impl_test.cpp | 122 ++--- src/core/any.h | 4 +- src/core/log.h | 4 +- src/debug_helpers/drop_debug_main.cpp | 6 +- src/integration_tests/camera_test_helpers.cpp | 5 +- src/integration_tests/camera_test_helpers.h | 17 +- .../integration_test_helper.h | 10 +- .../system_connection_sync.cpp | 6 +- 28 files changed, 735 insertions(+), 771 deletions(-) diff --git a/src/backend/src/backend.cpp b/src/backend/src/backend.cpp index 31a197aa42..4b4e56709b 100644 --- a/src/backend/src/backend.cpp +++ b/src/backend/src/backend.cpp @@ -30,7 +30,7 @@ class DronecodeSDKBackend::Impl { private: DronecodeSDK _dc; - ConnectionInitiator _connection_initiator; + ConnectionInitiator _connection_initiator; std::unique_ptr _server; }; diff --git a/src/backend/src/backend_api.cpp b/src/backend/src/backend_api.cpp index ede3948fcd..dc92f97508 100644 --- a/src/backend/src/backend_api.cpp +++ b/src/backend/src/backend_api.cpp @@ -4,7 +4,7 @@ void runBackend(const char *connection_url, void (*onServerStarted)(void *), void *context) { - dronecode_sdk::backend::DronecodeSDKBackend backend; + mavsdk::backend::DronecodeSDKBackend backend; backend.startGRPCServer(); backend.connect(std::string(connection_url)); diff --git a/src/backend/src/connection_initiator.h b/src/backend/src/connection_initiator.h index 144a08f200..a3eab301e5 100644 --- a/src/backend/src/connection_initiator.h +++ b/src/backend/src/connection_initiator.h @@ -41,7 +41,7 @@ template class ConnectionInitiator { bool add_any_connection(DronecodeSDK &dc, const std::string &connection_url) { - dronecode_sdk::ConnectionResult connection_result = dc.add_any_connection(connection_url); + mavsdk::ConnectionResult connection_result = dc.add_any_connection(connection_url); if (connection_result != ConnectionResult::SUCCESS) { LogErr() << "Connection failed: " << connection_result_str(connection_result); diff --git a/src/backend/src/core/core_service_impl.h b/src/backend/src/core/core_service_impl.h index 9c5cf99d77..de654b59f0 100644 --- a/src/backend/src/core/core_service_impl.h +++ b/src/backend/src/core/core_service_impl.h @@ -8,7 +8,7 @@ namespace mavsdk { namespace backend { template -class CoreServiceImpl final : public dronecode_sdk::rpc::core::CoreService::Service { +class CoreServiceImpl final : public mavsdk::rpc::core::CoreService::Service { public: CoreServiceImpl(DronecodeSDK &dc) : _dc(dc), @@ -41,7 +41,7 @@ class CoreServiceImpl final : public dronecode_sdk::rpc::core::CoreService::Serv grpc::Status ListRunningPlugins(grpc::ServerContext * /* context */, const rpc::core::ListRunningPluginsRequest * /* request */, - dronecode_sdk::rpc::core::ListRunningPluginsResponse *response) override + mavsdk::rpc::core::ListRunningPluginsResponse *response) override { std::string plugin_names[10] = {"action", "calibration", @@ -72,14 +72,14 @@ class CoreServiceImpl final : public dronecode_sdk::rpc::core::CoreService::Serv std::future _stop_future; - static dronecode_sdk::rpc::core::ConnectionStateResponse + static mavsdk::rpc::core::ConnectionStateResponse createRpcConnectionStateResponse(const uint64_t uuid, const bool is_connected) { auto rpc_connection_state = new rpc::core::ConnectionState(); rpc_connection_state->set_uuid(uuid); rpc_connection_state->set_is_connected(is_connected); - dronecode_sdk::rpc::core::ConnectionStateResponse rpc_connection_state_response; + mavsdk::rpc::core::ConnectionStateResponse rpc_connection_state_response; rpc_connection_state_response.set_allocated_connection_state(rpc_connection_state); return rpc_connection_state_response; diff --git a/src/backend/src/plugins/action/action_service_impl.h b/src/backend/src/plugins/action/action_service_impl.h index b7329612cc..6019bfc25a 100644 --- a/src/backend/src/plugins/action/action_service_impl.h +++ b/src/backend/src/plugins/action/action_service_impl.h @@ -23,14 +23,13 @@ class ActionServiceImpl final : public rpc::action::ActionService::Service { } template - void fillResponseWithResult(ResponseType *response, - dronecode_sdk::Action::Result &action_result) const + void fillResponseWithResult(ResponseType *response, mavsdk::Action::Result &action_result) const { auto rpc_result = static_cast(action_result); auto *rpc_action_result = new rpc::action::ActionResult(); rpc_action_result->set_result(rpc_result); - rpc_action_result->set_result_str(dronecode_sdk::Action::result_str(action_result)); + rpc_action_result->set_result_str(mavsdk::Action::result_str(action_result)); response->set_allocated_action_result(rpc_action_result); } @@ -151,7 +150,7 @@ class ActionServiceImpl final : public rpc::action::ActionService::Service { auto *rpc_action_result = new rpc::action::ActionResult(); rpc_action_result->set_result( static_cast(result_pair.first)); - rpc_action_result->set_result_str(dronecode_sdk::Action::result_str(result_pair.first)); + rpc_action_result->set_result_str(mavsdk::Action::result_str(result_pair.first)); response->set_allocated_action_result(rpc_action_result); response->set_altitude(result_pair.second); @@ -183,7 +182,7 @@ class ActionServiceImpl final : public rpc::action::ActionService::Service { auto *rpc_action_result = new rpc::action::ActionResult(); rpc_action_result->set_result( static_cast(result_pair.first)); - rpc_action_result->set_result_str(dronecode_sdk::Action::result_str(result_pair.first)); + rpc_action_result->set_result_str(mavsdk::Action::result_str(result_pair.first)); response->set_allocated_action_result(rpc_action_result); response->set_speed(result_pair.second); @@ -198,13 +197,13 @@ class ActionServiceImpl final : public rpc::action::ActionService::Service { { if (request != nullptr) { const auto requested_speed = request->speed(); - dronecode_sdk::Action::Result action_result = _action.set_max_speed(requested_speed); + mavsdk::Action::Result action_result = _action.set_max_speed(requested_speed); if (response != nullptr) { auto *rpc_action_result = new rpc::action::ActionResult(); rpc_action_result->set_result( static_cast(action_result)); - rpc_action_result->set_result_str(dronecode_sdk::Action::result_str(action_result)); + rpc_action_result->set_result_str(mavsdk::Action::result_str(action_result)); response->set_allocated_action_result(rpc_action_result); } } @@ -223,7 +222,7 @@ class ActionServiceImpl final : public rpc::action::ActionService::Service { auto *rpc_action_result = new rpc::action::ActionResult(); rpc_action_result->set_result( static_cast(result_pair.first)); - rpc_action_result->set_result_str(dronecode_sdk::Action::result_str(result_pair.first)); + rpc_action_result->set_result_str(mavsdk::Action::result_str(result_pair.first)); response->set_allocated_action_result(rpc_action_result); response->set_relative_altitude_m(result_pair.second); @@ -246,7 +245,7 @@ class ActionServiceImpl final : public rpc::action::ActionService::Service { auto *rpc_action_result = new rpc::action::ActionResult(); rpc_action_result->set_result( static_cast(action_result)); - rpc_action_result->set_result_str(dronecode_sdk::Action::result_str(action_result)); + rpc_action_result->set_result_str(mavsdk::Action::result_str(action_result)); response->set_allocated_action_result(rpc_action_result); } diff --git a/src/backend/src/plugins/calibration/calibration_service_impl.h b/src/backend/src/plugins/calibration/calibration_service_impl.h index 6273496122..b2f80e7ced 100644 --- a/src/backend/src/plugins/calibration/calibration_service_impl.h +++ b/src/backend/src/plugins/calibration/calibration_service_impl.h @@ -12,7 +12,7 @@ class CalibrationServiceImpl final : public rpc::calibration::CalibrationService CalibrationServiceImpl(Calibration &calibration) : _calibration(calibration) {} static std::unique_ptr - translateCalibrationResult(const dronecode_sdk::Calibration::Result &calibration_result) + translateCalibrationResult(const mavsdk::Calibration::Result &calibration_result) { auto rpc_calibration_result = std::unique_ptr( new rpc::calibration::CalibrationResult()); @@ -20,14 +20,13 @@ class CalibrationServiceImpl final : public rpc::calibration::CalibrationService auto rpc_result = static_cast(calibration_result); rpc_calibration_result->set_result(rpc_result); - rpc_calibration_result->set_result_str( - dronecode_sdk::Calibration::result_str(calibration_result)); + rpc_calibration_result->set_result_str(mavsdk::Calibration::result_str(calibration_result)); return rpc_calibration_result; } static std::unique_ptr - translateProgressData(const dronecode_sdk::Calibration::ProgressData &progress_data) + translateProgressData(const mavsdk::Calibration::ProgressData &progress_data) { auto rpc_progress_data = std::unique_ptr(new rpc::calibration::ProgressData()); @@ -52,8 +51,8 @@ class CalibrationServiceImpl final : public rpc::calibration::CalibrationService _calibration.calibrate_gyro_async( [this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Calibration::Result result, - const dronecode_sdk::Calibration::ProgressData progress_data) { + const mavsdk::Calibration::Result result, + const mavsdk::Calibration::ProgressData progress_data) { rpc::calibration::CalibrateGyroResponse rpc_response; rpc_response.set_allocated_calibration_result( translateCalibrationResult(result).release()); @@ -84,8 +83,8 @@ class CalibrationServiceImpl final : public rpc::calibration::CalibrationService _calibration.calibrate_accelerometer_async( [this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Calibration::Result result, - const dronecode_sdk::Calibration::ProgressData progress_data) { + const mavsdk::Calibration::Result result, + const mavsdk::Calibration::ProgressData progress_data) { rpc::calibration::CalibrateAccelerometerResponse rpc_response; rpc_response.set_allocated_calibration_result( translateCalibrationResult(result).release()); @@ -117,8 +116,8 @@ class CalibrationServiceImpl final : public rpc::calibration::CalibrationService _calibration.calibrate_magnetometer_async( [this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Calibration::Result result, - const dronecode_sdk::Calibration::ProgressData progress_data) { + const mavsdk::Calibration::Result result, + const mavsdk::Calibration::ProgressData progress_data) { rpc::calibration::CalibrateMagnetometerResponse rpc_response; rpc_response.set_allocated_calibration_result( translateCalibrationResult(result).release()); @@ -149,8 +148,8 @@ class CalibrationServiceImpl final : public rpc::calibration::CalibrationService _calibration.calibrate_gimbal_accelerometer_async( [this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Calibration::Result result, - const dronecode_sdk::Calibration::ProgressData progress_data) { + const mavsdk::Calibration::Result result, + const mavsdk::Calibration::ProgressData progress_data) { rpc::calibration::CalibrateGimbalAccelerometerResponse rpc_response; rpc_response.set_allocated_calibration_result( translateCalibrationResult(result).release()); diff --git a/src/backend/src/plugins/camera/camera_service_impl.h b/src/backend/src/plugins/camera/camera_service_impl.h index d328f006d2..15c0948397 100644 --- a/src/backend/src/plugins/camera/camera_service_impl.h +++ b/src/backend/src/plugins/camera/camera_service_impl.h @@ -25,14 +25,13 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } template - void fillResponseWithResult(ResponseType *response, - dronecode_sdk::Camera::Result camera_result) const + void fillResponseWithResult(ResponseType *response, mavsdk::Camera::Result camera_result) const { auto rpc_result = static_cast(camera_result); auto *rpc_camera_result = new rpc::camera::CameraResult(); rpc_camera_result->set_result(rpc_result); - rpc_camera_result->set_result_str(dronecode_sdk::Camera::result_str(camera_result)); + rpc_camera_result->set_result_str(mavsdk::Camera::result_str(camera_result)); response->set_allocated_camera_result(rpc_camera_result); } @@ -43,7 +42,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { { if (request == nullptr) { if (response != nullptr) { - fillResponseWithResult(response, dronecode_sdk::Camera::Result::WRONG_ARGUMENT); + fillResponseWithResult(response, mavsdk::Camera::Result::WRONG_ARGUMENT); } return grpc::Status::OK; @@ -138,24 +137,24 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return grpc::Status::OK; } - static dronecode_sdk::Camera::Mode translateRPCCameraMode(const rpc::camera::CameraMode mode) + static mavsdk::Camera::Mode translateRPCCameraMode(const rpc::camera::CameraMode mode) { switch (mode) { case rpc::camera::CameraMode::PHOTO: - return dronecode_sdk::Camera::Mode::PHOTO; + return mavsdk::Camera::Mode::PHOTO; case rpc::camera::CameraMode::VIDEO: - return dronecode_sdk::Camera::Mode::VIDEO; + return mavsdk::Camera::Mode::VIDEO; default: - return dronecode_sdk::Camera::Mode::UNKNOWN; + return mavsdk::Camera::Mode::UNKNOWN; } } - static rpc::camera::CameraMode translateCameraMode(const dronecode_sdk::Camera::Mode mode) + static rpc::camera::CameraMode translateCameraMode(const mavsdk::Camera::Mode mode) { switch (mode) { - case dronecode_sdk::Camera::Mode::PHOTO: + case mavsdk::Camera::Mode::PHOTO: return rpc::camera::CameraMode::PHOTO; - case dronecode_sdk::Camera::Mode::VIDEO: + case mavsdk::Camera::Mode::VIDEO: return rpc::camera::CameraMode::VIDEO; default: return rpc::camera::CameraMode::UNKNOWN; @@ -171,25 +170,25 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { auto is_finished = std::make_shared(false); - _camera.subscribe_mode([this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Camera::Mode mode) { - rpc::camera::ModeResponse rpc_mode_response; - rpc_mode_response.set_camera_mode(translateCameraMode(mode)); + _camera.subscribe_mode( + [this, &writer, &stream_closed_promise, is_finished](const mavsdk::Camera::Mode mode) { + rpc::camera::ModeResponse rpc_mode_response; + rpc_mode_response.set_camera_mode(translateCameraMode(mode)); - std::lock_guard lock(_subscribe_mutex); - if (!*is_finished && !writer->Write(rpc_mode_response)) { - _camera.subscribe_mode(nullptr); - *is_finished = true; - stream_closed_promise.set_value(); - } - }); + std::lock_guard lock(_subscribe_mutex); + if (!*is_finished && !writer->Write(rpc_mode_response)) { + _camera.subscribe_mode(nullptr); + *is_finished = true; + stream_closed_promise.set_value(); + } + }); stream_closed_future.wait(); return grpc::Status::OK; } - static std::unique_ptr translateVideoStreamSettings( - const dronecode_sdk::Camera::VideoStreamSettings video_stream_settings) + static std::unique_ptr + translateVideoStreamSettings(const mavsdk::Camera::VideoStreamSettings video_stream_settings) { auto rpc_video_stream_settings = std::unique_ptr( new rpc::camera::VideoStreamSettings()); @@ -205,10 +204,10 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return rpc_video_stream_settings; } - static dronecode_sdk::Camera::VideoStreamSettings translateRPCVideoStreamSettings( + static mavsdk::Camera::VideoStreamSettings translateRPCVideoStreamSettings( const rpc::camera::VideoStreamSettings &rpc_video_stream_settings) { - dronecode_sdk::Camera::VideoStreamSettings video_stream_settings; + mavsdk::Camera::VideoStreamSettings video_stream_settings; video_stream_settings.frame_rate_hz = rpc_video_stream_settings.frame_rate_hz(); video_stream_settings.horizontal_resolution_pix = rpc_video_stream_settings.horizontal_resolution_pix(); @@ -222,7 +221,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } static std::unique_ptr - translateVideoStreamInfo(const dronecode_sdk::Camera::VideoStreamInfo &video_stream_info) + translateVideoStreamInfo(const mavsdk::Camera::VideoStreamInfo &video_stream_info) { auto rpc_video_stream_info = std::unique_ptr(new rpc::camera::VideoStreamInfo()); @@ -238,33 +237,33 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } static rpc::camera::VideoStreamInfo_VideoStreamStatus - translateVideoStreamStatus(const dronecode_sdk::Camera::VideoStreamInfo::Status status) + translateVideoStreamStatus(const mavsdk::Camera::VideoStreamInfo::Status status) { switch (status) { - case dronecode_sdk::Camera::VideoStreamInfo::Status::IN_PROGRESS: + case mavsdk::Camera::VideoStreamInfo::Status::IN_PROGRESS: return rpc::camera::VideoStreamInfo_VideoStreamStatus_IN_PROGRESS; - case dronecode_sdk::Camera::VideoStreamInfo::Status::NOT_RUNNING: + case mavsdk::Camera::VideoStreamInfo::Status::NOT_RUNNING: default: return rpc::camera::VideoStreamInfo_VideoStreamStatus_NOT_RUNNING; } } - static dronecode_sdk::Camera::VideoStreamInfo::Status + static mavsdk::Camera::VideoStreamInfo::Status translateRPCVideoStreamStatus(const rpc::camera::VideoStreamInfo_VideoStreamStatus status) { switch (status) { case rpc::camera::VideoStreamInfo_VideoStreamStatus_IN_PROGRESS: - return dronecode_sdk::Camera::VideoStreamInfo::Status::IN_PROGRESS; + return mavsdk::Camera::VideoStreamInfo::Status::IN_PROGRESS; case rpc::camera::VideoStreamInfo_VideoStreamStatus_NOT_RUNNING: default: - return dronecode_sdk::Camera::VideoStreamInfo::Status::NOT_RUNNING; + return mavsdk::Camera::VideoStreamInfo::Status::NOT_RUNNING; } } - static dronecode_sdk::Camera::VideoStreamInfo + static mavsdk::Camera::VideoStreamInfo translateRPCVideoStreamInfo(const rpc::camera::VideoStreamInfo &rpc_video_stream_info) { - dronecode_sdk::Camera::VideoStreamInfo video_stream_info{}; + mavsdk::Camera::VideoStreamInfo video_stream_info{}; video_stream_info.settings = translateRPCVideoStreamSettings(rpc_video_stream_info.video_stream_settings()); video_stream_info.status = @@ -283,21 +282,20 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { auto is_finished = std::make_shared(false); - _camera.subscribe_video_stream_info( - [this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Camera::VideoStreamInfo video_info) { - rpc::camera::VideoStreamInfoResponse rpc_video_stream_info_response; - auto video_stream_info = translateVideoStreamInfo(video_info); - rpc_video_stream_info_response.set_allocated_video_stream_info( - video_stream_info.release()); + _camera.subscribe_video_stream_info([this, &writer, &stream_closed_promise, is_finished]( + const mavsdk::Camera::VideoStreamInfo video_info) { + rpc::camera::VideoStreamInfoResponse rpc_video_stream_info_response; + auto video_stream_info = translateVideoStreamInfo(video_info); + rpc_video_stream_info_response.set_allocated_video_stream_info( + video_stream_info.release()); - std::lock_guard lock(_subscribe_mutex); - if (!*is_finished && !writer->Write(rpc_video_stream_info_response)) { - _camera.subscribe_video_stream_info(nullptr); - *is_finished = true; - stream_closed_promise.set_value(); - } - }); + std::lock_guard lock(_subscribe_mutex); + if (!*is_finished && !writer->Write(rpc_video_stream_info_response)) { + _camera.subscribe_video_stream_info(nullptr); + *is_finished = true; + stream_closed_promise.set_value(); + } + }); stream_closed_future.wait(); @@ -315,7 +313,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { auto is_finished = std::make_shared(false); _camera.subscribe_capture_info([this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Camera::CaptureInfo capture_info) { + const mavsdk::Camera::CaptureInfo capture_info) { rpc::camera::CaptureInfoResponse rpc_capture_info_response; auto rpc_capture_info = translateCaptureInfo(capture_info); rpc_capture_info_response.set_allocated_capture_info(rpc_capture_info.release()); @@ -334,7 +332,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } static std::unique_ptr - translateCaptureInfo(const dronecode_sdk::Camera::CaptureInfo &capture_info) + translateCaptureInfo(const mavsdk::Camera::CaptureInfo &capture_info) { auto rpc_capture_info = std::unique_ptr(new rpc::camera::CaptureInfo()); @@ -353,7 +351,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } static std::unique_ptr - translatePosition(const dronecode_sdk::Camera::CaptureInfo::Position &position) + translatePosition(const mavsdk::Camera::CaptureInfo::Position &position) { auto rpc_position = std::unique_ptr(new rpc::camera::Position()); rpc_position->set_latitude_deg(position.latitude_deg); @@ -364,8 +362,8 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return rpc_position; } - static std::unique_ptr translateAttitudeQuaternion( - const dronecode_sdk::Camera::CaptureInfo::Quaternion &attitude_quaternion) + static std::unique_ptr + translateAttitudeQuaternion(const mavsdk::Camera::CaptureInfo::Quaternion &attitude_quaternion) { auto rpc_quaternion = std::unique_ptr(new rpc::camera::Quaternion()); @@ -377,8 +375,8 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return rpc_quaternion; } - static std::unique_ptr translateAttitudeEulerAngle( - const dronecode_sdk::Camera::CaptureInfo::EulerAngle &attitude_euler_angle) + static std::unique_ptr + translateAttitudeEulerAngle(const mavsdk::Camera::CaptureInfo::EulerAngle &attitude_euler_angle) { auto rpc_euler_angle = std::unique_ptr(new rpc::camera::EulerAngle()); @@ -389,10 +387,10 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return rpc_euler_angle; } - static dronecode_sdk::Camera::CaptureInfo + static mavsdk::Camera::CaptureInfo translateRPCCaptureInfo(const rpc::camera::CaptureInfo &rpc_capture_info) { - dronecode_sdk::Camera::CaptureInfo capture_info{}; + mavsdk::Camera::CaptureInfo capture_info{}; capture_info.position = translateRPCPosition(rpc_capture_info.position()); capture_info.attitude_quaternion = translateRPCQuaternion(rpc_capture_info.attitude_quaternion()); @@ -406,10 +404,10 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return capture_info; } - static dronecode_sdk::Camera::CaptureInfo::Position + static mavsdk::Camera::CaptureInfo::Position translateRPCPosition(const rpc::camera::Position &rpc_position) { - dronecode_sdk::Camera::CaptureInfo::Position position; + mavsdk::Camera::CaptureInfo::Position position; position.latitude_deg = rpc_position.latitude_deg(); position.longitude_deg = rpc_position.longitude_deg(); position.absolute_altitude_m = rpc_position.absolute_altitude_m(); @@ -418,10 +416,10 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return position; } - static dronecode_sdk::Camera::CaptureInfo::Quaternion + static mavsdk::Camera::CaptureInfo::Quaternion translateRPCQuaternion(const rpc::camera::Quaternion &rpc_quaternion) { - dronecode_sdk::Camera::CaptureInfo::Quaternion quaternion; + mavsdk::Camera::CaptureInfo::Quaternion quaternion; quaternion.w = rpc_quaternion.w(); quaternion.x = rpc_quaternion.x(); quaternion.y = rpc_quaternion.y(); @@ -430,10 +428,10 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return quaternion; } - static dronecode_sdk::Camera::CaptureInfo::EulerAngle + static mavsdk::Camera::CaptureInfo::EulerAngle translateRPCEulerAngle(const rpc::camera::EulerAngle &rpc_euler_angle) { - dronecode_sdk::Camera::CaptureInfo::EulerAngle euler_angle; + mavsdk::Camera::CaptureInfo::EulerAngle euler_angle; euler_angle.yaw_deg = rpc_euler_angle.yaw_deg(); euler_angle.pitch_deg = rpc_euler_angle.pitch_deg(); euler_angle.roll_deg = rpc_euler_angle.roll_deg(); @@ -452,7 +450,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { auto is_finished = std::make_shared(false); _camera.subscribe_status([this, &writer, &stream_closed_promise, is_finished]( - const dronecode_sdk::Camera::Status camera_status) { + const mavsdk::Camera::Status camera_status) { rpc::camera::CameraStatusResponse rpc_camera_status_response; auto rpc_camera_status = translateCameraStatus(camera_status); rpc_camera_status_response.set_allocated_camera_status(rpc_camera_status.release()); @@ -471,7 +469,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } static std::unique_ptr - translateCameraStatus(const dronecode_sdk::Camera::Status &camera_status) + translateCameraStatus(const mavsdk::Camera::Status &camera_status) { auto status = std::unique_ptr(new rpc::camera::CameraStatus()); status->set_video_on(camera_status.video_on); @@ -487,23 +485,23 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } static rpc::camera::CameraStatus_StorageStatus - translateStorageStatus(const dronecode_sdk::Camera::Status::StorageStatus storage_status) + translateStorageStatus(const mavsdk::Camera::Status::StorageStatus storage_status) { switch (storage_status) { - case dronecode_sdk::Camera::Status::StorageStatus::UNFORMATTED: + case mavsdk::Camera::Status::StorageStatus::UNFORMATTED: return rpc::camera::CameraStatus_StorageStatus_UNFORMATTED; - case dronecode_sdk::Camera::Status::StorageStatus::FORMATTED: + case mavsdk::Camera::Status::StorageStatus::FORMATTED: return rpc::camera::CameraStatus_StorageStatus_FORMATTED; - case dronecode_sdk::Camera::Status::StorageStatus::NOT_AVAILABLE: + case mavsdk::Camera::Status::StorageStatus::NOT_AVAILABLE: default: return rpc::camera::CameraStatus_StorageStatus_NOT_AVAILABLE; } } - static dronecode_sdk::Camera::Status + static mavsdk::Camera::Status translateRPCCameraStatus(const rpc::camera::CameraStatus &rpc_camera_status) { - dronecode_sdk::Camera::Status status{}; + mavsdk::Camera::Status status{}; status.video_on = rpc_camera_status.video_on(); status.photo_interval_on = rpc_camera_status.photo_interval_on(); status.storage_status = translateRPCStorageStatus(rpc_camera_status.storage_status()); @@ -516,17 +514,17 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return status; } - static dronecode_sdk::Camera::Status::StorageStatus + static mavsdk::Camera::Status::StorageStatus translateRPCStorageStatus(const rpc::camera::CameraStatus_StorageStatus storage_status) { switch (storage_status) { case rpc::camera::CameraStatus_StorageStatus_UNFORMATTED: - return dronecode_sdk::Camera::Status::StorageStatus::UNFORMATTED; + return mavsdk::Camera::Status::StorageStatus::UNFORMATTED; case rpc::camera::CameraStatus_StorageStatus_FORMATTED: - return dronecode_sdk::Camera::Status::StorageStatus::FORMATTED; + return mavsdk::Camera::Status::StorageStatus::FORMATTED; case rpc::camera::CameraStatus_StorageStatus_NOT_AVAILABLE: default: - return dronecode_sdk::Camera::Status::StorageStatus::NOT_AVAILABLE; + return mavsdk::Camera::Status::StorageStatus::NOT_AVAILABLE; } } @@ -542,7 +540,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { _camera.subscribe_current_settings( [this, &writer, &stream_closed_promise, is_finished]( - const std::vector current_settings) { + const std::vector current_settings) { rpc::camera::CurrentSettingsResponse rpc_current_setting_response; for (const auto current_setting : current_settings) { @@ -563,7 +561,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return grpc::Status::OK; } - static void translateSetting(const dronecode_sdk::Camera::Setting setting, + static void translateSetting(const mavsdk::Camera::Setting setting, rpc::camera::Setting *rpc_setting) { rpc_setting->set_setting_id(setting.setting_id); @@ -571,8 +569,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { rpc_setting->set_allocated_option(translateOption(setting.option).release()); } - static std::unique_ptr - translateOption(const dronecode_sdk::Camera::Option option) + static std::unique_ptr translateOption(const mavsdk::Camera::Option option) { auto rpc_option = std::unique_ptr(new rpc::camera::Option); rpc_option->set_option_id(option.option_id); @@ -581,10 +578,9 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return rpc_option; } - static dronecode_sdk::Camera::Setting - translateRPCSetting(const rpc::camera::Setting rpc_setting) + static mavsdk::Camera::Setting translateRPCSetting(const rpc::camera::Setting rpc_setting) { - dronecode_sdk::Camera::Setting setting; + mavsdk::Camera::Setting setting; setting.setting_id = rpc_setting.setting_id(); setting.setting_description = rpc_setting.setting_description(); setting.option = translateRPCOption(rpc_setting.option()); @@ -592,9 +588,9 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return setting; } - static dronecode_sdk::Camera::Option translateRPCOption(const rpc::camera::Option rpc_option) + static mavsdk::Camera::Option translateRPCOption(const rpc::camera::Option rpc_option) { - dronecode_sdk::Camera::Option option; + mavsdk::Camera::Option option; option.option_id = rpc_option.option_id(); option.option_description = rpc_option.option_description(); @@ -613,7 +609,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { _camera.subscribe_possible_setting_options( [this, &writer, &stream_closed_promise, is_finished]( - const std::vector setting_options) { + const std::vector setting_options) { rpc::camera::PossibleSettingOptionsResponse rpc_setting_options_response; for (const auto setting_option : setting_options) { @@ -634,7 +630,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { return grpc::Status::OK; } - static void translateSettingOptions(const dronecode_sdk::Camera::SettingOptions setting_options, + static void translateSettingOptions(const mavsdk::Camera::SettingOptions setting_options, rpc::camera::SettingOptions *rpc_setting_options) { rpc_setting_options->set_setting_id(setting_options.setting_id); @@ -647,14 +643,14 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { } } - static dronecode_sdk::Camera::SettingOptions + static mavsdk::Camera::SettingOptions translateRPCSettingOptions(const rpc::camera::SettingOptions rpc_setting_options) { - dronecode_sdk::Camera::SettingOptions setting_options; + mavsdk::Camera::SettingOptions setting_options; setting_options.setting_id = rpc_setting_options.setting_id(); setting_options.setting_description = rpc_setting_options.setting_description(); - std::vector options; + std::vector options; for (auto option : rpc_setting_options.options()) { options.push_back(translateRPCOption(option)); } @@ -672,17 +668,16 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service { if (request == nullptr) { if (response != nullptr) { - fillResponseWithResult(response, dronecode_sdk::Camera::Result::WRONG_ARGUMENT); + fillResponseWithResult(response, mavsdk::Camera::Result::WRONG_ARGUMENT); } } else { const std::string setting_id = request->setting().setting_id(); - dronecode_sdk::Camera::Option option; + mavsdk::Camera::Option option; option.option_id = request->setting().option().option_id(); _camera.set_option_async( - [this, response, &set_option_called_promise]( - dronecode_sdk::Camera::Result camera_result) { - if (camera_result == dronecode_sdk::Camera::Result::IN_PROGRESS) { + [this, response, &set_option_called_promise](mavsdk::Camera::Result camera_result) { + if (camera_result == mavsdk::Camera::Result::IN_PROGRESS) { return; } diff --git a/src/backend/src/plugins/gimbal/gimbal_service_impl.h b/src/backend/src/plugins/gimbal/gimbal_service_impl.h index fb297c7666..1dd7e8ab8a 100644 --- a/src/backend/src/plugins/gimbal/gimbal_service_impl.h +++ b/src/backend/src/plugins/gimbal/gimbal_service_impl.h @@ -24,7 +24,7 @@ class GimbalServiceImpl final : public rpc::gimbal::GimbalService::Service { auto *rpc_gimbal_result = new rpc::gimbal::GimbalResult(); rpc_gimbal_result->set_result( static_cast(gimbal_result)); - rpc_gimbal_result->set_result_str(dronecode_sdk::Gimbal::result_str(gimbal_result)); + rpc_gimbal_result->set_result_str(mavsdk::Gimbal::result_str(gimbal_result)); response->set_allocated_gimbal_result(rpc_gimbal_result); } diff --git a/src/backend/src/plugins/info/info_service_impl.h b/src/backend/src/plugins/info/info_service_impl.h index 354d578651..58fdd1ca04 100644 --- a/src/backend/src/plugins/info/info_service_impl.h +++ b/src/backend/src/plugins/info/info_service_impl.h @@ -19,7 +19,7 @@ class InfoServiceImpl final : public rpc::info::InfoService::Service { auto *rpc_info_result = new rpc::info::InfoResult(); rpc_info_result->set_result( static_cast(result_pair.first)); - rpc_info_result->set_result_str(dronecode_sdk::Info::result_str(result_pair.first)); + rpc_info_result->set_result_str(mavsdk::Info::result_str(result_pair.first)); auto *rpc_version = new rpc::info::Version(); rpc_version->set_flight_sw_major(result_pair.second.flight_sw_major); diff --git a/src/backend/src/plugins/mission/mission_service_impl.h b/src/backend/src/plugins/mission/mission_service_impl.h index 0a70284d8d..0efc348f53 100644 --- a/src/backend/src/plugins/mission/mission_service_impl.h +++ b/src/backend/src/plugins/mission/mission_service_impl.h @@ -11,7 +11,7 @@ namespace mavsdk { namespace backend { template -class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionService::Service { +class MissionServiceImpl final : public mavsdk::rpc::mission::MissionService::Service { public: MissionServiceImpl(Mission &mission) : _mission(mission) {} @@ -47,7 +47,7 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ _mission.download_mission_async( [this, response, &result_promise]( - const dronecode_sdk::Mission::Result result, + const mavsdk::Mission::Result result, const std::vector> mission_items) { if (response != nullptr) { auto rpc_mission_result = generateRPCMissionResult(result); @@ -83,7 +83,7 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ const auto result_future = result_promise.get_future(); _mission.start_mission_async( - [this, response, &result_promise](const dronecode_sdk::Mission::Result result) { + [this, response, &result_promise](const mavsdk::Mission::Result result) { if (response != nullptr) { auto rpc_mission_result = generateRPCMissionResult(result); response->set_allocated_mission_result(rpc_mission_result); @@ -116,7 +116,7 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ const auto result_future = result_promise.get_future(); _mission.pause_mission_async( - [this, response, &result_promise](const dronecode_sdk::Mission::Result result) { + [this, response, &result_promise](const mavsdk::Mission::Result result) { if (response != nullptr) { auto rpc_mission_result = generateRPCMissionResult(result); response->set_allocated_mission_result(rpc_mission_result); @@ -143,7 +143,7 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ _mission.set_current_mission_item_async( request->index(), - [this, response, &result_promise](const dronecode_sdk::Mission::Result result) { + [this, response, &result_promise](const mavsdk::Mission::Result result) { if (response != nullptr) { auto rpc_mission_result = generateRPCMissionResult(result); response->set_allocated_mission_result(rpc_mission_result); @@ -158,7 +158,7 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ grpc::Status SubscribeMissionProgress( grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::mission::SubscribeMissionProgressRequest * /* request */, + const mavsdk::rpc::mission::SubscribeMissionProgressRequest * /* request */, grpc::ServerWriter *writer) override { std::promise stream_closed_promise; @@ -168,11 +168,10 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ _mission.subscribe_progress( [this, &writer, &stream_closed_promise, is_finished](int current, int total) { - dronecode_sdk::rpc::mission::MissionProgressResponse rpc_mission_progress_response; + mavsdk::rpc::mission::MissionProgressResponse rpc_mission_progress_response; - auto rpc_mission_progress = - std::unique_ptr( - new dronecode_sdk::rpc::mission::MissionProgress); + auto rpc_mission_progress = std::unique_ptr( + new mavsdk::rpc::mission::MissionProgress); rpc_mission_progress->set_current_item_index(current); rpc_mission_progress->set_mission_count(total); @@ -310,8 +309,7 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ std::promise &result_promise) const { _mission.upload_mission_async( - mission_items, - [this, response, &result_promise](const dronecode_sdk::Mission::Result result) { + mission_items, [this, response, &result_promise](const mavsdk::Mission::Result result) { if (response != nullptr) { auto rpc_mission_result = generateRPCMissionResult(result); response->set_allocated_mission_result(rpc_mission_result); @@ -322,13 +320,13 @@ class MissionServiceImpl final : public dronecode_sdk::rpc::mission::MissionServ } rpc::mission::MissionResult * - generateRPCMissionResult(const dronecode_sdk::Mission::Result result) const + generateRPCMissionResult(const mavsdk::Mission::Result result) const { auto rpc_result = static_cast(result); auto rpc_mission_result = new rpc::mission::MissionResult(); rpc_mission_result->set_result(rpc_result); - rpc_mission_result->set_result_str(dronecode_sdk::Mission::result_str(result)); + rpc_mission_result->set_result_str(mavsdk::Mission::result_str(result)); return rpc_mission_result; } diff --git a/src/backend/src/plugins/offboard/offboard_service_impl.h b/src/backend/src/plugins/offboard/offboard_service_impl.h index 5aec4efcf0..c136d1b765 100644 --- a/src/backend/src/plugins/offboard/offboard_service_impl.h +++ b/src/backend/src/plugins/offboard/offboard_service_impl.h @@ -11,13 +11,13 @@ class OffboardServiceImpl final : public rpc::offboard::OffboardService::Service template void fillResponseWithResult(ResponseType *response, - dronecode_sdk::Offboard::Result &offboard_result) const + mavsdk::Offboard::Result &offboard_result) const { auto rpc_result = static_cast(offboard_result); auto *rpc_offboard_result = new rpc::offboard::OffboardResult(); rpc_offboard_result->set_result(rpc_result); - rpc_offboard_result->set_result_str(dronecode_sdk::Offboard::result_str(offboard_result)); + rpc_offboard_result->set_result_str(mavsdk::Offboard::result_str(offboard_result)); response->set_allocated_offboard_result(rpc_offboard_result); } @@ -72,10 +72,10 @@ class OffboardServiceImpl final : public rpc::offboard::OffboardService::Service return grpc::Status::OK; } - static dronecode_sdk::Offboard::Attitude + static mavsdk::Offboard::Attitude translateRPCAttitude(const rpc::offboard::Attitude &rpc_attitude) { - dronecode_sdk::Offboard::Attitude attitude; + mavsdk::Offboard::Attitude attitude; attitude.roll_deg = rpc_attitude.roll_deg(); attitude.pitch_deg = rpc_attitude.pitch_deg(); @@ -97,10 +97,10 @@ class OffboardServiceImpl final : public rpc::offboard::OffboardService::Service return grpc::Status::OK; } - static dronecode_sdk::Offboard::AttitudeRate + static mavsdk::Offboard::AttitudeRate translateRPCAttitudeRate(const rpc::offboard::AttitudeRate &rpc_attitude_rate) { - dronecode_sdk::Offboard::AttitudeRate attitude_rate; + mavsdk::Offboard::AttitudeRate attitude_rate; attitude_rate.roll_deg_s = rpc_attitude_rate.roll_deg_s(); attitude_rate.pitch_deg_s = rpc_attitude_rate.pitch_deg_s(); @@ -123,10 +123,10 @@ class OffboardServiceImpl final : public rpc::offboard::OffboardService::Service return grpc::Status::OK; } - static dronecode_sdk::Offboard::PositionNEDYaw + static mavsdk::Offboard::PositionNEDYaw translateRPCPositionNEDYaw(const rpc::offboard::PositionNEDYaw &rpc_position_ned_yaw) { - dronecode_sdk::Offboard::PositionNEDYaw position_ned_yaw; + mavsdk::Offboard::PositionNEDYaw position_ned_yaw; position_ned_yaw.north_m = rpc_position_ned_yaw.north_m(); position_ned_yaw.east_m = rpc_position_ned_yaw.east_m(); @@ -149,10 +149,10 @@ class OffboardServiceImpl final : public rpc::offboard::OffboardService::Service return grpc::Status::OK; } - static dronecode_sdk::Offboard::VelocityBodyYawspeed translateRPCVelocityBodyYawspeed( + static mavsdk::Offboard::VelocityBodyYawspeed translateRPCVelocityBodyYawspeed( const rpc::offboard::VelocityBodyYawspeed &rpc_velocity_body_yawspeed) { - dronecode_sdk::Offboard::VelocityBodyYawspeed velocity_body_yawspeed; + mavsdk::Offboard::VelocityBodyYawspeed velocity_body_yawspeed; velocity_body_yawspeed.forward_m_s = rpc_velocity_body_yawspeed.forward_m_s(); velocity_body_yawspeed.right_m_s = rpc_velocity_body_yawspeed.right_m_s(); @@ -175,10 +175,10 @@ class OffboardServiceImpl final : public rpc::offboard::OffboardService::Service return grpc::Status::OK; } - static dronecode_sdk::Offboard::VelocityNEDYaw + static mavsdk::Offboard::VelocityNEDYaw translateRPCVelocityNEDYaw(const rpc::offboard::VelocityNEDYaw &rpc_velocity_ned_yaw) { - dronecode_sdk::Offboard::VelocityNEDYaw velocity_ned_yaw; + mavsdk::Offboard::VelocityNEDYaw velocity_ned_yaw; velocity_ned_yaw.north_m_s = rpc_velocity_ned_yaw.north_m_s(); velocity_ned_yaw.east_m_s = rpc_velocity_ned_yaw.east_m_s(); diff --git a/src/backend/src/plugins/param/param_service_impl.h b/src/backend/src/plugins/param/param_service_impl.h index fe78c59fff..7ca4382b25 100644 --- a/src/backend/src/plugins/param/param_service_impl.h +++ b/src/backend/src/plugins/param/param_service_impl.h @@ -22,8 +22,7 @@ class ParamServiceImpl final : public rpc::param::ParamService::Service { auto *rpc_param_result = new rpc::param::ParamResult(); rpc_param_result->set_result( static_cast(result_pair.first)); - rpc_param_result->set_result_str( - dronecode_sdk::Param::result_str(result_pair.first)); + rpc_param_result->set_result_str(mavsdk::Param::result_str(result_pair.first)); response->set_allocated_param_result(rpc_param_result); response->set_value(result_pair.second); @@ -48,7 +47,7 @@ class ParamServiceImpl final : public rpc::param::ParamService::Service { auto *rpc_param_result = new rpc::param::ParamResult(); rpc_param_result->set_result( static_cast(param_result)); - rpc_param_result->set_result_str(dronecode_sdk::Param::result_str(param_result)); + rpc_param_result->set_result_str(mavsdk::Param::result_str(param_result)); response->set_allocated_param_result(rpc_param_result); } @@ -70,8 +69,7 @@ class ParamServiceImpl final : public rpc::param::ParamService::Service { auto *rpc_param_result = new rpc::param::ParamResult(); rpc_param_result->set_result( static_cast(result_pair.first)); - rpc_param_result->set_result_str( - dronecode_sdk::Param::result_str(result_pair.first)); + rpc_param_result->set_result_str(mavsdk::Param::result_str(result_pair.first)); response->set_allocated_param_result(rpc_param_result); response->set_value(result_pair.second); @@ -96,7 +94,7 @@ class ParamServiceImpl final : public rpc::param::ParamService::Service { auto *rpc_param_result = new rpc::param::ParamResult(); rpc_param_result->set_result( static_cast(param_result)); - rpc_param_result->set_result_str(dronecode_sdk::Param::result_str(param_result)); + rpc_param_result->set_result_str(mavsdk::Param::result_str(param_result)); response->set_allocated_param_result(rpc_param_result); } diff --git a/src/backend/src/plugins/telemetry/telemetry_service_impl.h b/src/backend/src/plugins/telemetry/telemetry_service_impl.h index 8ea96ea41a..3f1e9b6082 100644 --- a/src/backend/src/plugins/telemetry/telemetry_service_impl.h +++ b/src/backend/src/plugins/telemetry/telemetry_service_impl.h @@ -7,7 +7,7 @@ namespace mavsdk { namespace backend { template -class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::TelemetryService::Service { +class TelemetryServiceImpl final : public mavsdk::rpc::telemetry::TelemetryService::Service { public: TelemetryServiceImpl(Telemetry &telemetry) : _telemetry(telemetry), @@ -17,17 +17,17 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribePosition(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribePositionRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribePositionRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.position_async([&writer](dronecode_sdk::Telemetry::Position position) { - auto rpc_position = new dronecode_sdk::rpc::telemetry::Position(); + _telemetry.position_async([&writer](mavsdk::Telemetry::Position position) { + auto rpc_position = new mavsdk::rpc::telemetry::Position(); rpc_position->set_latitude_deg(position.latitude_deg); rpc_position->set_longitude_deg(position.longitude_deg); rpc_position->set_relative_altitude_m(position.relative_altitude_m); rpc_position->set_absolute_altitude_m(position.absolute_altitude_m); - dronecode_sdk::rpc::telemetry::PositionResponse rpc_position_response; + mavsdk::rpc::telemetry::PositionResponse rpc_position_response; rpc_position_response.set_allocated_position(rpc_position); writer->Write(rpc_position_response); }); @@ -38,11 +38,11 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribeHealth(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeHealthRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeHealthRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.health_async([&writer](dronecode_sdk::Telemetry::Health health) { - auto rpc_health = new dronecode_sdk::rpc::telemetry::Health(); + _telemetry.health_async([&writer](mavsdk::Telemetry::Health health) { + auto rpc_health = new mavsdk::rpc::telemetry::Health(); rpc_health->set_is_gyrometer_calibration_ok(health.gyrometer_calibration_ok); rpc_health->set_is_accelerometer_calibration_ok(health.accelerometer_calibration_ok); rpc_health->set_is_magnetometer_calibration_ok(health.magnetometer_calibration_ok); @@ -51,7 +51,7 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet rpc_health->set_is_global_position_ok(health.global_position_ok); rpc_health->set_is_home_position_ok(health.home_position_ok); - dronecode_sdk::rpc::telemetry::HealthResponse rpc_health_response; + mavsdk::rpc::telemetry::HealthResponse rpc_health_response; rpc_health_response.set_allocated_health(rpc_health); writer->Write(rpc_health_response); }); @@ -60,19 +60,18 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet return grpc::Status::OK; } - grpc::Status - SubscribeHome(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeHomeRequest * /* request */, - grpc::ServerWriter *writer) override + grpc::Status SubscribeHome(grpc::ServerContext * /* context */, + const mavsdk::rpc::telemetry::SubscribeHomeRequest * /* request */, + grpc::ServerWriter *writer) override { - _telemetry.home_position_async([&writer](dronecode_sdk::Telemetry::Position position) { - auto rpc_position = new dronecode_sdk::rpc::telemetry::Position(); + _telemetry.home_position_async([&writer](mavsdk::Telemetry::Position position) { + auto rpc_position = new mavsdk::rpc::telemetry::Position(); rpc_position->set_latitude_deg(position.latitude_deg); rpc_position->set_longitude_deg(position.longitude_deg); rpc_position->set_relative_altitude_m(position.relative_altitude_m); rpc_position->set_absolute_altitude_m(position.absolute_altitude_m); - dronecode_sdk::rpc::telemetry::HomeResponse rpc_home_response; + mavsdk::rpc::telemetry::HomeResponse rpc_home_response; rpc_home_response.set_allocated_home(rpc_position); writer->Write(rpc_home_response); }); @@ -81,13 +80,12 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet return grpc::Status::OK; } - grpc::Status - SubscribeInAir(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeInAirRequest * /* request */, - grpc::ServerWriter *writer) override + grpc::Status SubscribeInAir(grpc::ServerContext * /* context */, + const mavsdk::rpc::telemetry::SubscribeInAirRequest * /* request */, + grpc::ServerWriter *writer) override { _telemetry.in_air_async([&writer](bool is_in_air) { - dronecode_sdk::rpc::telemetry::InAirResponse rpc_in_air_response; + mavsdk::rpc::telemetry::InAirResponse rpc_in_air_response; rpc_in_air_response.set_is_in_air(is_in_air); writer->Write(rpc_in_air_response); }); @@ -96,50 +94,47 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet return grpc::Status::OK; } - grpc::Status SubscribeStatusText( - grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeStatusTextRequest * /* request */, - grpc::ServerWriter *writer) override + grpc::Status + SubscribeStatusText(grpc::ServerContext * /* context */, + const mavsdk::rpc::telemetry::SubscribeStatusTextRequest * /* request */, + grpc::ServerWriter *writer) override { - _telemetry.status_text_async( - [this, &writer](dronecode_sdk::Telemetry::StatusText status_text) { - auto rpc_status_text = new dronecode_sdk::rpc::telemetry::StatusText(); - rpc_status_text->set_text(status_text.text); - rpc_status_text->set_type(translateStatusTextType(status_text.type)); - - dronecode_sdk::rpc::telemetry::StatusTextResponse rpc_status_text_response; - rpc_status_text_response.set_allocated_status_text(rpc_status_text); - writer->Write(rpc_status_text_response); - }); + _telemetry.status_text_async([this, &writer](mavsdk::Telemetry::StatusText status_text) { + auto rpc_status_text = new mavsdk::rpc::telemetry::StatusText(); + rpc_status_text->set_text(status_text.text); + rpc_status_text->set_type(translateStatusTextType(status_text.type)); + + mavsdk::rpc::telemetry::StatusTextResponse rpc_status_text_response; + rpc_status_text_response.set_allocated_status_text(rpc_status_text); + writer->Write(rpc_status_text_response); + }); _stop_future.wait(); return grpc::Status::OK; } - dronecode_sdk::rpc::telemetry::StatusText::StatusType - translateStatusTextType(const dronecode_sdk::Telemetry::StatusText::StatusType type) const + mavsdk::rpc::telemetry::StatusText::StatusType + translateStatusTextType(const mavsdk::Telemetry::StatusText::StatusType type) const { switch (type) { default: - case dronecode_sdk::Telemetry::StatusText::StatusType::INFO: - return dronecode_sdk::rpc::telemetry::StatusText::StatusType:: - StatusText_StatusType_INFO; - case dronecode_sdk::Telemetry::StatusText::StatusType::WARNING: - return dronecode_sdk::rpc::telemetry::StatusText::StatusType:: + case mavsdk::Telemetry::StatusText::StatusType::INFO: + return mavsdk::rpc::telemetry::StatusText::StatusType::StatusText_StatusType_INFO; + case mavsdk::Telemetry::StatusText::StatusType::WARNING: + return mavsdk::rpc::telemetry::StatusText::StatusType:: StatusText_StatusType_WARNING; - case dronecode_sdk::Telemetry::StatusText::StatusType::CRITICAL: - return dronecode_sdk::rpc::telemetry::StatusText::StatusType:: + case mavsdk::Telemetry::StatusText::StatusType::CRITICAL: + return mavsdk::rpc::telemetry::StatusText::StatusType:: StatusText_StatusType_CRITICAL; } } - grpc::Status - SubscribeArmed(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeArmedRequest * /* request */, - grpc::ServerWriter *writer) override + grpc::Status SubscribeArmed(grpc::ServerContext * /* context */, + const mavsdk::rpc::telemetry::SubscribeArmedRequest * /* request */, + grpc::ServerWriter *writer) override { _telemetry.armed_async([&writer](bool is_armed) { - dronecode_sdk::rpc::telemetry::ArmedResponse rpc_armed_response; + mavsdk::rpc::telemetry::ArmedResponse rpc_armed_response; rpc_armed_response.set_is_armed(is_armed); writer->Write(rpc_armed_response); }); @@ -150,15 +145,15 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribeGpsInfo(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeGpsInfoRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeGpsInfoRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.gps_info_async([this, &writer](dronecode_sdk::Telemetry::GPSInfo gps_info) { - auto rpc_gps_info = new dronecode_sdk::rpc::telemetry::GpsInfo(); + _telemetry.gps_info_async([this, &writer](mavsdk::Telemetry::GPSInfo gps_info) { + auto rpc_gps_info = new mavsdk::rpc::telemetry::GpsInfo(); rpc_gps_info->set_num_satellites(gps_info.num_satellites); rpc_gps_info->set_fix_type(translateGpsFixType(gps_info.fix_type)); - dronecode_sdk::rpc::telemetry::GpsInfoResponse rpc_gps_info_response; + mavsdk::rpc::telemetry::GpsInfoResponse rpc_gps_info_response; rpc_gps_info_response.set_allocated_gps_info(rpc_gps_info); writer->Write(rpc_gps_info_response); }); @@ -167,38 +162,38 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet return grpc::Status::OK; } - dronecode_sdk::rpc::telemetry::FixType translateGpsFixType(const int fix_type) const + mavsdk::rpc::telemetry::FixType translateGpsFixType(const int fix_type) const { switch (fix_type) { default: case 0: - return dronecode_sdk::rpc::telemetry::FixType::NO_GPS; + return mavsdk::rpc::telemetry::FixType::NO_GPS; case 1: - return dronecode_sdk::rpc::telemetry::FixType::NO_FIX; + return mavsdk::rpc::telemetry::FixType::NO_FIX; case 2: - return dronecode_sdk::rpc::telemetry::FixType::FIX_2D; + return mavsdk::rpc::telemetry::FixType::FIX_2D; case 3: - return dronecode_sdk::rpc::telemetry::FixType::FIX_3D; + return mavsdk::rpc::telemetry::FixType::FIX_3D; case 4: - return dronecode_sdk::rpc::telemetry::FixType::FIX_DGPS; + return mavsdk::rpc::telemetry::FixType::FIX_DGPS; case 5: - return dronecode_sdk::rpc::telemetry::FixType::RTK_FLOAT; + return mavsdk::rpc::telemetry::FixType::RTK_FLOAT; case 6: - return dronecode_sdk::rpc::telemetry::FixType::RTK_FIXED; + return mavsdk::rpc::telemetry::FixType::RTK_FIXED; } } grpc::Status SubscribeBattery(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeBatteryRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeBatteryRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.battery_async([&writer](dronecode_sdk::Telemetry::Battery battery) { - auto rpc_battery = new dronecode_sdk::rpc::telemetry::Battery(); + _telemetry.battery_async([&writer](mavsdk::Telemetry::Battery battery) { + auto rpc_battery = new mavsdk::rpc::telemetry::Battery(); rpc_battery->set_voltage_v(battery.voltage_v); rpc_battery->set_remaining_percent(battery.remaining_percent); - dronecode_sdk::rpc::telemetry::BatteryResponse rpc_battery_response; + mavsdk::rpc::telemetry::BatteryResponse rpc_battery_response; rpc_battery_response.set_allocated_battery(rpc_battery); writer->Write(rpc_battery_response); }); @@ -207,67 +202,65 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet return grpc::Status::OK; } - grpc::Status SubscribeFlightMode( - grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeFlightModeRequest * /* request */, - grpc::ServerWriter *writer) override + grpc::Status + SubscribeFlightMode(grpc::ServerContext * /* context */, + const mavsdk::rpc::telemetry::SubscribeFlightModeRequest * /* request */, + grpc::ServerWriter *writer) override { - _telemetry.flight_mode_async( - [this, &writer](dronecode_sdk::Telemetry::FlightMode flight_mode) { - auto rpc_flight_mode = translateFlightMode(flight_mode); + _telemetry.flight_mode_async([this, &writer](mavsdk::Telemetry::FlightMode flight_mode) { + auto rpc_flight_mode = translateFlightMode(flight_mode); - dronecode_sdk::rpc::telemetry::FlightModeResponse rpc_flight_mode_response; - rpc_flight_mode_response.set_flight_mode(rpc_flight_mode); - writer->Write(rpc_flight_mode_response); - }); + mavsdk::rpc::telemetry::FlightModeResponse rpc_flight_mode_response; + rpc_flight_mode_response.set_flight_mode(rpc_flight_mode); + writer->Write(rpc_flight_mode_response); + }); _stop_future.wait(); return grpc::Status::OK; } rpc::telemetry::FlightMode - translateFlightMode(const dronecode_sdk::Telemetry::FlightMode flight_mode) const + translateFlightMode(const mavsdk::Telemetry::FlightMode flight_mode) const { switch (flight_mode) { default: - case dronecode_sdk::Telemetry::FlightMode::UNKNOWN: + case mavsdk::Telemetry::FlightMode::UNKNOWN: return rpc::telemetry::FlightMode::UNKNOWN; - case dronecode_sdk::Telemetry::FlightMode::READY: + case mavsdk::Telemetry::FlightMode::READY: return rpc::telemetry::FlightMode::READY; - case dronecode_sdk::Telemetry::FlightMode::TAKEOFF: + case mavsdk::Telemetry::FlightMode::TAKEOFF: return rpc::telemetry::FlightMode::TAKEOFF; - case dronecode_sdk::Telemetry::FlightMode::HOLD: + case mavsdk::Telemetry::FlightMode::HOLD: return rpc::telemetry::FlightMode::HOLD; - case dronecode_sdk::Telemetry::FlightMode::MISSION: + case mavsdk::Telemetry::FlightMode::MISSION: return rpc::telemetry::FlightMode::MISSION; - case dronecode_sdk::Telemetry::FlightMode::RETURN_TO_LAUNCH: + case mavsdk::Telemetry::FlightMode::RETURN_TO_LAUNCH: return rpc::telemetry::FlightMode::RETURN_TO_LAUNCH; - case dronecode_sdk::Telemetry::FlightMode::LAND: + case mavsdk::Telemetry::FlightMode::LAND: return rpc::telemetry::FlightMode::LAND; - case dronecode_sdk::Telemetry::FlightMode::OFFBOARD: + case mavsdk::Telemetry::FlightMode::OFFBOARD: return rpc::telemetry::FlightMode::OFFBOARD; - case dronecode_sdk::Telemetry::FlightMode::FOLLOW_ME: + case mavsdk::Telemetry::FlightMode::FOLLOW_ME: return rpc::telemetry::FlightMode::FOLLOW_ME; } } grpc::Status SubscribeAttitudeQuaternion( grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeAttitudeQuaternionRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeAttitudeQuaternionRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.attitude_quaternion_async( - [&writer](dronecode_sdk::Telemetry::Quaternion quaternion) { - auto rpc_quaternion = new dronecode_sdk::rpc::telemetry::Quaternion(); - rpc_quaternion->set_w(quaternion.w); - rpc_quaternion->set_x(quaternion.x); - rpc_quaternion->set_y(quaternion.y); - rpc_quaternion->set_z(quaternion.z); + _telemetry.attitude_quaternion_async([&writer](mavsdk::Telemetry::Quaternion quaternion) { + auto rpc_quaternion = new mavsdk::rpc::telemetry::Quaternion(); + rpc_quaternion->set_w(quaternion.w); + rpc_quaternion->set_x(quaternion.x); + rpc_quaternion->set_y(quaternion.y); + rpc_quaternion->set_z(quaternion.z); - dronecode_sdk::rpc::telemetry::AttitudeQuaternionResponse rpc_quaternion_response; - rpc_quaternion_response.set_allocated_attitude_quaternion(rpc_quaternion); - writer->Write(rpc_quaternion_response); - }); + mavsdk::rpc::telemetry::AttitudeQuaternionResponse rpc_quaternion_response; + rpc_quaternion_response.set_allocated_attitude_quaternion(rpc_quaternion); + writer->Write(rpc_quaternion_response); + }); _stop_future.wait(); return grpc::Status::OK; @@ -275,20 +268,19 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribeAttitudeEuler( grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeAttitudeEulerRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeAttitudeEulerRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.attitude_euler_angle_async( - [&writer](dronecode_sdk::Telemetry::EulerAngle euler_angle) { - auto rpc_euler_angle = new dronecode_sdk::rpc::telemetry::EulerAngle(); - rpc_euler_angle->set_roll_deg(euler_angle.roll_deg); - rpc_euler_angle->set_pitch_deg(euler_angle.pitch_deg); - rpc_euler_angle->set_yaw_deg(euler_angle.yaw_deg); - - dronecode_sdk::rpc::telemetry::AttitudeEulerResponse rpc_euler_response; - rpc_euler_response.set_allocated_attitude_euler(rpc_euler_angle); - writer->Write(rpc_euler_response); - }); + _telemetry.attitude_euler_angle_async([&writer](mavsdk::Telemetry::EulerAngle euler_angle) { + auto rpc_euler_angle = new mavsdk::rpc::telemetry::EulerAngle(); + rpc_euler_angle->set_roll_deg(euler_angle.roll_deg); + rpc_euler_angle->set_pitch_deg(euler_angle.pitch_deg); + rpc_euler_angle->set_yaw_deg(euler_angle.yaw_deg); + + mavsdk::rpc::telemetry::AttitudeEulerResponse rpc_euler_response; + rpc_euler_response.set_allocated_attitude_euler(rpc_euler_angle); + writer->Write(rpc_euler_response); + }); _stop_future.wait(); return grpc::Status::OK; @@ -296,22 +288,21 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribeCameraAttitudeQuaternion( grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeCameraAttitudeQuaternionRequest - * /* request */, + const mavsdk::rpc::telemetry::SubscribeCameraAttitudeQuaternionRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.camera_attitude_quaternion_async([&writer](dronecode_sdk::Telemetry::Quaternion - quaternion) { - auto rpc_quaternion = new dronecode_sdk::rpc::telemetry::Quaternion(); - rpc_quaternion->set_w(quaternion.w); - rpc_quaternion->set_x(quaternion.x); - rpc_quaternion->set_y(quaternion.y); - rpc_quaternion->set_z(quaternion.z); + _telemetry.camera_attitude_quaternion_async( + [&writer](mavsdk::Telemetry::Quaternion quaternion) { + auto rpc_quaternion = new mavsdk::rpc::telemetry::Quaternion(); + rpc_quaternion->set_w(quaternion.w); + rpc_quaternion->set_x(quaternion.x); + rpc_quaternion->set_y(quaternion.y); + rpc_quaternion->set_z(quaternion.z); - dronecode_sdk::rpc::telemetry::CameraAttitudeQuaternionResponse rpc_quaternion_response; - rpc_quaternion_response.set_allocated_attitude_quaternion(rpc_quaternion); - writer->Write(rpc_quaternion_response); - }); + mavsdk::rpc::telemetry::CameraAttitudeQuaternionResponse rpc_quaternion_response; + rpc_quaternion_response.set_allocated_attitude_quaternion(rpc_quaternion); + writer->Write(rpc_quaternion_response); + }); _stop_future.wait(); return grpc::Status::OK; @@ -319,17 +310,17 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribeCameraAttitudeEuler( grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeCameraAttitudeEulerRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeCameraAttitudeEulerRequest * /* request */, grpc::ServerWriter *writer) override { _telemetry.camera_attitude_euler_angle_async( - [&writer](dronecode_sdk::Telemetry::EulerAngle euler_angle) { - auto rpc_euler_angle = new dronecode_sdk::rpc::telemetry::EulerAngle(); + [&writer](mavsdk::Telemetry::EulerAngle euler_angle) { + auto rpc_euler_angle = new mavsdk::rpc::telemetry::EulerAngle(); rpc_euler_angle->set_roll_deg(euler_angle.roll_deg); rpc_euler_angle->set_pitch_deg(euler_angle.pitch_deg); rpc_euler_angle->set_yaw_deg(euler_angle.yaw_deg); - dronecode_sdk::rpc::telemetry::CameraAttitudeEulerResponse rpc_euler_response; + mavsdk::rpc::telemetry::CameraAttitudeEulerResponse rpc_euler_response; rpc_euler_response.set_allocated_attitude_euler(rpc_euler_angle); writer->Write(rpc_euler_response); }); @@ -340,17 +331,17 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribeGroundSpeedNed( grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeGroundSpeedNedRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeGroundSpeedNedRequest * /* request */, grpc::ServerWriter *writer) override { _telemetry.ground_speed_ned_async( - [&writer](dronecode_sdk::Telemetry::GroundSpeedNED ground_speed) { - auto rpc_ground_speed = new dronecode_sdk::rpc::telemetry::SpeedNed(); + [&writer](mavsdk::Telemetry::GroundSpeedNED ground_speed) { + auto rpc_ground_speed = new mavsdk::rpc::telemetry::SpeedNed(); rpc_ground_speed->set_velocity_north_m_s(ground_speed.velocity_north_m_s); rpc_ground_speed->set_velocity_east_m_s(ground_speed.velocity_east_m_s); rpc_ground_speed->set_velocity_down_m_s(ground_speed.velocity_down_m_s); - dronecode_sdk::rpc::telemetry::GroundSpeedNedResponse rpc_ground_speed_response; + mavsdk::rpc::telemetry::GroundSpeedNedResponse rpc_ground_speed_response; rpc_ground_speed_response.set_allocated_ground_speed_ned(rpc_ground_speed); writer->Write(rpc_ground_speed_response); }); @@ -361,16 +352,16 @@ class TelemetryServiceImpl final : public dronecode_sdk::rpc::telemetry::Telemet grpc::Status SubscribeRcStatus(grpc::ServerContext * /* context */, - const dronecode_sdk::rpc::telemetry::SubscribeRcStatusRequest * /* request */, + const mavsdk::rpc::telemetry::SubscribeRcStatusRequest * /* request */, grpc::ServerWriter *writer) override { - _telemetry.rc_status_async([&writer](dronecode_sdk::Telemetry::RCStatus rc_status) { - auto rpc_rc_status = new dronecode_sdk::rpc::telemetry::RcStatus(); + _telemetry.rc_status_async([&writer](mavsdk::Telemetry::RCStatus rc_status) { + auto rpc_rc_status = new mavsdk::rpc::telemetry::RcStatus(); rpc_rc_status->set_was_available_once(rc_status.available_once); rpc_rc_status->set_is_available(rc_status.available); rpc_rc_status->set_signal_strength_percent(rc_status.signal_strength_percent); - dronecode_sdk::rpc::telemetry::RcStatusResponse rpc_rc_status_response; + mavsdk::rpc::telemetry::RcStatusResponse rpc_rc_status_response; rpc_rc_status_response.set_allocated_rc_status(rpc_rc_status); writer->Write(rpc_rc_status_response); }); diff --git a/src/backend/test/action_service_impl_test.cpp b/src/backend/test/action_service_impl_test.cpp index fd7079954b..8e985e0284 100644 --- a/src/backend/test/action_service_impl_test.cpp +++ b/src/backend/test/action_service_impl_test.cpp @@ -12,30 +12,30 @@ using testing::_; using testing::NiceMock; using testing::Return; -using MockAction = NiceMock; -using ActionServiceImpl = dronecode_sdk::backend::ActionServiceImpl; +using MockAction = NiceMock; +using ActionServiceImpl = mavsdk::backend::ActionServiceImpl; -using ActionResult = dronecode_sdk::rpc::action::ActionResult; -using InputPair = std::pair; +using ActionResult = mavsdk::rpc::action::ActionResult; +using InputPair = std::pair; static constexpr float ARBITRARY_ALTITUDE = 42.42f; static constexpr float ARBITRARY_SPEED = 8.24f; std::vector generateInputPairs(); -std::string armAndGetTranslatedResult(dronecode_sdk::Action::Result arm_result); -std::string disarmAndGetTranslatedResult(dronecode_sdk::Action::Result disarm_result); -std::string takeoffAndGetTranslatedResult(dronecode_sdk::Action::Result takeoff_result); -std::string landAndGetTranslatedResult(dronecode_sdk::Action::Result land_result); -std::string killAndGetTranslatedResult(dronecode_sdk::Action::Result kill_result); -std::string returnToLaunchAndGetTranslatedResult(dronecode_sdk::Action::Result rtl_result); +std::string armAndGetTranslatedResult(mavsdk::Action::Result arm_result); +std::string disarmAndGetTranslatedResult(mavsdk::Action::Result disarm_result); +std::string takeoffAndGetTranslatedResult(mavsdk::Action::Result takeoff_result); +std::string landAndGetTranslatedResult(mavsdk::Action::Result land_result); +std::string killAndGetTranslatedResult(mavsdk::Action::Result kill_result); +std::string returnToLaunchAndGetTranslatedResult(mavsdk::Action::Result rtl_result); std::string -transitionToFWAndGetTranslatedResult(const dronecode_sdk::Action::Result transition_to_fw_result); +transitionToFWAndGetTranslatedResult(const mavsdk::Action::Result transition_to_fw_result); std::string -transitionToMCAndGetTranslatedResult(const dronecode_sdk::Action::Result transition_to_fw_result); +transitionToMCAndGetTranslatedResult(const mavsdk::Action::Result transition_to_fw_result); std::string -getReturnToLaunchAltitudeAndGetTranslatedResult(const dronecode_sdk::Action::Result action_result); +getReturnToLaunchAltitudeAndGetTranslatedResult(const mavsdk::Action::Result action_result); std::string -setReturnToLaunchAltitudeAndGetTranslatedResult(const dronecode_sdk::Action::Result action_result); +setReturnToLaunchAltitudeAndGetTranslatedResult(const mavsdk::Action::Result action_result); class ActionServiceImplTest : public ::testing::TestWithParam {}; @@ -45,12 +45,12 @@ TEST_P(ActionServiceImplTest, armResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string armAndGetTranslatedResult(const dronecode_sdk::Action::Result arm_result) +std::string armAndGetTranslatedResult(const mavsdk::Action::Result arm_result) { MockAction action; ON_CALL(action, arm()).WillByDefault(Return(arm_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::ArmResponse response; + mavsdk::rpc::action::ArmResponse response; actionService.Arm(nullptr, nullptr, &response); @@ -72,12 +72,12 @@ TEST_P(ActionServiceImplTest, disarmResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string disarmAndGetTranslatedResult(dronecode_sdk::Action::Result disarm_result) +std::string disarmAndGetTranslatedResult(mavsdk::Action::Result disarm_result) { MockAction action; ON_CALL(action, disarm()).WillByDefault(Return(disarm_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::DisarmResponse response; + mavsdk::rpc::action::DisarmResponse response; actionService.Disarm(nullptr, nullptr, &response); @@ -99,12 +99,12 @@ TEST_P(ActionServiceImplTest, takeoffResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string takeoffAndGetTranslatedResult(const dronecode_sdk::Action::Result takeoff_result) +std::string takeoffAndGetTranslatedResult(const mavsdk::Action::Result takeoff_result) { MockAction action; ON_CALL(action, takeoff()).WillByDefault(Return(takeoff_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::TakeoffResponse response; + mavsdk::rpc::action::TakeoffResponse response; actionService.Takeoff(nullptr, nullptr, &response); @@ -126,12 +126,12 @@ TEST_P(ActionServiceImplTest, landResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string landAndGetTranslatedResult(const dronecode_sdk::Action::Result land_result) +std::string landAndGetTranslatedResult(const mavsdk::Action::Result land_result) { MockAction action; ON_CALL(action, land()).WillByDefault(Return(land_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::LandResponse response; + mavsdk::rpc::action::LandResponse response; actionService.Land(nullptr, nullptr, &response); @@ -153,12 +153,12 @@ TEST_P(ActionServiceImplTest, killResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string killAndGetTranslatedResult(const dronecode_sdk::Action::Result kill_result) +std::string killAndGetTranslatedResult(const mavsdk::Action::Result kill_result) { MockAction action; ON_CALL(action, kill()).WillByDefault(Return(kill_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::KillResponse response; + mavsdk::rpc::action::KillResponse response; actionService.Kill(nullptr, nullptr, &response); @@ -180,12 +180,12 @@ TEST_P(ActionServiceImplTest, rtlResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string returnToLaunchAndGetTranslatedResult(const dronecode_sdk::Action::Result rtl_result) +std::string returnToLaunchAndGetTranslatedResult(const mavsdk::Action::Result rtl_result) { MockAction action; ON_CALL(action, return_to_launch()).WillByDefault(Return(rtl_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::ReturnToLaunchResponse response; + mavsdk::rpc::action::ReturnToLaunchResponse response; actionService.ReturnToLaunch(nullptr, nullptr, &response); @@ -208,12 +208,12 @@ TEST_P(ActionServiceImplTest, transition2fwResultIsTranslatedCorrectly) } std::string -transitionToFWAndGetTranslatedResult(const dronecode_sdk::Action::Result transition_to_fw_result) +transitionToFWAndGetTranslatedResult(const mavsdk::Action::Result transition_to_fw_result) { MockAction action; ON_CALL(action, transition_to_fixedwing()).WillByDefault(Return(transition_to_fw_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::TransitionToFixedWingResponse response; + mavsdk::rpc::action::TransitionToFixedWingResponse response; actionService.TransitionToFixedWing(nullptr, nullptr, &response); @@ -236,12 +236,12 @@ TEST_P(ActionServiceImplTest, transition2mcResultIsTranslatedCorrectly) } std::string -transitionToMCAndGetTranslatedResult(const dronecode_sdk::Action::Result transition_to_mc_result) +transitionToMCAndGetTranslatedResult(const mavsdk::Action::Result transition_to_mc_result) { MockAction action; ON_CALL(action, transition_to_multicopter()).WillByDefault(Return(transition_to_mc_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::TransitionToMulticopterResponse response; + mavsdk::rpc::action::TransitionToMulticopterResponse response; actionService.TransitionToMulticopter(nullptr, nullptr, &response); @@ -262,7 +262,7 @@ TEST_F(ActionServiceImplTest, getTakeoffAltitudeCallsGetter) MockAction action; ActionServiceImpl actionService(action); EXPECT_CALL(action, get_takeoff_altitude()).Times(1); - dronecode_sdk::rpc::action::GetTakeoffAltitudeResponse response; + mavsdk::rpc::action::GetTakeoffAltitudeResponse response; actionService.GetTakeoffAltitude(nullptr, nullptr, &response); } @@ -273,7 +273,7 @@ TEST_P(ActionServiceImplTest, getsCorrectTakeoffAltitude) ActionServiceImpl actionService(action); const auto expected_pair = std::make_pair<>(GetParam().second, ARBITRARY_ALTITUDE); ON_CALL(action, get_takeoff_altitude()).WillByDefault(Return(expected_pair)); - dronecode_sdk::rpc::action::GetTakeoffAltitudeResponse response; + mavsdk::rpc::action::GetTakeoffAltitudeResponse response; actionService.GetTakeoffAltitude(nullptr, nullptr, &response); @@ -302,7 +302,7 @@ TEST_F(ActionServiceImplTest, setTakeoffAltitudeCallsSetter) MockAction action; ActionServiceImpl actionService(action); EXPECT_CALL(action, set_takeoff_altitude(_)).Times(1); - dronecode_sdk::rpc::action::SetTakeoffAltitudeRequest request; + mavsdk::rpc::action::SetTakeoffAltitudeRequest request; actionService.SetTakeoffAltitude(nullptr, &request, nullptr); } @@ -313,7 +313,7 @@ TEST_P(ActionServiceImplTest, setTakeoffAltitudeSetsRightValue) ActionServiceImpl actionService(action); float expected_altitude = ARBITRARY_ALTITUDE; EXPECT_CALL(action, set_takeoff_altitude(expected_altitude)).Times(1); - dronecode_sdk::rpc::action::SetTakeoffAltitudeRequest request; + mavsdk::rpc::action::SetTakeoffAltitudeRequest request; request.set_altitude(expected_altitude); actionService.SetTakeoffAltitude(nullptr, &request, nullptr); @@ -332,7 +332,7 @@ TEST_F(ActionServiceImplTest, getMaxSpeedCallsGetter) MockAction action; ActionServiceImpl actionService(action); EXPECT_CALL(action, get_max_speed()).Times(1); - dronecode_sdk::rpc::action::GetMaximumSpeedResponse response; + mavsdk::rpc::action::GetMaximumSpeedResponse response; actionService.GetMaximumSpeed(nullptr, nullptr, &response); } @@ -343,7 +343,7 @@ TEST_P(ActionServiceImplTest, getMaxSpeedGetsRightValue) ActionServiceImpl actionService(action); const auto expected_pair = std::make_pair<>(GetParam().second, ARBITRARY_SPEED); ON_CALL(action, get_max_speed()).WillByDefault(Return(expected_pair)); - dronecode_sdk::rpc::action::GetMaximumSpeedResponse response; + mavsdk::rpc::action::GetMaximumSpeedResponse response; actionService.GetMaximumSpeed(nullptr, nullptr, &response); @@ -355,7 +355,7 @@ TEST_F(ActionServiceImplTest, setMaxSpeedDoesNotCrashWithNullRequest) { MockAction action; ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::SetMaximumSpeedResponse response; + mavsdk::rpc::action::SetMaximumSpeedResponse response; actionService.SetMaximumSpeed(nullptr, nullptr, &response); } @@ -364,7 +364,7 @@ TEST_F(ActionServiceImplTest, setMaxSpeedDoesNotCrashWithNullResponse) { MockAction action; ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::SetMaximumSpeedRequest request; + mavsdk::rpc::action::SetMaximumSpeedRequest request; request.set_speed(ARBITRARY_SPEED); actionService.SetMaximumSpeed(nullptr, &request, nullptr); @@ -375,7 +375,7 @@ TEST_F(ActionServiceImplTest, setMaxSpeedCallsSetter) MockAction action; ActionServiceImpl actionService(action); EXPECT_CALL(action, set_max_speed(_)).Times(1); - dronecode_sdk::rpc::action::SetMaximumSpeedRequest request; + mavsdk::rpc::action::SetMaximumSpeedRequest request; actionService.SetMaximumSpeed(nullptr, &request, nullptr); } @@ -386,7 +386,7 @@ TEST_F(ActionServiceImplTest, setMaxSpeedSetsRightValue) ActionServiceImpl actionService(action); const auto expected_speed = ARBITRARY_SPEED; EXPECT_CALL(action, set_max_speed(expected_speed)).Times(1); - dronecode_sdk::rpc::action::SetMaximumSpeedRequest request; + mavsdk::rpc::action::SetMaximumSpeedRequest request; request.set_speed(expected_speed); actionService.SetMaximumSpeed(nullptr, &request, nullptr); @@ -399,13 +399,13 @@ TEST_P(ActionServiceImplTest, getReturnToLaunchAltitudeResultIsTranslatedCorrect } std::string -getReturnToLaunchAltitudeAndGetTranslatedResult(const dronecode_sdk::Action::Result action_result) +getReturnToLaunchAltitudeAndGetTranslatedResult(const mavsdk::Action::Result action_result) { MockAction action; const auto return_pair = std::make_pair<>(action_result, ARBITRARY_ALTITUDE); ON_CALL(action, get_return_to_launch_return_altitude()).WillByDefault(Return(return_pair)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::GetReturnToLaunchAltitudeResponse response; + mavsdk::rpc::action::GetReturnToLaunchAltitudeResponse response; actionService.GetReturnToLaunchAltitude(nullptr, nullptr, &response); @@ -417,7 +417,7 @@ TEST_F(ActionServiceImplTest, getReturnToLaunchAltitudeCallsGetter) MockAction action; ActionServiceImpl actionService(action); EXPECT_CALL(action, get_return_to_launch_return_altitude()).Times(1); - dronecode_sdk::rpc::action::GetReturnToLaunchAltitudeResponse response; + mavsdk::rpc::action::GetReturnToLaunchAltitudeResponse response; actionService.GetReturnToLaunchAltitude(nullptr, nullptr, &response); } @@ -428,7 +428,7 @@ TEST_P(ActionServiceImplTest, getsCorrectReturnToLaunchAltitude) ActionServiceImpl actionService(action); const auto expected_pair = std::make_pair<>(GetParam().second, ARBITRARY_ALTITUDE); ON_CALL(action, get_return_to_launch_return_altitude()).WillByDefault(Return(expected_pair)); - dronecode_sdk::rpc::action::GetReturnToLaunchAltitudeResponse response; + mavsdk::rpc::action::GetReturnToLaunchAltitudeResponse response; actionService.GetReturnToLaunchAltitude(nullptr, nullptr, &response); @@ -451,14 +451,14 @@ TEST_P(ActionServiceImplTest, setReturnToLaunchAltitudeResultIsTranslatedCorrect } std::string -setReturnToLaunchAltitudeAndGetTranslatedResult(const dronecode_sdk::Action::Result action_result) +setReturnToLaunchAltitudeAndGetTranslatedResult(const mavsdk::Action::Result action_result) { MockAction action; ON_CALL(action, set_return_to_launch_return_altitude(_)).WillByDefault(Return(action_result)); ActionServiceImpl actionService(action); - dronecode_sdk::rpc::action::SetReturnToLaunchAltitudeRequest request; + mavsdk::rpc::action::SetReturnToLaunchAltitudeRequest request; request.set_relative_altitude_m(ARBITRARY_ALTITUDE); - dronecode_sdk::rpc::action::SetReturnToLaunchAltitudeResponse response; + mavsdk::rpc::action::SetReturnToLaunchAltitudeResponse response; actionService.SetReturnToLaunchAltitude(nullptr, &request, &response); @@ -478,7 +478,7 @@ TEST_F(ActionServiceImplTest, setReturnToLaunchAltitudeCallsSetter) MockAction action; ActionServiceImpl actionService(action); EXPECT_CALL(action, set_return_to_launch_return_altitude(_)).Times(1); - dronecode_sdk::rpc::action::SetReturnToLaunchAltitudeRequest request; + mavsdk::rpc::action::SetReturnToLaunchAltitudeRequest request; actionService.SetReturnToLaunchAltitude(nullptr, &request, nullptr); } @@ -489,7 +489,7 @@ TEST_P(ActionServiceImplTest, setReturnToLaunchAltitudeSetsRightValue) ActionServiceImpl actionService(action); float expected_altitude = ARBITRARY_ALTITUDE; EXPECT_CALL(action, set_return_to_launch_return_altitude(expected_altitude)).Times(1); - dronecode_sdk::rpc::action::SetReturnToLaunchAltitudeRequest request; + mavsdk::rpc::action::SetReturnToLaunchAltitudeRequest request; request.set_relative_altitude_m(expected_altitude); actionService.SetReturnToLaunchAltitude(nullptr, &request, nullptr); @@ -502,27 +502,25 @@ INSTANTIATE_TEST_CASE_P(ActionResultCorrespondences, std::vector generateInputPairs() { std::vector input_pairs; - input_pairs.push_back(std::make_pair("SUCCESS", dronecode_sdk::Action::Result::SUCCESS)); - input_pairs.push_back(std::make_pair("NO_SYSTEM", dronecode_sdk::Action::Result::NO_SYSTEM)); + input_pairs.push_back(std::make_pair("SUCCESS", mavsdk::Action::Result::SUCCESS)); + input_pairs.push_back(std::make_pair("NO_SYSTEM", mavsdk::Action::Result::NO_SYSTEM)); input_pairs.push_back( - std::make_pair("CONNECTION_ERROR", dronecode_sdk::Action::Result::CONNECTION_ERROR)); - input_pairs.push_back(std::make_pair("BUSY", dronecode_sdk::Action::Result::BUSY)); - input_pairs.push_back( - std::make_pair("COMMAND_DENIED", dronecode_sdk::Action::Result::COMMAND_DENIED)); + std::make_pair("CONNECTION_ERROR", mavsdk::Action::Result::CONNECTION_ERROR)); + input_pairs.push_back(std::make_pair("BUSY", mavsdk::Action::Result::BUSY)); + input_pairs.push_back(std::make_pair("COMMAND_DENIED", mavsdk::Action::Result::COMMAND_DENIED)); input_pairs.push_back( std::make_pair("COMMAND_DENIED_LANDED_STATE_UNKNOWN", - dronecode_sdk::Action::Result::COMMAND_DENIED_LANDED_STATE_UNKNOWN)); + mavsdk::Action::Result::COMMAND_DENIED_LANDED_STATE_UNKNOWN)); input_pairs.push_back(std::make_pair("COMMAND_DENIED_NOT_LANDED", - dronecode_sdk::Action::Result::COMMAND_DENIED_NOT_LANDED)); - input_pairs.push_back(std::make_pair("TIMEOUT", dronecode_sdk::Action::Result::TIMEOUT)); - input_pairs.push_back( - std::make_pair("VTOL_TRANSITION_SUPPORT_UNKNOWN", - dronecode_sdk::Action::Result::VTOL_TRANSITION_SUPPORT_UNKNOWN)); - input_pairs.push_back(std::make_pair( - "NO_VTOL_TRANSITION_SUPPORT", dronecode_sdk::Action::Result::NO_VTOL_TRANSITION_SUPPORT)); - input_pairs.push_back(std::make_pair("UNKNOWN", dronecode_sdk::Action::Result::UNKNOWN)); + mavsdk::Action::Result::COMMAND_DENIED_NOT_LANDED)); + input_pairs.push_back(std::make_pair("TIMEOUT", mavsdk::Action::Result::TIMEOUT)); + input_pairs.push_back(std::make_pair("VTOL_TRANSITION_SUPPORT_UNKNOWN", + mavsdk::Action::Result::VTOL_TRANSITION_SUPPORT_UNKNOWN)); + input_pairs.push_back(std::make_pair("NO_VTOL_TRANSITION_SUPPORT", + mavsdk::Action::Result::NO_VTOL_TRANSITION_SUPPORT)); + input_pairs.push_back(std::make_pair("UNKNOWN", mavsdk::Action::Result::UNKNOWN)); input_pairs.push_back( - std::make_pair("PARAMETER_ERROR", dronecode_sdk::Action::Result::PARAMETER_ERROR)); + std::make_pair("PARAMETER_ERROR", mavsdk::Action::Result::PARAMETER_ERROR)); return input_pairs; } diff --git a/src/backend/test/camera_service_impl_test.cpp b/src/backend/test/camera_service_impl_test.cpp index 05f7a54feb..9607c07fdd 100644 --- a/src/backend/test/camera_service_impl_test.cpp +++ b/src/backend/test/camera_service_impl_test.cpp @@ -16,32 +16,32 @@ using testing::DoDefault; using testing::NiceMock; using testing::Return; -using MockCamera = NiceMock; -using CameraServiceImpl = dronecode_sdk::backend::CameraServiceImpl; -using CameraService = dronecode_sdk::rpc::camera::CameraService; +using MockCamera = NiceMock; +using CameraServiceImpl = mavsdk::backend::CameraServiceImpl; +using CameraService = mavsdk::rpc::camera::CameraService; -using CameraResult = dronecode_sdk::rpc::camera::CameraResult; -using InputPair = std::pair; +using CameraResult = mavsdk::rpc::camera::CameraResult; +using InputPair = std::pair; static constexpr auto ARBITRARY_FLOAT = 24.2f; -static constexpr auto ARBITRARY_RPC_CAMERA_MODE = dronecode_sdk::rpc::camera::CameraMode::PHOTO; -static constexpr auto ARBITRARY_CAMERA_MODE = dronecode_sdk::Camera::Mode::VIDEO; +static constexpr auto ARBITRARY_RPC_CAMERA_MODE = mavsdk::rpc::camera::CameraMode::PHOTO; +static constexpr auto ARBITRARY_CAMERA_MODE = mavsdk::Camera::Mode::VIDEO; static constexpr auto ARBITRARY_FRAME_RATE = 24.0f; static constexpr auto ARBITRARY_RESOLUTION = 1280; static constexpr auto ARBITRARY_BIT_RATE = 1492; static constexpr auto ARBITRARY_ROTATION = 24; static constexpr auto ARBITRARY_URI = "rtsp://blah:1337"; static constexpr auto ARBITRARY_VIDEO_STREAM_STATUS = - dronecode_sdk::rpc::camera::VideoStreamInfo_VideoStreamStatus_IN_PROGRESS; + mavsdk::rpc::camera::VideoStreamInfo_VideoStreamStatus_IN_PROGRESS; static constexpr auto ARBITRARY_INT = 123456; static constexpr auto ARBITRARY_BOOL = true; static constexpr auto ARBITRARY_CAMERA_STORAGE_STATUS = - dronecode_sdk::Camera::Status::StorageStatus::FORMATTED; + mavsdk::Camera::Status::StorageStatus::FORMATTED; static constexpr auto ARBITRARY_SETTING_ID = "23b442"; static constexpr auto ARBITRARY_SETTING_DESCRIPTION = "Twenty-three b four hundred-forty-two"; static constexpr auto ARBITRARY_OPTION_ID = "small"; static constexpr auto ARBITRARY_OPTION_DESCRIPTION = "Bigger"; -static constexpr auto ARBITRARY_CAMERA_RESULT = dronecode_sdk::Camera::Result::SUCCESS; +static constexpr auto ARBITRARY_CAMERA_RESULT = mavsdk::Camera::Result::SUCCESS; std::vector generateInputPairs(); @@ -63,86 +63,87 @@ class CameraServiceImplTest : public ::testing::TestWithParam { _stub = CameraService::NewStub(channel); } - void setCameraMode(const dronecode_sdk::rpc::camera::CameraMode mode); + void setCameraMode(const mavsdk::rpc::camera::CameraMode mode); - std::future subscribeModeAsync(std::vector &camera_modes, + std::future subscribeModeAsync(std::vector &camera_modes, std::shared_ptr context = std::make_shared()) const; - void checkSendsModes(const std::vector &modes) const; - std::unique_ptr + void checkSendsModes(const std::vector &modes) const; + std::unique_ptr createArbitraryRPCVideoStreamSettings() const; std::future - subscribeVideoStreamInfoAsync(std::vector &video_info, + subscribeVideoStreamInfoAsync(std::vector &video_info, std::shared_ptr context) const; - std::unique_ptr - createArbitraryRPCVideoStreamInfo() const; + std::unique_ptr createArbitraryRPCVideoStreamInfo() const; void checkSendsVideoStreamInfo( - const std::vector &video_info_events) const; - dronecode_sdk::Camera::VideoStreamInfo - createVideoStreamInfo(const dronecode_sdk::Camera::VideoStreamSettings settings, - const dronecode_sdk::Camera::VideoStreamInfo::Status status) const; + const std::vector &video_info_events) const; + mavsdk::Camera::VideoStreamInfo + createVideoStreamInfo(const mavsdk::Camera::VideoStreamSettings settings, + const mavsdk::Camera::VideoStreamInfo::Status status) const; std::future - subscribeCaptureInfoAsync(std::vector &capture_info_events, + subscribeCaptureInfoAsync(std::vector &capture_info_events, std::shared_ptr context) const; - std::unique_ptr createArbitraryRPCCaptureInfo() const; - std::unique_ptr createRPCPosition( - const double lat, const double lng, const float abs_alt, const float rel_alt) const; - std::unique_ptr + std::unique_ptr createArbitraryRPCCaptureInfo() const; + std::unique_ptr createRPCPosition(const double lat, + const double lng, + const float abs_alt, + const float rel_alt) const; + std::unique_ptr createRPCAttitudeQuaternion(const float w, const float x, const float y, const float z) const; - std::unique_ptr createRPCAttitudeEulerAngle( + std::unique_ptr createRPCAttitudeEulerAngle( const float yaw_deg, const float pitch_deg, const float roll_deg) const; void checkSendsCaptureInfo( - const std::vector &capture_info_events) const; - dronecode_sdk::Camera::CaptureInfo createArbitraryCaptureInfo() const; + const std::vector &capture_info_events) const; + mavsdk::Camera::CaptureInfo createArbitraryCaptureInfo() const; - dronecode_sdk::Camera::Status + mavsdk::Camera::Status createCameraStatus(const bool is_video_on, const bool is_photo_interval_on, - const dronecode_sdk::Camera::Status::StorageStatus storage_status, + const mavsdk::Camera::Status::StorageStatus storage_status, const float used_storage_mib, const float available_storage_mib, const float total_storage_mib, const float recording_time_s, const std::string media_folder_name) const; std::future - subscribeCameraStatusAsync(std::vector &camera_status_events, + subscribeCameraStatusAsync(std::vector &camera_status_events, std::shared_ptr context) const; - void checkSendsCameraStatus( - const std::vector &camera_status_events) const; - - dronecode_sdk::Camera::Option createOption(const std::string option_id, - const std::string option_description) const; - dronecode_sdk::Camera::Setting createSetting(const std::string setting_id, - const std::string setting_description, - const dronecode_sdk::Camera::Option &option) const; + void + checkSendsCameraStatus(const std::vector &camera_status_events) const; + + mavsdk::Camera::Option createOption(const std::string option_id, + const std::string option_description) const; + mavsdk::Camera::Setting createSetting(const std::string setting_id, + const std::string setting_description, + const mavsdk::Camera::Option &option) const; std::future subscribeCurrentSettingsAsync( - std::vector> ¤t_settings_events, + std::vector> ¤t_settings_events, std::shared_ptr context) const; - void checkSendsCurrentSettings(const std::vector> - ¤t_settings_events) const; + void checkSendsCurrentSettings( + const std::vector> ¤t_settings_events) const; - dronecode_sdk::Camera::SettingOptions + mavsdk::Camera::SettingOptions createSettingOptions(const std::string setting_id, const std::string setting_description, - const std::vector &options) const; + const std::vector &options) const; std::future subscribePossibleSettingOptionsAsync( - std::vector> &possible_settings_events, + std::vector> &possible_settings_events, std::shared_ptr context) const; - void checkSendsPossibleSettingOptions( - const std::vector> - &possible_setting_options_events) const; + void + checkSendsPossibleSettingOptions(const std::vector> + &possible_setting_options_events) const; - std::unique_ptr + std::unique_ptr createRPCSetting(const std::string &setting_id, const std::string &setting_description, const std::string &option_id, const std::string &option_description); - std::future setSettingAndSaveParams( - const dronecode_sdk::rpc::camera::SetSettingRequest &request, - std::shared_ptr response, - dronecode_sdk::Camera::result_callback_t &result_callback); + std::future + setSettingAndSaveParams(const mavsdk::rpc::camera::SetSettingRequest &request, + std::shared_ptr response, + mavsdk::Camera::result_callback_t &result_callback); MockCamera _camera{}; CameraServiceImpl _camera_service; @@ -162,7 +163,7 @@ ACTION_P2(SaveResult, callback, callback_saved_promise) TEST_P(CameraServiceImplTest, takePhotoResultIsTranslatedCorrectly) { ON_CALL(_camera, take_photo()).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::TakePhotoResponse response; + mavsdk::rpc::camera::TakePhotoResponse response; _camera_service.TakePhoto(nullptr, nullptr, &response); @@ -179,9 +180,9 @@ TEST_F(CameraServiceImplTest, takesPhotoEvenWhenArgsAreNull) TEST_P(CameraServiceImplTest, startPhotoIntervalResultIsTranslatedCorrectly) { ON_CALL(_camera, start_photo_interval(_)).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::StartPhotoIntervalRequest request; + mavsdk::rpc::camera::StartPhotoIntervalRequest request; request.set_interval_s(ARBITRARY_FLOAT); - dronecode_sdk::rpc::camera::StartPhotoIntervalResponse response; + mavsdk::rpc::camera::StartPhotoIntervalResponse response; _camera_service.StartPhotoInterval(nullptr, &request, &response); @@ -191,7 +192,7 @@ TEST_P(CameraServiceImplTest, startPhotoIntervalResultIsTranslatedCorrectly) TEST_F(CameraServiceImplTest, startsPhotoIntervalEvenWhenContextAndResponseAreNull) { EXPECT_CALL(_camera, start_photo_interval(_)).Times(1); - dronecode_sdk::rpc::camera::StartPhotoIntervalRequest request; + mavsdk::rpc::camera::StartPhotoIntervalRequest request; request.set_interval_s(ARBITRARY_FLOAT); _camera_service.StartPhotoInterval(nullptr, &request, nullptr); @@ -201,7 +202,7 @@ TEST_F(CameraServiceImplTest, startsPhotoIntervalWithRightParameter) { auto expected_interval = ARBITRARY_FLOAT; EXPECT_CALL(_camera, start_photo_interval(expected_interval)).Times(1); - dronecode_sdk::rpc::camera::StartPhotoIntervalRequest request; + mavsdk::rpc::camera::StartPhotoIntervalRequest request; request.set_interval_s(expected_interval); _camera_service.StartPhotoInterval(nullptr, &request, nullptr); @@ -209,7 +210,7 @@ TEST_F(CameraServiceImplTest, startsPhotoIntervalWithRightParameter) TEST_F(CameraServiceImplTest, startPhotoIntervalReturnsWrongArgumentErrorIfRequestIsNull) { - dronecode_sdk::rpc::camera::StartPhotoIntervalResponse response; + mavsdk::rpc::camera::StartPhotoIntervalResponse response; _camera_service.StartPhotoInterval(nullptr, nullptr, &response); @@ -224,7 +225,7 @@ TEST_F(CameraServiceImplTest, startPhotoIntervalDoesNotCrashWhenArgsAreNull) TEST_P(CameraServiceImplTest, stopPhotoIntervalResultIsTranslatedCorrectly) { ON_CALL(_camera, stop_photo_interval()).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::StopPhotoIntervalResponse response; + mavsdk::rpc::camera::StopPhotoIntervalResponse response; _camera_service.StopPhotoInterval(nullptr, nullptr, &response); @@ -241,7 +242,7 @@ TEST_F(CameraServiceImplTest, stopsPhotoIntervalEvenWhenArgsAreNull) TEST_P(CameraServiceImplTest, startVideoResultIsTranslatedCorrectly) { ON_CALL(_camera, start_video()).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::StartVideoResponse response; + mavsdk::rpc::camera::StartVideoResponse response; _camera_service.StartVideo(nullptr, nullptr, &response); @@ -258,7 +259,7 @@ TEST_F(CameraServiceImplTest, startsVideoEvenWhenArgsAreNull) TEST_P(CameraServiceImplTest, stopVideoResultIsTranslatedCorrectly) { ON_CALL(_camera, stop_video()).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::StopVideoResponse response; + mavsdk::rpc::camera::StopVideoResponse response; _camera_service.StopVideo(nullptr, nullptr, &response); @@ -275,7 +276,7 @@ TEST_F(CameraServiceImplTest, stopVideoEvenWhenArgsAreNull) TEST_P(CameraServiceImplTest, startVideoStreamingResultIsTranslatedCorrectly) { ON_CALL(_camera, start_video_streaming()).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::StartVideoStreamingResponse response; + mavsdk::rpc::camera::StartVideoStreamingResponse response; _camera_service.StartVideoStreaming(nullptr, nullptr, &response); @@ -292,7 +293,7 @@ TEST_F(CameraServiceImplTest, startsVideoStreamingEvenWhenArgsAreNull) TEST_P(CameraServiceImplTest, stopVideoStreamingResultIsTranslatedCorrectly) { ON_CALL(_camera, stop_video_streaming()).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::StopVideoStreamingResponse response; + mavsdk::rpc::camera::StopVideoStreamingResponse response; _camera_service.StopVideoStreaming(nullptr, nullptr, &response); @@ -313,7 +314,7 @@ TEST_F(CameraServiceImplTest, setModeDoesNotFailWithAllNullParams) TEST_F(CameraServiceImplTest, setModeDoesNotFailWithNullResponse) { - dronecode_sdk::rpc::camera::SetModeRequest request; + mavsdk::rpc::camera::SetModeRequest request; request.set_camera_mode(ARBITRARY_RPC_CAMERA_MODE); _camera_service.SetMode(nullptr, &request, nullptr); @@ -322,9 +323,9 @@ TEST_F(CameraServiceImplTest, setModeDoesNotFailWithNullResponse) TEST_P(CameraServiceImplTest, setModeResultIsTranslatedCorrectly) { ON_CALL(_camera, set_mode(_)).WillByDefault(Return(GetParam().second)); - dronecode_sdk::rpc::camera::SetModeRequest request; + mavsdk::rpc::camera::SetModeRequest request; request.set_camera_mode(ARBITRARY_RPC_CAMERA_MODE); - dronecode_sdk::rpc::camera::SetModeResponse response; + mavsdk::rpc::camera::SetModeResponse response; _camera_service.SetMode(nullptr, &request, &response); @@ -333,37 +334,37 @@ TEST_P(CameraServiceImplTest, setModeResultIsTranslatedCorrectly) TEST_F(CameraServiceImplTest, setModeSetsPhotoMode) { - const auto expected_mode = dronecode_sdk::Camera::Mode::PHOTO; + const auto expected_mode = mavsdk::Camera::Mode::PHOTO; EXPECT_CALL(_camera, set_mode(expected_mode)).Times(1); - setCameraMode(dronecode_sdk::rpc::camera::CameraMode::PHOTO); + setCameraMode(mavsdk::rpc::camera::CameraMode::PHOTO); } -void CameraServiceImplTest::setCameraMode(const dronecode_sdk::rpc::camera::CameraMode mode) +void CameraServiceImplTest::setCameraMode(const mavsdk::rpc::camera::CameraMode mode) { - dronecode_sdk::rpc::camera::SetModeRequest request; + mavsdk::rpc::camera::SetModeRequest request; request.set_camera_mode(mode); - dronecode_sdk::rpc::camera::SetModeResponse response; + mavsdk::rpc::camera::SetModeResponse response; _camera_service.SetMode(nullptr, &request, &response); } TEST_F(CameraServiceImplTest, setModeSetsVideoMode) { - const auto expected_mode = dronecode_sdk::Camera::Mode::VIDEO; + const auto expected_mode = mavsdk::Camera::Mode::VIDEO; EXPECT_CALL(_camera, set_mode(expected_mode)).Times(1); - setCameraMode(dronecode_sdk::rpc::camera::CameraMode::VIDEO); + setCameraMode(mavsdk::rpc::camera::CameraMode::VIDEO); } TEST_F(CameraServiceImplTest, registersToCameraMode) { - dronecode_sdk::Camera::subscribe_mode_callback_t mode_callback; + mavsdk::Camera::subscribe_mode_callback_t mode_callback; EXPECT_CALL(_camera, subscribe_mode(_)) .Times(2) .WillOnce(SaveResult(&mode_callback, &_callback_saved_promise)) .WillOnce(DoDefault()); - std::vector mode_events; + std::vector mode_events; auto context = std::make_shared(); auto mode_events_future = subscribeModeAsync(mode_events, context); @@ -374,14 +375,14 @@ TEST_F(CameraServiceImplTest, registersToCameraMode) } std::future -CameraServiceImplTest::subscribeModeAsync(std::vector &camera_modes, +CameraServiceImplTest::subscribeModeAsync(std::vector &camera_modes, std::shared_ptr context) const { return std::async(std::launch::async, [&]() { - dronecode_sdk::rpc::camera::SubscribeModeRequest request; + mavsdk::rpc::camera::SubscribeModeRequest request; auto response_reader = _stub->SubscribeMode(context.get(), request); - dronecode_sdk::rpc::camera::ModeResponse response; + mavsdk::rpc::camera::ModeResponse response; while (response_reader->Read(&response)) { camera_modes.push_back( CameraServiceImpl::translateRPCCameraMode(response.camera_mode())); @@ -393,25 +394,24 @@ CameraServiceImplTest::subscribeModeAsync(std::vector modes; + std::vector modes; modes.push_back(ARBITRARY_CAMERA_MODE); checkSendsModes(modes); } -void CameraServiceImplTest::checkSendsModes( - const std::vector &modes) const +void CameraServiceImplTest::checkSendsModes(const std::vector &modes) const { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Camera::subscribe_mode_callback_t mode_callback; + mavsdk::Camera::subscribe_mode_callback_t mode_callback; auto context = std::make_shared(); EXPECT_CALL(_camera, subscribe_mode(_)) .Times(2) .WillOnce(SaveResult(&mode_callback, &subscription_promise)) .WillOnce(DoDefault()); - std::vector received_modes; + std::vector received_modes; auto mode_events_future = subscribeModeAsync(received_modes, context); subscription_future.wait(); for (const auto mode : modes) { @@ -429,22 +429,22 @@ void CameraServiceImplTest::checkSendsModes( TEST_F(CameraServiceImplTest, sendsMultipleModes) { - std::vector modes; + std::vector modes; modes.push_back(ARBITRARY_CAMERA_MODE); modes.push_back(ARBITRARY_CAMERA_MODE); modes.push_back(ARBITRARY_CAMERA_MODE); - modes.push_back(dronecode_sdk::Camera::Mode::PHOTO); - modes.push_back(dronecode_sdk::Camera::Mode::VIDEO); - modes.push_back(dronecode_sdk::Camera::Mode::UNKNOWN); + modes.push_back(mavsdk::Camera::Mode::PHOTO); + modes.push_back(mavsdk::Camera::Mode::VIDEO); + modes.push_back(mavsdk::Camera::Mode::UNKNOWN); checkSendsModes(modes); } -std::unique_ptr +std::unique_ptr CameraServiceImplTest::createArbitraryRPCVideoStreamSettings() const { - auto rpc_settings = std::unique_ptr( - new dronecode_sdk::rpc::camera::VideoStreamSettings()); + auto rpc_settings = std::unique_ptr( + new mavsdk::rpc::camera::VideoStreamSettings()); rpc_settings->set_frame_rate_hz(ARBITRARY_FRAME_RATE); rpc_settings->set_horizontal_resolution_pix(ARBITRARY_RESOLUTION); rpc_settings->set_vertical_resolution_pix(ARBITRARY_RESOLUTION); @@ -460,12 +460,12 @@ TEST_F(CameraServiceImplTest, registersToVideoStreamInfo) auto rpc_video_stream_info = createArbitraryRPCVideoStreamInfo(); const auto expected_video_stream_info = CameraServiceImpl::translateRPCVideoStreamInfo(*rpc_video_stream_info); - dronecode_sdk::Camera::subscribe_video_stream_info_callback_t video_info_callback; + mavsdk::Camera::subscribe_video_stream_info_callback_t video_info_callback; EXPECT_CALL(_camera, subscribe_video_stream_info(_)) .Times(2) .WillOnce(SaveResult(&video_info_callback, &_callback_saved_promise)) .WillOnce(DoDefault()); - std::vector video_info_events; + std::vector video_info_events; auto context = std::make_shared(); auto mode_events_future = subscribeVideoStreamInfoAsync(video_info_events, context); @@ -476,14 +476,14 @@ TEST_F(CameraServiceImplTest, registersToVideoStreamInfo) } std::future CameraServiceImplTest::subscribeVideoStreamInfoAsync( - std::vector &video_info_events, + std::vector &video_info_events, std::shared_ptr context) const { return std::async(std::launch::async, [&]() { - dronecode_sdk::rpc::camera::SubscribeVideoStreamInfoRequest request; + mavsdk::rpc::camera::SubscribeVideoStreamInfoRequest request; auto response_reader = _stub->SubscribeVideoStreamInfo(context.get(), request); - dronecode_sdk::rpc::camera::VideoStreamInfoResponse response; + mavsdk::rpc::camera::VideoStreamInfoResponse response; while (response_reader->Read(&response)) { video_info_events.push_back( CameraServiceImpl::translateRPCVideoStreamInfo(response.video_stream_info())); @@ -493,11 +493,11 @@ std::future CameraServiceImplTest::subscribeVideoStreamInfoAsync( }); } -std::unique_ptr +std::unique_ptr CameraServiceImplTest::createArbitraryRPCVideoStreamInfo() const { - auto rpc_info = std::unique_ptr( - new dronecode_sdk::rpc::camera::VideoStreamInfo()); + auto rpc_info = std::unique_ptr( + new mavsdk::rpc::camera::VideoStreamInfo()); rpc_info->set_video_stream_status(ARBITRARY_VIDEO_STREAM_STATUS); rpc_info->set_allocated_video_stream_settings( createArbitraryRPCVideoStreamSettings().release()); @@ -507,7 +507,7 @@ CameraServiceImplTest::createArbitraryRPCVideoStreamInfo() const TEST_F(CameraServiceImplTest, sendsOneVideoStreamInfo) { - std::vector video_info_events; + std::vector video_info_events; auto video_info_event = createArbitraryRPCVideoStreamInfo(); video_info_events.push_back(CameraServiceImpl::translateRPCVideoStreamInfo(*video_info_event)); @@ -515,18 +515,18 @@ TEST_F(CameraServiceImplTest, sendsOneVideoStreamInfo) } void CameraServiceImplTest::checkSendsVideoStreamInfo( - const std::vector &video_info_events) const + const std::vector &video_info_events) const { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Camera::subscribe_video_stream_info_callback_t video_info_callback; + mavsdk::Camera::subscribe_video_stream_info_callback_t video_info_callback; auto context = std::make_shared(); EXPECT_CALL(_camera, subscribe_video_stream_info(_)) .Times(2) .WillOnce(SaveResult(&video_info_callback, &subscription_promise)) .WillOnce(DoDefault()); - std::vector received_video_info_events; + std::vector received_video_info_events; auto video_info_events_future = subscribeVideoStreamInfoAsync(received_video_info_events, context); subscription_future.wait(); @@ -550,12 +550,12 @@ TEST_F(CameraServiceImplTest, registersToCaptureInfo) auto rpc_capture_info = createArbitraryRPCCaptureInfo(); const auto expected_capture_info = CameraServiceImpl::translateRPCCaptureInfo(*rpc_capture_info); - dronecode_sdk::Camera::capture_info_callback_t capture_info_callback; + mavsdk::Camera::capture_info_callback_t capture_info_callback; EXPECT_CALL(_camera, subscribe_capture_info(_)) .Times(2) .WillOnce(SaveResult(&capture_info_callback, &_callback_saved_promise)) .WillOnce(DoDefault()); - std::vector capture_info_events; + std::vector capture_info_events; auto context = std::make_shared(); auto mode_events_future = subscribeCaptureInfoAsync(capture_info_events, context); @@ -566,14 +566,14 @@ TEST_F(CameraServiceImplTest, registersToCaptureInfo) } std::future CameraServiceImplTest::subscribeCaptureInfoAsync( - std::vector &capture_info_events, + std::vector &capture_info_events, std::shared_ptr context) const { return std::async(std::launch::async, [&]() { - dronecode_sdk::rpc::camera::SubscribeCaptureInfoRequest request; + mavsdk::rpc::camera::SubscribeCaptureInfoRequest request; auto response_reader = _stub->SubscribeCaptureInfo(context.get(), request); - dronecode_sdk::rpc::camera::CaptureInfoResponse response; + mavsdk::rpc::camera::CaptureInfoResponse response; while (response_reader->Read(&response)) { capture_info_events.push_back( CameraServiceImpl::translateRPCCaptureInfo(response.capture_info())); @@ -583,11 +583,11 @@ std::future CameraServiceImplTest::subscribeCaptureInfoAsync( }); } -std::unique_ptr +std::unique_ptr CameraServiceImplTest::createArbitraryRPCCaptureInfo() const { - auto rpc_info = std::unique_ptr( - new dronecode_sdk::rpc::camera::CaptureInfo()); + auto rpc_info = + std::unique_ptr(new mavsdk::rpc::camera::CaptureInfo()); rpc_info->set_allocated_position( createRPCPosition(41.848695, 75.132751, 3002.1f, 50.3f).release()); rpc_info->set_allocated_attitude_quaternion( @@ -602,11 +602,11 @@ CameraServiceImplTest::createArbitraryRPCCaptureInfo() const return rpc_info; } -std::unique_ptr CameraServiceImplTest::createRPCPosition( +std::unique_ptr CameraServiceImplTest::createRPCPosition( const double lat, const double lng, const float abs_alt, const float rel_alt) const { - auto expected_position = std::unique_ptr( - new dronecode_sdk::rpc::camera::Position()); + auto expected_position = + std::unique_ptr(new mavsdk::rpc::camera::Position()); expected_position->set_latitude_deg(lat); expected_position->set_longitude_deg(lng); @@ -616,14 +616,11 @@ std::unique_ptr CameraServiceImplTest::cre return expected_position; } -std::unique_ptr -CameraServiceImplTest::createRPCAttitudeQuaternion(const float w, - const float x, - const float y, - const float z) const +std::unique_ptr CameraServiceImplTest::createRPCAttitudeQuaternion( + const float w, const float x, const float y, const float z) const { - auto quaternion = std::unique_ptr( - new dronecode_sdk::rpc::camera::Quaternion()); + auto quaternion = + std::unique_ptr(new mavsdk::rpc::camera::Quaternion()); quaternion->set_w(w); quaternion->set_x(x); @@ -633,13 +630,11 @@ CameraServiceImplTest::createRPCAttitudeQuaternion(const float w, return quaternion; } -std::unique_ptr -CameraServiceImplTest::createRPCAttitudeEulerAngle(const float yaw_deg, - const float pitch_deg, - const float roll_deg) const +std::unique_ptr CameraServiceImplTest::createRPCAttitudeEulerAngle( + const float yaw_deg, const float pitch_deg, const float roll_deg) const { - auto euler_angle = std::unique_ptr( - new dronecode_sdk::rpc::camera::EulerAngle()); + auto euler_angle = + std::unique_ptr(new mavsdk::rpc::camera::EulerAngle()); euler_angle->set_yaw_deg(yaw_deg); euler_angle->set_pitch_deg(pitch_deg); @@ -650,7 +645,7 @@ CameraServiceImplTest::createRPCAttitudeEulerAngle(const float yaw_deg, TEST_F(CameraServiceImplTest, sendsOneCaptureInfo) { - std::vector capture_info_events; + std::vector capture_info_events; auto capture_info_event = createArbitraryRPCCaptureInfo(); capture_info_events.push_back(CameraServiceImpl::translateRPCCaptureInfo(*capture_info_event)); @@ -658,18 +653,18 @@ TEST_F(CameraServiceImplTest, sendsOneCaptureInfo) } void CameraServiceImplTest::checkSendsCaptureInfo( - const std::vector &capture_info_events) const + const std::vector &capture_info_events) const { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Camera::capture_info_callback_t capture_info_callback; + mavsdk::Camera::capture_info_callback_t capture_info_callback; auto context = std::make_shared(); EXPECT_CALL(_camera, subscribe_capture_info(_)) .Times(2) .WillOnce(SaveResult(&capture_info_callback, &subscription_promise)) .WillOnce(DoDefault()); - std::vector received_capture_info_events; + std::vector received_capture_info_events; auto capture_info_events_future = subscribeCaptureInfoAsync(received_capture_info_events, context); subscription_future.wait(); @@ -690,7 +685,7 @@ void CameraServiceImplTest::checkSendsCaptureInfo( TEST_F(CameraServiceImplTest, sendsMultipleCaptureInfos) { - std::vector capture_info_events; + std::vector capture_info_events; capture_info_events.push_back(createArbitraryCaptureInfo()); capture_info_events.push_back(createArbitraryCaptureInfo()); @@ -700,26 +695,26 @@ TEST_F(CameraServiceImplTest, sendsMultipleCaptureInfos) checkSendsCaptureInfo(capture_info_events); } -dronecode_sdk::Camera::CaptureInfo CameraServiceImplTest::createArbitraryCaptureInfo() const +mavsdk::Camera::CaptureInfo CameraServiceImplTest::createArbitraryCaptureInfo() const { - dronecode_sdk::Camera::CaptureInfo::Position position{}; + mavsdk::Camera::CaptureInfo::Position position{}; position.latitude_deg = 12.12223; position.longitude_deg = 24.342; position.absolute_altitude_m = 2334.2f; position.relative_altitude_m = 54.12f; - dronecode_sdk::Camera::CaptureInfo::Quaternion quaternion; + mavsdk::Camera::CaptureInfo::Quaternion quaternion; quaternion.w = 12.3f; quaternion.x = 0.3f; quaternion.y = 1.1f; quaternion.z = -4.2f; - dronecode_sdk::Camera::CaptureInfo::EulerAngle euler_angle; + mavsdk::Camera::CaptureInfo::EulerAngle euler_angle; euler_angle.yaw_deg = 12.6f; euler_angle.pitch_deg = 102.3f; euler_angle.roll_deg = -24.0f; - dronecode_sdk::Camera::CaptureInfo capture_info{}; + mavsdk::Camera::CaptureInfo capture_info{}; capture_info.position = position; capture_info.attitude_quaternion = quaternion; capture_info.attitude_euler_angle = euler_angle; @@ -735,12 +730,12 @@ TEST_F(CameraServiceImplTest, registersToCameraStatus) { const auto expected_camera_status = createCameraStatus( false, true, ARBITRARY_CAMERA_STORAGE_STATUS, 3.4f, 12.6f, 16.0f, 0.4f, "100E90HD"); - dronecode_sdk::Camera::subscribe_status_callback_t status_callback; + mavsdk::Camera::subscribe_status_callback_t status_callback; EXPECT_CALL(_camera, subscribe_status(_)) .Times(2) .WillOnce(SaveResult(&status_callback, &_callback_saved_promise)) .WillOnce(DoDefault()); - std::vector camera_status_events; + std::vector camera_status_events; auto context = std::make_shared(); auto mode_events_future = subscribeCameraStatusAsync(camera_status_events, context); @@ -750,17 +745,17 @@ TEST_F(CameraServiceImplTest, registersToCameraStatus) mode_events_future.wait(); } -dronecode_sdk::Camera::Status CameraServiceImplTest::createCameraStatus( +mavsdk::Camera::Status CameraServiceImplTest::createCameraStatus( const bool is_video_on, const bool is_photo_interval_on, - const dronecode_sdk::Camera::Status::StorageStatus storage_status, + const mavsdk::Camera::Status::StorageStatus storage_status, const float used_storage_mib, const float available_storage_mib, const float total_storage_mib, const float recording_time_s, const std::string media_folder_name) const { - dronecode_sdk::Camera::Status status{}; + mavsdk::Camera::Status status{}; status.video_on = is_video_on; status.photo_interval_on = is_photo_interval_on; status.storage_status = storage_status; @@ -774,14 +769,14 @@ dronecode_sdk::Camera::Status CameraServiceImplTest::createCameraStatus( } std::future CameraServiceImplTest::subscribeCameraStatusAsync( - std::vector &camera_status_events, + std::vector &camera_status_events, std::shared_ptr context) const { return std::async(std::launch::async, [&]() { - dronecode_sdk::rpc::camera::SubscribeCameraStatusRequest request; + mavsdk::rpc::camera::SubscribeCameraStatusRequest request; auto response_reader = _stub->SubscribeCameraStatus(context.get(), request); - dronecode_sdk::rpc::camera::CameraStatusResponse response; + mavsdk::rpc::camera::CameraStatusResponse response; while (response_reader->Read(&response)) { camera_status_events.push_back( CameraServiceImpl::translateRPCCameraStatus(response.camera_status())); @@ -793,7 +788,7 @@ std::future CameraServiceImplTest::subscribeCameraStatusAsync( TEST_F(CameraServiceImplTest, sendsOneCameraStatus) { - std::vector camera_status_events; + std::vector camera_status_events; auto camera_status_event = createCameraStatus( false, true, ARBITRARY_CAMERA_STORAGE_STATUS, 3.4f, 12.6f, 16.0f, 22.4f, "105E90HD"); camera_status_events.push_back(camera_status_event); @@ -802,18 +797,18 @@ TEST_F(CameraServiceImplTest, sendsOneCameraStatus) } void CameraServiceImplTest::checkSendsCameraStatus( - const std::vector &camera_status_events) const + const std::vector &camera_status_events) const { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Camera::subscribe_status_callback_t camera_status_callback; + mavsdk::Camera::subscribe_status_callback_t camera_status_callback; auto context = std::make_shared(); EXPECT_CALL(_camera, subscribe_status(_)) .Times(2) .WillOnce(SaveResult(&camera_status_callback, &subscription_promise)) .WillOnce(DoDefault()); - std::vector received_camera_status_events; + std::vector received_camera_status_events; auto camera_status_events_future = subscribeCameraStatusAsync(received_camera_status_events, context); subscription_future.wait(); @@ -834,12 +829,12 @@ void CameraServiceImplTest::checkSendsCameraStatus( TEST_F(CameraServiceImplTest, sendsMultipleCameraStatus) { - std::vector camera_status_events; + std::vector camera_status_events; camera_status_events.push_back( createCameraStatus(true, true, - dronecode_sdk::Camera::Status::StorageStatus::UNFORMATTED, + mavsdk::Camera::Status::StorageStatus::UNFORMATTED, 1.2f, 3.4f, 2.2f, @@ -848,7 +843,7 @@ TEST_F(CameraServiceImplTest, sendsMultipleCameraStatus) camera_status_events.push_back( createCameraStatus(true, false, - dronecode_sdk::Camera::Status::StorageStatus::FORMATTED, + mavsdk::Camera::Status::StorageStatus::FORMATTED, 11.2f, 58.4f, 8.65f, @@ -857,7 +852,7 @@ TEST_F(CameraServiceImplTest, sendsMultipleCameraStatus) camera_status_events.push_back( createCameraStatus(false, false, - dronecode_sdk::Camera::Status::StorageStatus::NOT_AVAILABLE, + mavsdk::Camera::Status::StorageStatus::NOT_AVAILABLE, 1.5f, 8.1f, 6.3f, @@ -869,17 +864,17 @@ TEST_F(CameraServiceImplTest, sendsMultipleCameraStatus) TEST_F(CameraServiceImplTest, registersToCurrentSettings) { - std::vector current_settings; + std::vector current_settings; current_settings.push_back( createSetting(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, createOption(ARBITRARY_OPTION_ID, ARBITRARY_OPTION_DESCRIPTION))); - dronecode_sdk::Camera::subscribe_current_settings_callback_t current_settings_callback; + mavsdk::Camera::subscribe_current_settings_callback_t current_settings_callback; EXPECT_CALL(_camera, subscribe_current_settings(_)) .Times(2) .WillOnce(SaveResult(¤t_settings_callback, &_callback_saved_promise)) .WillOnce(DoDefault()); - std::vector> current_settings_events; + std::vector> current_settings_events; auto context = std::make_shared(); auto mode_events_future = subscribeCurrentSettingsAsync(current_settings_events, context); @@ -889,12 +884,12 @@ TEST_F(CameraServiceImplTest, registersToCurrentSettings) mode_events_future.wait(); } -dronecode_sdk::Camera::Setting +mavsdk::Camera::Setting CameraServiceImplTest::createSetting(const std::string setting_id, const std::string setting_description, - const dronecode_sdk::Camera::Option &option) const + const mavsdk::Camera::Option &option) const { - dronecode_sdk::Camera::Setting setting{}; + mavsdk::Camera::Setting setting{}; setting.setting_id = setting_id; setting.setting_description = setting_description; setting.option = option; @@ -902,11 +897,11 @@ CameraServiceImplTest::createSetting(const std::string setting_id, return setting; } -dronecode_sdk::Camera::Option +mavsdk::Camera::Option CameraServiceImplTest::createOption(const std::string option_id, const std::string option_description) const { - dronecode_sdk::Camera::Option option; + mavsdk::Camera::Option option; option.option_id = option_id; option.option_description = option_description; @@ -914,16 +909,16 @@ CameraServiceImplTest::createOption(const std::string option_id, } std::future CameraServiceImplTest::subscribeCurrentSettingsAsync( - std::vector> ¤t_settings_events, + std::vector> ¤t_settings_events, std::shared_ptr context) const { return std::async(std::launch::async, [&]() { - dronecode_sdk::rpc::camera::SubscribeCurrentSettingsRequest request; + mavsdk::rpc::camera::SubscribeCurrentSettingsRequest request; auto response_reader = _stub->SubscribeCurrentSettings(context.get(), request); - dronecode_sdk::rpc::camera::CurrentSettingsResponse response; + mavsdk::rpc::camera::CurrentSettingsResponse response; while (response_reader->Read(&response)) { - std::vector response_settings; + std::vector response_settings; for (auto current_setting : response.current_settings()) { response_settings.push_back( @@ -939,9 +934,9 @@ std::future CameraServiceImplTest::subscribeCurrentSettingsAsync( TEST_F(CameraServiceImplTest, sendsOneCurrentSettings) { - std::vector> current_settings_events; + std::vector> current_settings_events; - std::vector current_settings; + std::vector current_settings; current_settings.push_back( createSetting(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, @@ -952,18 +947,18 @@ TEST_F(CameraServiceImplTest, sendsOneCurrentSettings) } void CameraServiceImplTest::checkSendsCurrentSettings( - const std::vector> ¤t_settings_events) const + const std::vector> ¤t_settings_events) const { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Camera::subscribe_current_settings_callback_t current_settings_callback; + mavsdk::Camera::subscribe_current_settings_callback_t current_settings_callback; auto context = std::make_shared(); EXPECT_CALL(_camera, subscribe_current_settings(_)) .Times(2) .WillOnce(SaveResult(¤t_settings_callback, &subscription_promise)) .WillOnce(DoDefault()); - std::vector> received_current_settings_events; + std::vector> received_current_settings_events; auto current_settings_events_future = subscribeCurrentSettingsAsync(received_current_settings_events, context); subscription_future.wait(); @@ -971,7 +966,7 @@ void CameraServiceImplTest::checkSendsCurrentSettings( current_settings_callback(current_settings_event); } context->TryCancel(); - std::vector arbitrary_current_settings_event; + std::vector arbitrary_current_settings_event; arbitrary_current_settings_event.push_back( createSetting(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, @@ -992,9 +987,9 @@ void CameraServiceImplTest::checkSendsCurrentSettings( TEST_F(CameraServiceImplTest, sendsMultipleCurrentSettings) { - std::vector> current_settings_events; + std::vector> current_settings_events; - std::vector current_settings1; + std::vector current_settings1; current_settings1.push_back( createSetting("arbitrary_setting_id1", "Arbitrary setting id one", @@ -1009,7 +1004,7 @@ TEST_F(CameraServiceImplTest, sendsMultipleCurrentSettings) createOption("arbitrary_option_id3", "Arbitrary Option ID three"))); current_settings_events.push_back(current_settings1); - std::vector current_settings2; + std::vector current_settings2; current_settings2.push_back( createSetting("arbitrary_setting_id4", "Arbitrary setting id four", @@ -1029,17 +1024,17 @@ TEST_F(CameraServiceImplTest, sendsMultipleCurrentSettings) TEST_F(CameraServiceImplTest, registersToPossibleSettings) { - std::vector possible_settings; - std::vector options; + std::vector possible_settings; + std::vector options; options.push_back(createOption(ARBITRARY_OPTION_ID, ARBITRARY_OPTION_DESCRIPTION)); possible_settings.push_back( createSettingOptions(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, options)); - dronecode_sdk::Camera::subscribe_possible_setting_options_callback_t possible_settings_callback; + mavsdk::Camera::subscribe_possible_setting_options_callback_t possible_settings_callback; EXPECT_CALL(_camera, subscribe_possible_setting_options(_)) .Times(2) .WillOnce(SaveResult(&possible_settings_callback, &_callback_saved_promise)) .WillOnce(DoDefault()); - std::vector> possible_settings_events; + std::vector> possible_settings_events; auto context = std::make_shared(); auto mode_events_future = @@ -1050,12 +1045,12 @@ TEST_F(CameraServiceImplTest, registersToPossibleSettings) mode_events_future.wait(); } -dronecode_sdk::Camera::SettingOptions CameraServiceImplTest::createSettingOptions( +mavsdk::Camera::SettingOptions CameraServiceImplTest::createSettingOptions( const std::string setting_id, const std::string setting_description, - const std::vector &options) const + const std::vector &options) const { - dronecode_sdk::Camera::SettingOptions setting_options; + mavsdk::Camera::SettingOptions setting_options; setting_options.setting_id = setting_id; setting_options.setting_description = setting_description; setting_options.options = options; @@ -1064,16 +1059,16 @@ dronecode_sdk::Camera::SettingOptions CameraServiceImplTest::createSettingOption } std::future CameraServiceImplTest::subscribePossibleSettingOptionsAsync( - std::vector> &possible_settings_events, + std::vector> &possible_settings_events, std::shared_ptr context) const { return std::async(std::launch::async, [&]() { - dronecode_sdk::rpc::camera::SubscribePossibleSettingOptionsRequest request; + mavsdk::rpc::camera::SubscribePossibleSettingOptionsRequest request; auto response_reader = _stub->SubscribePossibleSettingOptions(context.get(), request); - dronecode_sdk::rpc::camera::PossibleSettingOptionsResponse response; + mavsdk::rpc::camera::PossibleSettingOptionsResponse response; while (response_reader->Read(&response)) { - std::vector response_setting_options; + std::vector response_setting_options; for (auto setting_options : response.setting_options()) { response_setting_options.push_back( @@ -1089,10 +1084,10 @@ std::future CameraServiceImplTest::subscribePossibleSettingOptionsAsync( TEST_F(CameraServiceImplTest, sendsOnePossibleSettingOptions) { - std::vector> possible_setting_options_events; + std::vector> possible_setting_options_events; - std::vector possible_setting_options; - std::vector options; + std::vector possible_setting_options; + std::vector options; options.push_back(createOption(ARBITRARY_OPTION_ID, ARBITRARY_OPTION_DESCRIPTION)); possible_setting_options.push_back( createSettingOptions(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, options)); @@ -1102,20 +1097,19 @@ TEST_F(CameraServiceImplTest, sendsOnePossibleSettingOptions) } void CameraServiceImplTest::checkSendsPossibleSettingOptions( - const std::vector> - &possible_setting_options_events) const + const std::vector> &possible_setting_options_events) + const { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Camera::subscribe_possible_setting_options_callback_t - possible_setting_options_callback; + mavsdk::Camera::subscribe_possible_setting_options_callback_t possible_setting_options_callback; auto context = std::make_shared(); EXPECT_CALL(_camera, subscribe_possible_setting_options(_)) .Times(2) .WillOnce(SaveResult(&possible_setting_options_callback, &subscription_promise)) .WillOnce(DoDefault()); - std::vector> + std::vector> received_possible_setting_options_events; auto possible_setting_options_events_future = subscribePossibleSettingOptionsAsync(received_possible_setting_options_events, context); @@ -1125,8 +1119,8 @@ void CameraServiceImplTest::checkSendsPossibleSettingOptions( } context->TryCancel(); - std::vector arbitrary_possible_setting_options; - std::vector options; + std::vector arbitrary_possible_setting_options; + std::vector options; options.push_back(createOption(ARBITRARY_OPTION_ID, ARBITRARY_OPTION_DESCRIPTION)); arbitrary_possible_setting_options.push_back( createSettingOptions(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, options)); @@ -1147,21 +1141,21 @@ void CameraServiceImplTest::checkSendsPossibleSettingOptions( TEST_F(CameraServiceImplTest, sendsMultiplePossibleSettingOptionss) { - std::vector> possible_setting_options_events; + std::vector> possible_setting_options_events; - std::vector possible_setting_options; + std::vector possible_setting_options; - std::vector options1; + std::vector options1; options1.push_back(createOption("option1_1", "Option One One")); options1.push_back(createOption("option1_2", "Option One Two")); options1.push_back(createOption("option1_3", "Option One Three")); possible_setting_options.push_back(createSettingOptions("setting1", "Setting one", options1)); - std::vector options2; + std::vector options2; options2.push_back(createOption("option1", "Option One")); options2.push_back(createOption("option2", "Option One")); possible_setting_options.push_back(createSettingOptions("setting2", "Setting two", options2)); - std::vector options3; + std::vector options3; options3.push_back(createOption("option1", "Option One")); options3.push_back(createOption("option2", "Option Two")); options3.push_back(createOption("option3", "Option Three")); @@ -1176,14 +1170,14 @@ TEST_F(CameraServiceImplTest, sendsMultiplePossibleSettingOptionss) TEST_P(CameraServiceImplTest, setSettingResultIsTranslatedCorrectly) { - dronecode_sdk::Camera::result_callback_t result_callback; - dronecode_sdk::rpc::camera::SetSettingRequest request; + mavsdk::Camera::result_callback_t result_callback; + mavsdk::rpc::camera::SetSettingRequest request; request.set_allocated_setting(createRPCSetting("arbitrary_setting_id", "arbitrary_setting_description", "arbitrary_option_id", "arbitrary_option_description") .release()); - auto response = std::make_shared(); + auto response = std::make_shared(); auto handle = setSettingAndSaveParams(request, response, result_callback); result_callback(GetParam().second); @@ -1192,9 +1186,9 @@ TEST_P(CameraServiceImplTest, setSettingResultIsTranslatedCorrectly) } std::future CameraServiceImplTest::setSettingAndSaveParams( - const dronecode_sdk::rpc::camera::SetSettingRequest &request, - std::shared_ptr response, - dronecode_sdk::Camera::result_callback_t &result_callback) + const mavsdk::rpc::camera::SetSettingRequest &request, + std::shared_ptr response, + mavsdk::Camera::result_callback_t &result_callback) { EXPECT_CALL(_camera, set_option_async(_, _, _)) .WillOnce(SaveResult(&result_callback, &_callback_saved_promise)); @@ -1207,19 +1201,17 @@ std::future CameraServiceImplTest::setSettingAndSaveParams( return handle; } -std::unique_ptr +std::unique_ptr CameraServiceImplTest::createRPCSetting(const std::string &setting_id, const std::string &setting_description, const std::string &option_id, const std::string &option_description) { - auto setting = std::unique_ptr( - new dronecode_sdk::rpc::camera::Setting); + auto setting = std::unique_ptr(new mavsdk::rpc::camera::Setting); setting->set_setting_id(setting_id); setting->set_setting_description(setting_description); - auto option = - std::unique_ptr(new dronecode_sdk::rpc::camera::Option); + auto option = std::unique_ptr(new mavsdk::rpc::camera::Option); option->set_option_id(option_id); option->set_option_description(option_description); setting->set_allocated_option(option.release()); @@ -1229,32 +1221,32 @@ CameraServiceImplTest::createRPCSetting(const std::string &setting_id, TEST_F(CameraServiceImplTest, setSettingInProgressResultIsIgnored) { - dronecode_sdk::Camera::result_callback_t result_callback; - dronecode_sdk::rpc::camera::SetSettingRequest request; + mavsdk::Camera::result_callback_t result_callback; + mavsdk::rpc::camera::SetSettingRequest request; request.set_allocated_setting(createRPCSetting("arbitrary_setting_id", "arbitrary_setting_description", "arbitrary_option_id", "arbitrary_option_description") .release()); - auto response = std::make_shared(); + auto response = std::make_shared(); auto handle = setSettingAndSaveParams(request, response, result_callback); - result_callback(dronecode_sdk::Camera::Result::IN_PROGRESS); - result_callback(dronecode_sdk::Camera::Result::SUCCESS); + result_callback(mavsdk::Camera::Result::IN_PROGRESS); + result_callback(mavsdk::Camera::Result::SUCCESS); EXPECT_EQ("SUCCESS", CameraResult::Result_Name(response->camera_result().result())); } TEST_F(CameraServiceImplTest, setsSettingEvenWhenContextAndResponseAreNull) { - dronecode_sdk::Camera::result_callback_t result_callback; - dronecode_sdk::rpc::camera::SetSettingRequest request; + mavsdk::Camera::result_callback_t result_callback; + mavsdk::rpc::camera::SetSettingRequest request; request.set_allocated_setting(createRPCSetting(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, ARBITRARY_OPTION_ID, ARBITRARY_OPTION_DESCRIPTION) .release()); - auto response = std::make_shared(); + auto response = std::make_shared(); auto handle = setSettingAndSaveParams(request, nullptr, result_callback); result_callback(ARBITRARY_CAMERA_RESULT); @@ -1262,14 +1254,14 @@ TEST_F(CameraServiceImplTest, setsSettingEvenWhenContextAndResponseAreNull) TEST_F(CameraServiceImplTest, setsSettingWithRightParameter) { - dronecode_sdk::Camera::result_callback_t result_callback; - dronecode_sdk::rpc::camera::SetSettingRequest request; + mavsdk::Camera::result_callback_t result_callback; + mavsdk::rpc::camera::SetSettingRequest request; request.set_allocated_setting(createRPCSetting(ARBITRARY_SETTING_ID, ARBITRARY_SETTING_DESCRIPTION, ARBITRARY_OPTION_ID, ARBITRARY_OPTION_DESCRIPTION) .release()); - dronecode_sdk::Camera::Option option; + mavsdk::Camera::Option option; option.option_id = ARBITRARY_OPTION_ID; EXPECT_CALL(_camera, set_option_async(_, ARBITRARY_SETTING_ID, option)) @@ -1285,7 +1277,7 @@ TEST_F(CameraServiceImplTest, setsSettingWithRightParameter) TEST_F(CameraServiceImplTest, setSettingReturnsWrongArgumentErrorIfRequestIsNull) { - dronecode_sdk::rpc::camera::SetSettingResponse response; + mavsdk::rpc::camera::SetSettingResponse response; _camera_service.SetSetting(nullptr, nullptr, &response); @@ -1304,14 +1296,13 @@ INSTANTIATE_TEST_CASE_P(CameraResultCorrespondences, std::vector generateInputPairs() { std::vector input_pairs; - input_pairs.push_back(std::make_pair("SUCCESS", dronecode_sdk::Camera::Result::SUCCESS)); - input_pairs.push_back(std::make_pair("BUSY", dronecode_sdk::Camera::Result::BUSY)); - input_pairs.push_back(std::make_pair("DENIED", dronecode_sdk::Camera::Result::DENIED)); - input_pairs.push_back(std::make_pair("ERROR", dronecode_sdk::Camera::Result::ERROR)); - input_pairs.push_back(std::make_pair("TIMEOUT", dronecode_sdk::Camera::Result::TIMEOUT)); - input_pairs.push_back( - std::make_pair("WRONG_ARGUMENT", dronecode_sdk::Camera::Result::WRONG_ARGUMENT)); - input_pairs.push_back(std::make_pair("UNKNOWN", dronecode_sdk::Camera::Result::UNKNOWN)); + input_pairs.push_back(std::make_pair("SUCCESS", mavsdk::Camera::Result::SUCCESS)); + input_pairs.push_back(std::make_pair("BUSY", mavsdk::Camera::Result::BUSY)); + input_pairs.push_back(std::make_pair("DENIED", mavsdk::Camera::Result::DENIED)); + input_pairs.push_back(std::make_pair("ERROR", mavsdk::Camera::Result::ERROR)); + input_pairs.push_back(std::make_pair("TIMEOUT", mavsdk::Camera::Result::TIMEOUT)); + input_pairs.push_back(std::make_pair("WRONG_ARGUMENT", mavsdk::Camera::Result::WRONG_ARGUMENT)); + input_pairs.push_back(std::make_pair("UNKNOWN", mavsdk::Camera::Result::UNKNOWN)); return input_pairs; } diff --git a/src/backend/test/connection_initiator_test.cpp b/src/backend/test/connection_initiator_test.cpp index 8c3bd63c8e..9f11a75a70 100644 --- a/src/backend/test/connection_initiator_test.cpp +++ b/src/backend/test/connection_initiator_test.cpp @@ -9,9 +9,9 @@ namespace { using testing::_; using testing::NiceMock; -using event_callback_t = dronecode_sdk::testing::event_callback_t; -using MockDronecodeSDK = NiceMock; -using ConnectionInitiator = dronecode_sdk::backend::ConnectionInitiator; +using event_callback_t = mavsdk::testing::event_callback_t; +using MockDronecodeSDK = NiceMock; +using ConnectionInitiator = mavsdk::backend::ConnectionInitiator; static constexpr auto ARBITRARY_CONNECTION_URL = "udp://1291"; static constexpr auto ARBITRARY_UUID = 1492; diff --git a/src/backend/test/core_service_impl_test.cpp b/src/backend/test/core_service_impl_test.cpp index 14f29c490b..d84316fd09 100644 --- a/src/backend/test/core_service_impl_test.cpp +++ b/src/backend/test/core_service_impl_test.cpp @@ -14,11 +14,11 @@ namespace { using testing::_; using testing::NiceMock; -using MockDronecodeSDK = NiceMock; -using CoreServiceImpl = dronecode_sdk::backend::CoreServiceImpl; -using CoreService = dronecode_sdk::rpc::core::CoreService; +using MockDronecodeSDK = NiceMock; +using CoreServiceImpl = mavsdk::backend::CoreServiceImpl; +using CoreService = mavsdk::rpc::core::CoreService; -using ConnectionStateResponse = dronecode_sdk::rpc::core::ConnectionStateResponse; +using ConnectionStateResponse = mavsdk::rpc::core::ConnectionStateResponse; static constexpr auto DEFAULT_BACKEND_PORT = 50051; static constexpr auto DEFAULT_BACKEND_ADDRESS = "localhost"; @@ -63,7 +63,7 @@ TEST_F(CoreServiceImplTest, actionPluginIsRunning) void CoreServiceImplTest::checkPluginIsRunning(const std::string plugin_name) { - dronecode_sdk::rpc::core::ListRunningPluginsResponse response; + mavsdk::rpc::core::ListRunningPluginsResponse response; _core_service->ListRunningPlugins(nullptr, nullptr, &response); @@ -89,7 +89,7 @@ TEST_F(CoreServiceImplTest, telemetryPluginIsRunning) TEST_F(CoreServiceImplTest, addressIsLocalhostInPluginInfos) { - dronecode_sdk::rpc::core::ListRunningPluginsResponse response; + mavsdk::rpc::core::ListRunningPluginsResponse response; _core_service->ListRunningPlugins(nullptr, nullptr, &response); @@ -100,7 +100,7 @@ TEST_F(CoreServiceImplTest, addressIsLocalhostInPluginInfos) TEST_F(CoreServiceImplTest, portIsDefaultInPluginInfos) { - dronecode_sdk::rpc::core::ListRunningPluginsResponse response; + mavsdk::rpc::core::ListRunningPluginsResponse response; _core_service->ListRunningPlugins(nullptr, nullptr, &response); @@ -113,7 +113,7 @@ TEST_F(CoreServiceImplTest, subscribeConnectionStateSubscribesToDiscover) { EXPECT_CALL(*_dc, register_on_discover(_)).Times(1); grpc::ClientContext context; - dronecode_sdk::rpc::core::SubscribeConnectionStateRequest request; + mavsdk::rpc::core::SubscribeConnectionStateRequest request; _stub->SubscribeConnectionState(&context, request); _core_service->stop(); @@ -123,7 +123,7 @@ TEST_F(CoreServiceImplTest, subscribeConnectionStateSubscribesToTimeout) { EXPECT_CALL(*_dc, register_on_timeout(_)).Times(1); grpc::ClientContext context; - dronecode_sdk::rpc::core::SubscribeConnectionStateRequest request; + mavsdk::rpc::core::SubscribeConnectionStateRequest request; _stub->SubscribeConnectionState(&context, request); _core_service->stop(); @@ -145,10 +145,10 @@ CoreServiceImplTest::subscribeConnectionStateAsync(std::vectorSubscribeConnectionState(&context, request); - dronecode_sdk::rpc::core::ConnectionStateResponse response; + mavsdk::rpc::core::ConnectionStateResponse response; while (response_reader->Read(&response)) { events.push_back(std::make_pair(response.connection_state().uuid(), response.connection_state().is_connected())); @@ -162,7 +162,7 @@ TEST_F(CoreServiceImplTest, connectionStatesSendsOneEvents) const bool expected_connection_state = true; std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::testing::event_callback_t event_callback; + mavsdk::testing::event_callback_t event_callback; EXPECT_CALL(*_dc, register_on_discover(_)) .WillOnce(SaveCallback(&event_callback, &subscription_promise)); @@ -189,11 +189,11 @@ TEST_F(CoreServiceImplTest, connectionStateSendsMultipleEvents) std::promise timeout_subscription_promise; auto timeout_subscription_future = timeout_subscription_promise.get_future(); - dronecode_sdk::testing::event_callback_t discover_callback; + mavsdk::testing::event_callback_t discover_callback; EXPECT_CALL(*_dc, register_on_discover(_)) .WillOnce(SaveCallback(&discover_callback, &discover_subscription_promise)); - dronecode_sdk::testing::event_callback_t timeout_callback; + mavsdk::testing::event_callback_t timeout_callback; EXPECT_CALL(*_dc, register_on_timeout(_)) .WillOnce(SaveCallback(&timeout_callback, &timeout_subscription_promise)); diff --git a/src/backend/test/info_service_impl_test.cpp b/src/backend/test/info_service_impl_test.cpp index 01c93b423a..5a35aa0322 100644 --- a/src/backend/test/info_service_impl_test.cpp +++ b/src/backend/test/info_service_impl_test.cpp @@ -12,11 +12,11 @@ using testing::_; using testing::NiceMock; using testing::Return; -using MockInfo = NiceMock; -using InfoServiceImpl = dronecode_sdk::backend::InfoServiceImpl; +using MockInfo = NiceMock; +using InfoServiceImpl = mavsdk::backend::InfoServiceImpl; -using InfoResult = dronecode_sdk::rpc::info::InfoResult; -using InputPair = std::pair; +using InfoResult = mavsdk::rpc::info::InfoResult; +using InputPair = std::pair; static constexpr int ARBITRARY_SW_VERSION_MAJOR = 1; static constexpr int ARBITRARY_SW_VERSION_MINOR = 2; @@ -39,7 +39,7 @@ TEST_F(InfoServiceImplTest, getVersionCallsGetter) MockInfo info; InfoServiceImpl infoService(info); EXPECT_CALL(info, get_version()).Times(1); - dronecode_sdk::rpc::info::GetVersionResponse response; + mavsdk::rpc::info::GetVersionResponse response; infoService.GetVersion(nullptr, nullptr, &response); } @@ -49,7 +49,7 @@ TEST_P(InfoServiceImplTest, getsCorrectVersion) MockInfo info; InfoServiceImpl infoService(info); - dronecode_sdk::Info::Version arbitrary_version; + mavsdk::Info::Version arbitrary_version; arbitrary_version.flight_sw_major = ARBITRARY_SW_VERSION_MAJOR; arbitrary_version.flight_sw_minor = ARBITRARY_SW_VERSION_MINOR; @@ -63,7 +63,7 @@ TEST_P(InfoServiceImplTest, getsCorrectVersion) const auto expected_pair = std::make_pair<>(GetParam().second, arbitrary_version); ON_CALL(info, get_version()).WillByDefault(Return(expected_pair)); - dronecode_sdk::rpc::info::GetVersionResponse response; + mavsdk::rpc::info::GetVersionResponse response; infoService.GetVersion(nullptr, nullptr, &response); @@ -97,10 +97,10 @@ INSTANTIATE_TEST_CASE_P(InfoResultCorrespondences, std::vector generateInputPairs() { std::vector input_pairs; - input_pairs.push_back(std::make_pair("SUCCESS", dronecode_sdk::Info::Result::SUCCESS)); - input_pairs.push_back(std::make_pair( - "INFORMATION_NOT_RECEIVED_YET", dronecode_sdk::Info::Result::INFORMATION_NOT_RECEIVED_YET)); - input_pairs.push_back(std::make_pair("UNKNOWN", dronecode_sdk::Info::Result::UNKNOWN)); + input_pairs.push_back(std::make_pair("SUCCESS", mavsdk::Info::Result::SUCCESS)); + input_pairs.push_back(std::make_pair("INFORMATION_NOT_RECEIVED_YET", + mavsdk::Info::Result::INFORMATION_NOT_RECEIVED_YET)); + input_pairs.push_back(std::make_pair("UNKNOWN", mavsdk::Info::Result::UNKNOWN)); return input_pairs; } diff --git a/src/backend/test/mission_service_impl_test.cpp b/src/backend/test/mission_service_impl_test.cpp index 778c16632e..60f4c528af 100644 --- a/src/backend/test/mission_service_impl_test.cpp +++ b/src/backend/test/mission_service_impl_test.cpp @@ -14,7 +14,7 @@ namespace { namespace dc = dronecode_sdk; -namespace rpc = dronecode_sdk::rpc::mission; +namespace rpc = mavsdk::rpc::mission; using testing::_; using testing::DoDefault; @@ -297,7 +297,7 @@ ACTION_P2(SaveResult, callback, callback_saved_promise) TEST_F(MissionServiceImplDownloadTest, doesNotFailWhenArgsAreNull) { auto download_handle = downloadMissionAndSaveParams(nullptr); - std::vector> arbitrary_mission; + std::vector> arbitrary_mission; _download_callback(ARBITRARY_RESULT, arbitrary_mission); } @@ -321,7 +321,7 @@ TEST_P(MissionServiceImplDownloadTest, downloadResultIsTranslatedCorrectly) auto response = std::make_shared(); std::vector> mission_items; auto download_handle = downloadMissionAndSaveParams(response); - std::vector> arbitrary_mission; + std::vector> arbitrary_mission; _download_callback(GetParam().second, arbitrary_mission); download_handle.wait(); @@ -408,7 +408,7 @@ class MissionServiceImplIsFinishedTest : public MissionServiceImplTestBase { TEST_F(MissionServiceImplIsFinishedTest, isMissionFinishedCallsGetter) { EXPECT_CALL(_mission, mission_finished()).Times(1); - dronecode_sdk::rpc::mission::IsMissionFinishedResponse response; + mavsdk::rpc::mission::IsMissionFinishedResponse response; _mission_service.IsMissionFinished(nullptr, nullptr, &response); } @@ -423,7 +423,7 @@ void MissionServiceImplIsFinishedTest::checkReturnsCorrectFinishedStatus( const bool expected_finished_status) { ON_CALL(_mission, mission_finished()).WillByDefault(Return(expected_finished_status)); - dronecode_sdk::rpc::mission::IsMissionFinishedResponse response; + mavsdk::rpc::mission::IsMissionFinishedResponse response; _mission_service.IsMissionFinished(nullptr, nullptr, &response); @@ -498,7 +498,7 @@ TEST_F(MissionServiceImplSetCurrentTest, setCurrentItemSetsRightValue) const int expected_item_index = ARBITRARY_INDEX; EXPECT_CALL(_mission, set_current_mission_item_async(expected_item_index, _)) .WillOnce(SaveSetItemCallback(&_result_callback, &_callback_saved_promise)); - dronecode_sdk::rpc::mission::SetCurrentMissionItemIndexRequest request; + mavsdk::rpc::mission::SetCurrentMissionItemIndexRequest request; request.set_index(expected_item_index); auto set_current_item_handle = std::async(std::launch::async, [this, &request]() { @@ -506,14 +506,14 @@ TEST_F(MissionServiceImplSetCurrentTest, setCurrentItemSetsRightValue) }); _callback_saved_future.wait(); - _result_callback(dronecode_sdk::Mission::Result::SUCCESS); + _result_callback(mavsdk::Mission::Result::SUCCESS); set_current_item_handle.wait(); } TEST_P(MissionServiceImplSetCurrentTest, setCurrentItemResultIsTranslatedCorrectly) { - dronecode_sdk::rpc::mission::SetCurrentMissionItemIndexResponse response; - dronecode_sdk::rpc::mission::SetCurrentMissionItemIndexRequest request; + mavsdk::rpc::mission::SetCurrentMissionItemIndexResponse response; + mavsdk::rpc::mission::SetCurrentMissionItemIndexRequest request; request.set_index(ARBITRARY_INDEX); EXPECT_CALL(_mission, set_current_mission_item_async(_, _)) .WillOnce(SaveSetItemCallback(&_result_callback, &_callback_saved_promise)); @@ -575,10 +575,10 @@ std::future MissionServiceImplProgressTest::subscribeMissionProgressAsync( std::shared_ptr context) const { return std::async(std::launch::async, [&]() { - dronecode_sdk::rpc::mission::SubscribeMissionProgressRequest request; + mavsdk::rpc::mission::SubscribeMissionProgressRequest request; auto response_reader = _stub->SubscribeMissionProgress(context.get(), request); - dronecode_sdk::rpc::mission::MissionProgressResponse response; + mavsdk::rpc::mission::MissionProgressResponse response; while (response_reader->Read(&response)) { auto progress_event = std::make_pair(response.mission_progress().current_item_index(), response.mission_progress().mission_count()); @@ -639,7 +639,7 @@ TEST_F(MissionServiceImplGetRTLAfterMissionTest, getRTLAfterMissionReturnsCorrec void MissionServiceImplGetRTLAfterMissionTest::checkGetRTLAfterMissionReturns( const bool expected_value) { - dronecode_sdk::rpc::mission::GetReturnToLaunchAfterMissionResponse response; + mavsdk::rpc::mission::GetReturnToLaunchAfterMissionResponse response; ON_CALL(_mission, get_return_to_launch_after_mission()).WillByDefault(Return(expected_value)); _mission_service.GetReturnToLaunchAfterMission(nullptr, nullptr, &response); @@ -666,7 +666,7 @@ void MissionServiceImplSetRTLAfterMissionTest::checkSetRTLAfterMissionSets( const bool expected_value) { EXPECT_CALL(_mission, set_return_to_launch_after_mission(expected_value)); - dronecode_sdk::rpc::mission::SetReturnToLaunchAfterMissionRequest request; + mavsdk::rpc::mission::SetReturnToLaunchAfterMissionRequest request; request.set_enable(expected_value); _mission_service.SetReturnToLaunchAfterMission(nullptr, &request, nullptr); diff --git a/src/backend/test/offboard_service_impl_test.cpp b/src/backend/test/offboard_service_impl_test.cpp index 9bc13ac038..ba1590f2db 100644 --- a/src/backend/test/offboard_service_impl_test.cpp +++ b/src/backend/test/offboard_service_impl_test.cpp @@ -11,10 +11,10 @@ using testing::_; using testing::NiceMock; using testing::Return; -using MockOffboard = NiceMock; -using OffboardServiceImpl = dronecode_sdk::backend::OffboardServiceImpl; -using OffboardResult = dronecode_sdk::rpc::offboard::OffboardResult; -using InputPair = std::pair; +using MockOffboard = NiceMock; +using OffboardServiceImpl = mavsdk::backend::OffboardServiceImpl; +using OffboardResult = mavsdk::rpc::offboard::OffboardResult; +using InputPair = std::pair; static constexpr float ARBITRARY_ROLL = 25.0f; static constexpr float ARBITRARY_PITCH = 40.0f; @@ -33,22 +33,19 @@ static constexpr float ARBITRARY_VELOCITY_NEG = -0.5f; static constexpr float ARBITRARY_YAWSPEED = 3.1f; std::vector generateInputPairs(); -std::string startAndGetTranslatedResult(dronecode_sdk::Offboard::Result start_result); -std::string stopAndGetTranslatedResult(dronecode_sdk::Offboard::Result stop_result); +std::string startAndGetTranslatedResult(mavsdk::Offboard::Result start_result); +std::string stopAndGetTranslatedResult(mavsdk::Offboard::Result stop_result); class OffboardServiceImplTest : public ::testing::TestWithParam { protected: void checkReturnsCorrectIsActiveStatus(const bool expected_is_active_status); - std::unique_ptr createArbitraryRPCAttitude() const; - std::unique_ptr - createArbitraryRPCAttitudeRate() const; - std::unique_ptr - createArbitraryRPCPositionNEDYaw() const; - std::unique_ptr + std::unique_ptr createArbitraryRPCAttitude() const; + std::unique_ptr createArbitraryRPCAttitudeRate() const; + std::unique_ptr createArbitraryRPCPositionNEDYaw() const; + std::unique_ptr createArbitraryRPCVelocityBodyYawspeed() const; - std::unique_ptr - createArbitraryRPCVelocityNedYaw() const; + std::unique_ptr createArbitraryRPCVelocityNedYaw() const; }; TEST_P(OffboardServiceImplTest, startResultIsTranslatedCorrectly) @@ -57,12 +54,12 @@ TEST_P(OffboardServiceImplTest, startResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string startAndGetTranslatedResult(const dronecode_sdk::Offboard::Result start_result) +std::string startAndGetTranslatedResult(const mavsdk::Offboard::Result start_result) { MockOffboard offboard; ON_CALL(offboard, start()).WillByDefault(Return(start_result)); OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::StartResponse response; + mavsdk::rpc::offboard::StartResponse response; offboardService.Start(nullptr, nullptr, &response); @@ -84,12 +81,12 @@ TEST_P(OffboardServiceImplTest, stopResultIsTranslatedCorrectly) EXPECT_EQ(rpc_result, GetParam().first); } -std::string stopAndGetTranslatedResult(const dronecode_sdk::Offboard::Result stop_result) +std::string stopAndGetTranslatedResult(const mavsdk::Offboard::Result stop_result) { MockOffboard offboard; ON_CALL(offboard, stop()).WillByDefault(Return(stop_result)); OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::StopResponse response; + mavsdk::rpc::offboard::StopResponse response; offboardService.Stop(nullptr, nullptr, &response); @@ -110,7 +107,7 @@ TEST_F(OffboardServiceImplTest, isActiveCallsGetter) MockOffboard offboard; OffboardServiceImpl offboardService(offboard); EXPECT_CALL(offboard, is_active()).Times(1); - dronecode_sdk::rpc::offboard::IsActiveResponse response; + mavsdk::rpc::offboard::IsActiveResponse response; offboardService.IsActive(nullptr, nullptr, &response); } @@ -127,7 +124,7 @@ void OffboardServiceImplTest::checkReturnsCorrectIsActiveStatus( MockOffboard offboard; OffboardServiceImpl offboardService(offboard); ON_CALL(offboard, is_active()).WillByDefault(Return(expected_is_active_status)); - dronecode_sdk::rpc::offboard::IsActiveResponse response; + mavsdk::rpc::offboard::IsActiveResponse response; offboardService.IsActive(nullptr, nullptr, &response); @@ -162,7 +159,7 @@ TEST_F(OffboardServiceImplTest, setAttitudeDoesNotFailWithNullResponse) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetAttitudeRequest request; + mavsdk::rpc::offboard::SetAttitudeRequest request; auto rpc_attitude = createArbitraryRPCAttitude(); request.set_allocated_attitude(rpc_attitude.release()); @@ -174,7 +171,7 @@ TEST_F(OffboardServiceImplTest, setAttitudeRateDoesNotFailWithNullResponse) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetAttitudeRateRequest request; + mavsdk::rpc::offboard::SetAttitudeRateRequest request; auto rpc_attitude_rate = createArbitraryRPCAttitudeRate(); request.set_allocated_attitude_rate(rpc_attitude_rate.release()); @@ -182,11 +179,11 @@ TEST_F(OffboardServiceImplTest, setAttitudeRateDoesNotFailWithNullResponse) offboardService.SetAttitudeRate(nullptr, &request, nullptr); } -std::unique_ptr +std::unique_ptr OffboardServiceImplTest::createArbitraryRPCAttitude() const { - auto rpc_attitude = std::unique_ptr( - new dronecode_sdk::rpc::offboard::Attitude()); + auto rpc_attitude = + std::unique_ptr(new mavsdk::rpc::offboard::Attitude()); rpc_attitude->set_roll_deg(ARBITRARY_ROLL); rpc_attitude->set_pitch_deg(ARBITRARY_PITCH); rpc_attitude->set_yaw_deg(ARBITRARY_YAW); @@ -194,11 +191,11 @@ OffboardServiceImplTest::createArbitraryRPCAttitude() const return rpc_attitude; } -std::unique_ptr +std::unique_ptr OffboardServiceImplTest::createArbitraryRPCAttitudeRate() const { - auto rpc_attitude_rate = std::unique_ptr( - new dronecode_sdk::rpc::offboard::AttitudeRate()); + auto rpc_attitude_rate = std::unique_ptr( + new mavsdk::rpc::offboard::AttitudeRate()); rpc_attitude_rate->set_roll_deg_s(ARBITRARY_ROLL_RATE); rpc_attitude_rate->set_pitch_deg_s(ARBITRARY_PITCH_RATE); rpc_attitude_rate->set_yaw_deg_s(ARBITRARY_YAW_RATE); @@ -211,7 +208,7 @@ TEST_F(OffboardServiceImplTest, setsAttitudeCorrectly) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetAttitudeRequest request; + mavsdk::rpc::offboard::SetAttitudeRequest request; auto rpc_attitude = createArbitraryRPCAttitude(); const auto expected_attitude = OffboardServiceImpl::translateRPCAttitude(*rpc_attitude); @@ -226,7 +223,7 @@ TEST_F(OffboardServiceImplTest, setsAttitudeRateCorrectly) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetAttitudeRateRequest request; + mavsdk::rpc::offboard::SetAttitudeRateRequest request; auto rpc_attitude_rate = createArbitraryRPCAttitudeRate(); const auto expected_attitude_rate = @@ -250,7 +247,7 @@ TEST_F(OffboardServiceImplTest, setPositionNEDYawDoesNotFailWithNullResponse) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetPositionNedRequest request; + mavsdk::rpc::offboard::SetPositionNedRequest request; auto rpc_position_ned_yaw = createArbitraryRPCPositionNEDYaw(); request.set_allocated_position_ned_yaw(rpc_position_ned_yaw.release()); @@ -258,11 +255,11 @@ TEST_F(OffboardServiceImplTest, setPositionNEDYawDoesNotFailWithNullResponse) offboardService.SetPositionNed(nullptr, &request, nullptr); } -std::unique_ptr +std::unique_ptr OffboardServiceImplTest::createArbitraryRPCPositionNEDYaw() const { - auto rpc_position_ned_yaw = std::unique_ptr( - new dronecode_sdk::rpc::offboard::PositionNEDYaw()); + auto rpc_position_ned_yaw = std::unique_ptr( + new mavsdk::rpc::offboard::PositionNEDYaw()); rpc_position_ned_yaw->set_north_m(ARBITRARY_NORTH_M); rpc_position_ned_yaw->set_east_m(ARBITRARY_EAST_M); rpc_position_ned_yaw->set_down_m(ARBITRARY_DOWN_M); @@ -275,7 +272,7 @@ TEST_F(OffboardServiceImplTest, setsPositionNEDYawCorrectly) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetPositionNedRequest request; + mavsdk::rpc::offboard::SetPositionNedRequest request; auto rpc_position_ned_yaw = createArbitraryRPCPositionNEDYaw(); const auto expected_position_ned_yaw = @@ -299,7 +296,7 @@ TEST_F(OffboardServiceImplTest, setVelocityBodyDoesNotFailWithNullResponse) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetVelocityBodyRequest request; + mavsdk::rpc::offboard::SetVelocityBodyRequest request; auto rpc_velocity_body = createArbitraryRPCVelocityBodyYawspeed(); request.set_allocated_velocity_body_yawspeed(rpc_velocity_body.release()); @@ -307,11 +304,11 @@ TEST_F(OffboardServiceImplTest, setVelocityBodyDoesNotFailWithNullResponse) offboardService.SetVelocityBody(nullptr, &request, nullptr); } -std::unique_ptr +std::unique_ptr OffboardServiceImplTest::createArbitraryRPCVelocityBodyYawspeed() const { - auto rpc_velocity_body = std::unique_ptr( - new dronecode_sdk::rpc::offboard::VelocityBodyYawspeed()); + auto rpc_velocity_body = std::unique_ptr( + new mavsdk::rpc::offboard::VelocityBodyYawspeed()); rpc_velocity_body->set_forward_m_s(ARBITRARY_VELOCITY_HIGH); rpc_velocity_body->set_right_m_s(ARBITRARY_VELOCITY_LOW); rpc_velocity_body->set_down_m_s(ARBITRARY_VELOCITY_NEG); @@ -324,7 +321,7 @@ TEST_F(OffboardServiceImplTest, setsVelocityBodyCorrectly) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetVelocityBodyRequest request; + mavsdk::rpc::offboard::SetVelocityBodyRequest request; auto rpc_velocity_body = createArbitraryRPCVelocityBodyYawspeed(); const auto expected_velocity_body = @@ -348,7 +345,7 @@ TEST_F(OffboardServiceImplTest, setVelocityNedDoesNotFailWithNullResponse) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetVelocityNedRequest request; + mavsdk::rpc::offboard::SetVelocityNedRequest request; auto rpc_velocity_ned = createArbitraryRPCVelocityNedYaw(); request.set_allocated_velocity_ned_yaw(rpc_velocity_ned.release()); @@ -356,11 +353,11 @@ TEST_F(OffboardServiceImplTest, setVelocityNedDoesNotFailWithNullResponse) offboardService.SetVelocityNed(nullptr, &request, nullptr); } -std::unique_ptr +std::unique_ptr OffboardServiceImplTest::createArbitraryRPCVelocityNedYaw() const { - auto rpc_velocity_ned = std::unique_ptr( - new dronecode_sdk::rpc::offboard::VelocityNEDYaw()); + auto rpc_velocity_ned = std::unique_ptr( + new mavsdk::rpc::offboard::VelocityNEDYaw()); rpc_velocity_ned->set_north_m_s(ARBITRARY_VELOCITY_MID); rpc_velocity_ned->set_east_m_s(ARBITRARY_VELOCITY_LOW); rpc_velocity_ned->set_down_m_s(ARBITRARY_VELOCITY_NEG); @@ -373,7 +370,7 @@ TEST_F(OffboardServiceImplTest, setsVelocityNedCorrectly) { MockOffboard offboard; OffboardServiceImpl offboardService(offboard); - dronecode_sdk::rpc::offboard::SetVelocityNedRequest request; + mavsdk::rpc::offboard::SetVelocityNedRequest request; auto rpc_velocity_ned = createArbitraryRPCVelocityNedYaw(); const auto expected_velocity_ned = @@ -392,17 +389,17 @@ INSTANTIATE_TEST_CASE_P(OffboardResultCorrespondences, std::vector generateInputPairs() { std::vector input_pairs; - input_pairs.push_back(std::make_pair("SUCCESS", dronecode_sdk::Offboard::Result::SUCCESS)); - input_pairs.push_back(std::make_pair("NO_SYSTEM", dronecode_sdk::Offboard::Result::NO_SYSTEM)); + input_pairs.push_back(std::make_pair("SUCCESS", mavsdk::Offboard::Result::SUCCESS)); + input_pairs.push_back(std::make_pair("NO_SYSTEM", mavsdk::Offboard::Result::NO_SYSTEM)); input_pairs.push_back( - std::make_pair("CONNECTION_ERROR", dronecode_sdk::Offboard::Result::CONNECTION_ERROR)); - input_pairs.push_back(std::make_pair("BUSY", dronecode_sdk::Offboard::Result::BUSY)); + std::make_pair("CONNECTION_ERROR", mavsdk::Offboard::Result::CONNECTION_ERROR)); + input_pairs.push_back(std::make_pair("BUSY", mavsdk::Offboard::Result::BUSY)); input_pairs.push_back( - std::make_pair("COMMAND_DENIED", dronecode_sdk::Offboard::Result::COMMAND_DENIED)); - input_pairs.push_back(std::make_pair("TIMEOUT", dronecode_sdk::Offboard::Result::TIMEOUT)); + std::make_pair("COMMAND_DENIED", mavsdk::Offboard::Result::COMMAND_DENIED)); + input_pairs.push_back(std::make_pair("TIMEOUT", mavsdk::Offboard::Result::TIMEOUT)); input_pairs.push_back( - std::make_pair("NO_SETPOINT_SET", dronecode_sdk::Offboard::Result::NO_SETPOINT_SET)); - input_pairs.push_back(std::make_pair("UNKNOWN", dronecode_sdk::Offboard::Result::UNKNOWN)); + std::make_pair("NO_SETPOINT_SET", mavsdk::Offboard::Result::NO_SETPOINT_SET)); + input_pairs.push_back(std::make_pair("UNKNOWN", mavsdk::Offboard::Result::UNKNOWN)); return input_pairs; } diff --git a/src/backend/test/telemetry_service_impl_test.cpp b/src/backend/test/telemetry_service_impl_test.cpp index 7ebd4aa623..630fd7a4a4 100644 --- a/src/backend/test/telemetry_service_impl_test.cpp +++ b/src/backend/test/telemetry_service_impl_test.cpp @@ -15,31 +15,31 @@ namespace { using testing::_; using testing::NiceMock; -using MockTelemetry = NiceMock; -using TelemetryServiceImpl = dronecode_sdk::backend::TelemetryServiceImpl; -using TelemetryService = dronecode_sdk::rpc::telemetry::TelemetryService; +using MockTelemetry = NiceMock; +using TelemetryServiceImpl = mavsdk::backend::TelemetryServiceImpl; +using TelemetryService = mavsdk::rpc::telemetry::TelemetryService; -using PositionResponse = dronecode_sdk::rpc::telemetry::PositionResponse; -using Position = dronecode_sdk::Telemetry::Position; +using PositionResponse = mavsdk::rpc::telemetry::PositionResponse; +using Position = mavsdk::Telemetry::Position; -using HealthResponse = dronecode_sdk::rpc::telemetry::HealthResponse; -using Health = dronecode_sdk::Telemetry::Health; +using HealthResponse = mavsdk::rpc::telemetry::HealthResponse; +using Health = mavsdk::Telemetry::Health; -using GpsInfo = dronecode_sdk::Telemetry::GPSInfo; -using FixType = dronecode_sdk::rpc::telemetry::FixType; +using GpsInfo = mavsdk::Telemetry::GPSInfo; +using FixType = mavsdk::rpc::telemetry::FixType; -using Battery = dronecode_sdk::Telemetry::Battery; +using Battery = mavsdk::Telemetry::Battery; -using FlightMode = dronecode_sdk::Telemetry::FlightMode; -using RPCFlightMode = dronecode_sdk::rpc::telemetry::FlightMode; +using FlightMode = mavsdk::Telemetry::FlightMode; +using RPCFlightMode = mavsdk::rpc::telemetry::FlightMode; -using Quaternion = dronecode_sdk::Telemetry::Quaternion; +using Quaternion = mavsdk::Telemetry::Quaternion; -using EulerAngle = dronecode_sdk::Telemetry::EulerAngle; +using EulerAngle = mavsdk::Telemetry::EulerAngle; -using GroundSpeedNed = dronecode_sdk::Telemetry::GroundSpeedNED; +using GroundSpeedNed = mavsdk::Telemetry::GroundSpeedNED; -using RcStatus = dronecode_sdk::Telemetry::RCStatus; +using RcStatus = mavsdk::Telemetry::RCStatus; class TelemetryServiceImplTest : public ::testing::Test { protected: @@ -166,10 +166,10 @@ std::future TelemetryServiceImplTest::subscribePositionAsync(std::vector

SubscribePosition(&context, request); - dronecode_sdk::rpc::telemetry::PositionResponse response; + mavsdk::rpc::telemetry::PositionResponse response; while (response_reader->Read(&response)) { auto position_rpc = response.position(); @@ -209,7 +209,7 @@ void TelemetryServiceImplTest::checkSendsPositions(const std::vector & { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::position_callback_t position_callback; + mavsdk::Telemetry::position_callback_t position_callback; EXPECT_CALL(*_telemetry, position_async(_)) .WillOnce(SaveCallback(&position_callback, &subscription_promise)); @@ -233,7 +233,7 @@ Position TelemetryServiceImplTest::createPosition(const double lat, const float abs_alt, const float rel_alt) const { - dronecode_sdk::Telemetry::Position expected_position; + mavsdk::Telemetry::Position expected_position; expected_position.latitude_deg = lat; expected_position.longitude_deg = lng; @@ -268,10 +268,10 @@ std::future TelemetryServiceImplTest::subscribeHealthAsync(std::vectorSubscribeHealth(&context, request); - dronecode_sdk::rpc::telemetry::HealthResponse response; + mavsdk::rpc::telemetry::HealthResponse response; while (response_reader->Read(&response)) { auto health_rpc = response.health(); @@ -322,7 +322,7 @@ void TelemetryServiceImplTest::checkSendsHealths(const std::vector &heal { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::health_callback_t health_callback; + mavsdk::Telemetry::health_callback_t health_callback; EXPECT_CALL(*_telemetry, health_async(_)) .WillOnce(SaveCallback(&health_callback, &subscription_promise)); @@ -343,7 +343,7 @@ void TelemetryServiceImplTest::checkSendsHealths(const std::vector &heal Health TelemetryServiceImplTest::createRandomHealth() { - dronecode_sdk::Telemetry::Health health; + mavsdk::Telemetry::Health health; health.gyrometer_calibration_ok = generateRandomBool(); health.accelerometer_calibration_ok = generateRandomBool(); @@ -383,10 +383,10 @@ TelemetryServiceImplTest::subscribeHomeAsync(std::vector &home_positio { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeHomeRequest request; + mavsdk::rpc::telemetry::SubscribeHomeRequest request; auto response_reader = _stub->SubscribeHome(&context, request); - dronecode_sdk::rpc::telemetry::HomeResponse response; + mavsdk::rpc::telemetry::HomeResponse response; while (response_reader->Read(&response)) { auto home_rpc = response.home(); @@ -427,7 +427,7 @@ void TelemetryServiceImplTest::checkSendsHomePositions( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::position_callback_t home_callback; + mavsdk::Telemetry::position_callback_t home_callback; EXPECT_CALL(*_telemetry, home_position_async(_)) .WillOnce(SaveCallback(&home_callback, &subscription_promise)); @@ -473,10 +473,10 @@ TelemetryServiceImplTest::subscribeInAirAsync(std::vector &in_air_events) { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeInAirRequest request; + mavsdk::rpc::telemetry::SubscribeInAirRequest request; auto response_reader = _stub->SubscribeInAir(&context, request); - dronecode_sdk::rpc::telemetry::InAirResponse response; + mavsdk::rpc::telemetry::InAirResponse response; while (response_reader->Read(&response)) { auto is_in_air = response.is_in_air(); in_air_events.push_back(is_in_air); @@ -509,7 +509,7 @@ void TelemetryServiceImplTest::checkSendsInAirEvents(const std::vector &in { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::in_air_callback_t in_air_callback; + mavsdk::Telemetry::in_air_callback_t in_air_callback; EXPECT_CALL(*_telemetry, in_air_async(_)) .WillOnce(SaveCallback(&in_air_callback, &subscription_promise)); @@ -555,10 +555,10 @@ TelemetryServiceImplTest::subscribeArmedAsync(std::vector &armed_events) c { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeArmedRequest request; + mavsdk::rpc::telemetry::SubscribeArmedRequest request; auto response_reader = _stub->SubscribeArmed(&context, request); - dronecode_sdk::rpc::telemetry::ArmedResponse response; + mavsdk::rpc::telemetry::ArmedResponse response; while (response_reader->Read(&response)) { auto is_armed = response.is_armed(); armed_events.push_back(is_armed); @@ -591,7 +591,7 @@ void TelemetryServiceImplTest::checkSendsArmedEvents(const std::vector &ar { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::armed_callback_t armed_callback; + mavsdk::Telemetry::armed_callback_t armed_callback; EXPECT_CALL(*_telemetry, armed_async(_)) .WillOnce(SaveCallback(&armed_callback, &subscription_promise)); @@ -637,10 +637,10 @@ TelemetryServiceImplTest::subscribeGpsInfoAsync(std::vector &gps_info_e { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeGpsInfoRequest request; + mavsdk::rpc::telemetry::SubscribeGpsInfoRequest request; auto response_reader = _stub->SubscribeGpsInfo(&context, request); - dronecode_sdk::rpc::telemetry::GpsInfoResponse response; + mavsdk::rpc::telemetry::GpsInfoResponse response; while (response_reader->Read(&response)) { auto gps_info_rpc = response.gps_info(); @@ -700,7 +700,7 @@ void TelemetryServiceImplTest::checkSendsGpsInfoEvents( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::gps_info_callback_t gps_info_callback; + mavsdk::Telemetry::gps_info_callback_t gps_info_callback; EXPECT_CALL(*_telemetry, gps_info_async(_)) .WillOnce(SaveCallback(&gps_info_callback, &subscription_promise)); @@ -759,10 +759,10 @@ TelemetryServiceImplTest::subscribeBatteryAsync(std::vector &battery_ev { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeBatteryRequest request; + mavsdk::rpc::telemetry::SubscribeBatteryRequest request; auto response_reader = _stub->SubscribeBattery(&context, request); - dronecode_sdk::rpc::telemetry::BatteryResponse response; + mavsdk::rpc::telemetry::BatteryResponse response; while (response_reader->Read(&response)) { auto battery_rpc = response.battery(); @@ -811,7 +811,7 @@ void TelemetryServiceImplTest::checkSendsBatteryEvents( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::battery_callback_t battery_callback; + mavsdk::Telemetry::battery_callback_t battery_callback; EXPECT_CALL(*_telemetry, battery_async(_)) .WillOnce(SaveCallback(&battery_callback, &subscription_promise)); @@ -858,10 +858,10 @@ std::future TelemetryServiceImplTest::subscribeFlightModeAsync( { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeFlightModeRequest request; + mavsdk::rpc::telemetry::SubscribeFlightModeRequest request; auto response_reader = _stub->SubscribeFlightMode(&context, request); - dronecode_sdk::rpc::telemetry::FlightModeResponse response; + mavsdk::rpc::telemetry::FlightModeResponse response; while (response_reader->Read(&response)) { FlightMode flight_mode = translateRPCFlightMode(response.flight_mode()); flight_mode_events.push_back(flight_mode); @@ -921,7 +921,7 @@ void TelemetryServiceImplTest::checkSendsFlightModeEvents( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::flight_mode_callback_t flight_mode_callback; + mavsdk::Telemetry::flight_mode_callback_t flight_mode_callback; EXPECT_CALL(*_telemetry, flight_mode_async(_)) .WillOnce(SaveCallback(&flight_mode_callback, &subscription_promise)); @@ -972,10 +972,10 @@ std::future TelemetryServiceImplTest::subscribeAttitudeQuaternionAsync( { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeAttitudeQuaternionRequest request; + mavsdk::rpc::telemetry::SubscribeAttitudeQuaternionRequest request; auto response_reader = _stub->SubscribeAttitudeQuaternion(&context, request); - dronecode_sdk::rpc::telemetry::AttitudeQuaternionResponse response; + mavsdk::rpc::telemetry::AttitudeQuaternionResponse response; while (response_reader->Read(&response)) { auto quaternion_rpc = response.attitude_quaternion(); @@ -1016,7 +1016,7 @@ Quaternion TelemetryServiceImplTest::createQuaternion(const float w, const float y, const float z) const { - dronecode_sdk::Telemetry::Quaternion quaternion; + mavsdk::Telemetry::Quaternion quaternion; quaternion.w = w; quaternion.x = x; @@ -1031,7 +1031,7 @@ void TelemetryServiceImplTest::checkSendsAttitudeQuaternions( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::attitude_quaternion_callback_t attitude_quaternion_callback; + mavsdk::Telemetry::attitude_quaternion_callback_t attitude_quaternion_callback; EXPECT_CALL(*_telemetry, attitude_quaternion_async(_)) .WillOnce(SaveCallback(&attitude_quaternion_callback, &subscription_promise)); @@ -1076,10 +1076,10 @@ TelemetryServiceImplTest::subscribeAttitudeEulerAsync(std::vector &e { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeAttitudeEulerRequest request; + mavsdk::rpc::telemetry::SubscribeAttitudeEulerRequest request; auto response_reader = _stub->SubscribeAttitudeEuler(&context, request); - dronecode_sdk::rpc::telemetry::AttitudeEulerResponse response; + mavsdk::rpc::telemetry::AttitudeEulerResponse response; while (response_reader->Read(&response)) { auto euler_angle_rpc = response.attitude_euler(); @@ -1131,7 +1131,7 @@ void TelemetryServiceImplTest::checkSendsAttitudeEulerAngles( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::attitude_euler_angle_callback_t attitude_euler_angle_callback; + mavsdk::Telemetry::attitude_euler_angle_callback_t attitude_euler_angle_callback; EXPECT_CALL(*_telemetry, attitude_euler_angle_async(_)) .WillOnce(SaveCallback(&attitude_euler_angle_callback, &subscription_promise)); @@ -1176,10 +1176,10 @@ std::future TelemetryServiceImplTest::subscribeCameraAttitudeQuaternionAsy { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeCameraAttitudeQuaternionRequest request; + mavsdk::rpc::telemetry::SubscribeCameraAttitudeQuaternionRequest request; auto response_reader = _stub->SubscribeCameraAttitudeQuaternion(&context, request); - dronecode_sdk::rpc::telemetry::CameraAttitudeQuaternionResponse response; + mavsdk::rpc::telemetry::CameraAttitudeQuaternionResponse response; while (response_reader->Read(&response)) { auto quaternion_rpc = response.attitude_quaternion(); @@ -1220,7 +1220,7 @@ void TelemetryServiceImplTest::checkSendsCameraAttitudeQuaternions( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::attitude_quaternion_callback_t attitude_quaternion_callback; + mavsdk::Telemetry::attitude_quaternion_callback_t attitude_quaternion_callback; EXPECT_CALL(*_telemetry, camera_attitude_quaternion_async(_)) .WillOnce(SaveCallback(&attitude_quaternion_callback, &subscription_promise)); @@ -1265,10 +1265,10 @@ std::future TelemetryServiceImplTest::subscribeCameraAttitudeEulerAsync( { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeCameraAttitudeEulerRequest request; + mavsdk::rpc::telemetry::SubscribeCameraAttitudeEulerRequest request; auto response_reader = _stub->SubscribeCameraAttitudeEuler(&context, request); - dronecode_sdk::rpc::telemetry::CameraAttitudeEulerResponse response; + mavsdk::rpc::telemetry::CameraAttitudeEulerResponse response; while (response_reader->Read(&response)) { auto euler_angle_rpc = response.attitude_euler(); @@ -1308,7 +1308,7 @@ void TelemetryServiceImplTest::checkSendsCameraAttitudeEulerAngles( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::attitude_euler_angle_callback_t attitude_euler_angle_callback; + mavsdk::Telemetry::attitude_euler_angle_callback_t attitude_euler_angle_callback; EXPECT_CALL(*_telemetry, camera_attitude_euler_angle_async(_)) .WillOnce(SaveCallback(&attitude_euler_angle_callback, &subscription_promise)); @@ -1353,10 +1353,10 @@ std::future TelemetryServiceImplTest::subscribeGroundSpeedNedAsync( { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeGroundSpeedNedRequest request; + mavsdk::rpc::telemetry::SubscribeGroundSpeedNedRequest request; auto response_reader = _stub->SubscribeGroundSpeedNed(&context, request); - dronecode_sdk::rpc::telemetry::GroundSpeedNedResponse response; + mavsdk::rpc::telemetry::GroundSpeedNedResponse response; while (response_reader->Read(&response)) { auto ground_speed_rpc = response.ground_speed_ned(); @@ -1409,7 +1409,7 @@ void TelemetryServiceImplTest::checkSendsGroundSpeedEvents( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::ground_speed_ned_callback_t ground_speed_ned_callback; + mavsdk::Telemetry::ground_speed_ned_callback_t ground_speed_ned_callback; EXPECT_CALL(*_telemetry, ground_speed_ned_async(_)) .WillOnce(SaveCallback(&ground_speed_ned_callback, &subscription_promise)); @@ -1454,10 +1454,10 @@ TelemetryServiceImplTest::subscribeRcStatusAsync(std::vector &rc_statu { return std::async(std::launch::async, [&]() { grpc::ClientContext context; - dronecode_sdk::rpc::telemetry::SubscribeRcStatusRequest request; + mavsdk::rpc::telemetry::SubscribeRcStatusRequest request; auto response_reader = _stub->SubscribeRcStatus(&context, request); - dronecode_sdk::rpc::telemetry::RcStatusResponse response; + mavsdk::rpc::telemetry::RcStatusResponse response; while (response_reader->Read(&response)) { auto rc_status_rpc = response.rc_status(); @@ -1510,7 +1510,7 @@ void TelemetryServiceImplTest::checkSendsRcStatusEvents( { std::promise subscription_promise; auto subscription_future = subscription_promise.get_future(); - dronecode_sdk::Telemetry::rc_status_callback_t rc_status_callback; + mavsdk::Telemetry::rc_status_callback_t rc_status_callback; EXPECT_CALL(*_telemetry, rc_status_async(_)) .WillOnce(SaveCallback(&rc_status_callback, &subscription_promise)); diff --git a/src/core/any.h b/src/core/any.h index 27e69fca1a..45e997a605 100644 --- a/src/core/any.h +++ b/src/core/any.h @@ -96,8 +96,8 @@ struct Any { template struct Derived : Base { template Derived(U &&value_tmp) : value(std::forward(value_tmp)) {} - Derived(const dronecode_sdk::Any::Derived &) = delete; - void operator=(const dronecode_sdk::Any::Derived &) = delete; + Derived(const mavsdk::Any::Derived &) = delete; + void operator=(const mavsdk::Any::Derived &) = delete; T value; diff --git a/src/core/log.h b/src/core/log.h index 6d5c6aa7e8..03ce7fcb2a 100644 --- a/src/core/log.h +++ b/src/core/log.h @@ -112,8 +112,8 @@ class LogDetailed { #endif } - LogDetailed(const dronecode_sdk::LogDetailed &) = delete; - void operator=(const dronecode_sdk::LogDetailed &) = delete; + LogDetailed(const mavsdk::LogDetailed &) = delete; + void operator=(const mavsdk::LogDetailed &) = delete; protected: enum LogLevel { Debug, Info, Warn, Err } _log_level = LogLevel::Debug; diff --git a/src/debug_helpers/drop_debug_main.cpp b/src/debug_helpers/drop_debug_main.cpp index f9956f61ac..802baa830a 100644 --- a/src/debug_helpers/drop_debug_main.cpp +++ b/src/debug_helpers/drop_debug_main.cpp @@ -20,10 +20,10 @@ int main(int argc, const char *argv[]) UNUSED(argc); UNUSED(argv); - dronecode_sdk::DronecodeSDK dc; + mavsdk::DronecodeSDK dc; - dronecode_sdk::ConnectionResult ret = dc.add_udp_connection(); - if (ret != dronecode_sdk::ConnectionResult::SUCCESS) { + mavsdk::ConnectionResult ret = dc.add_udp_connection(); + if (ret != mavsdk::ConnectionResult::SUCCESS) { std::cout << "failed to add connection" << std::endl; return -1; } diff --git a/src/integration_tests/camera_test_helpers.cpp b/src/integration_tests/camera_test_helpers.cpp index 6ea24f5415..fd759fe585 100644 --- a/src/integration_tests/camera_test_helpers.cpp +++ b/src/integration_tests/camera_test_helpers.cpp @@ -83,9 +83,8 @@ set_setting(std::shared_ptr camera, const std::string &setting, const st return Camera::Result::TIMEOUT; } -dronecode_sdk::Camera::Result get_setting(std::shared_ptr camera, - const std::string &setting, - std::string &option) +mavsdk::Camera::Result +get_setting(std::shared_ptr camera, const std::string &setting, std::string &option) { struct PromiseResult { Camera::Result result{}; diff --git a/src/integration_tests/camera_test_helpers.h b/src/integration_tests/camera_test_helpers.h index 0e2de4bd56..22f0fb9fe2 100644 --- a/src/integration_tests/camera_test_helpers.h +++ b/src/integration_tests/camera_test_helpers.h @@ -3,14 +3,13 @@ #include "mavsdk.h" #include "plugins/camera/camera.h" -dronecode_sdk::Camera::Mode get_mode(std::shared_ptr camera); -void set_mode_async(std::shared_ptr camera, - dronecode_sdk::Camera::Mode mode); +mavsdk::Camera::Mode get_mode(std::shared_ptr camera); +void set_mode_async(std::shared_ptr camera, mavsdk::Camera::Mode mode); -dronecode_sdk::Camera::Result set_setting(std::shared_ptr camera, - const std::string &setting, - const std::string &option); +mavsdk::Camera::Result set_setting(std::shared_ptr camera, + const std::string &setting, + const std::string &option); -dronecode_sdk::Camera::Result get_setting(std::shared_ptr camera, - const std::string &setting, - std::string &option); +mavsdk::Camera::Result get_setting(std::shared_ptr camera, + const std::string &setting, + std::string &option); diff --git a/src/integration_tests/integration_test_helper.h b/src/integration_tests/integration_test_helper.h index 61e1668e88..09e2edaa51 100644 --- a/src/integration_tests/integration_test_helper.h +++ b/src/integration_tests/integration_test_helper.h @@ -17,13 +17,13 @@ class SitlTest : public testing::Test { #ifndef WINDOWS const int ret = system((std::string("./tools/start_px4_sitl.sh ") + model).c_str()); if (ret != 0) { - dronecode_sdk::LogErr() << "./tools/start_px4_sitl.sh failed, giving up."; + mavsdk::LogErr() << "./tools/start_px4_sitl.sh failed, giving up."; abort(); } // We need to wait a bit until it's up and running. std::this_thread::sleep_for(std::chrono::seconds(10)); #else - dronecode_sdk::LogErr() << "Auto-starting SITL not supported on Windows."; + mavsdk::LogErr() << "Auto-starting SITL not supported on Windows."; #endif } @@ -34,11 +34,11 @@ class SitlTest : public testing::Test { std::this_thread::sleep_for(std::chrono::seconds(1)); const int ret = system("./tools/stop_px4_sitl.sh"); if (ret != 0) { - dronecode_sdk::LogErr() << "./tools/stop_px4_sitl.sh failed, giving up."; + mavsdk::LogErr() << "./tools/stop_px4_sitl.sh failed, giving up."; abort(); } #else - dronecode_sdk::LogErr() << "Auto-starting SITL not supported on Windows."; + mavsdk::LogErr() << "Auto-starting SITL not supported on Windows."; #endif } @@ -59,7 +59,7 @@ class SitlTest : public testing::Test { model_name = test_name.substr(pos + 1, test_name.length() - pos - 1); } - dronecode_sdk::LogDebug() << "Model chosen: '" << model_name << "'"; + mavsdk::LogDebug() << "Model chosen: '" << model_name << "'"; return model_name; } }; diff --git a/src/integration_tests/system_connection_sync.cpp b/src/integration_tests/system_connection_sync.cpp index ff009c9d95..5bd565e131 100644 --- a/src/integration_tests/system_connection_sync.cpp +++ b/src/integration_tests/system_connection_sync.cpp @@ -7,8 +7,8 @@ using namespace mavsdk; TEST(SitlTestMultiple, SystemConnectionMultiple) { - dronecode_sdk::DronecodeSDK *dc; - dc = new dronecode_sdk::DronecodeSDK(); + mavsdk::DronecodeSDK *dc; + dc = new mavsdk::DronecodeSDK(); std::cout << "started" << std::endl; ASSERT_EQ(dc->add_udp_connection(14540), ConnectionResult::SUCCESS); @@ -31,7 +31,7 @@ TEST(SitlTestMultiple, SystemConnectionMultiple) std::this_thread::sleep_for(std::chrono::seconds(1)); - dc = new dronecode_sdk::DronecodeSDK(); + dc = new mavsdk::DronecodeSDK(); ASSERT_EQ(dc->add_udp_connection(14540), ConnectionResult::SUCCESS); From e827236286dfa1eed3030d9e9ac852b45690c232 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 10:54:58 +0200 Subject: [PATCH 07/15] src: DronecodeSDK -> Mavsdk --- src/backend/src/backend.cpp | 16 ++-- src/backend/src/backend.h | 10 +-- src/backend/src/backend_api.cpp | 2 +- src/backend/src/connection_initiator.h | 10 +-- src/backend/src/core/core_service_impl.h | 6 +- src/backend/src/grpc_server.h | 4 +- .../test/connection_initiator_test.cpp | 14 ++-- src/backend/test/core_service_impl_test.cpp | 8 +- src/core/connection_result.h | 2 +- src/core/log.h | 8 +- src/core/mavsdk.cpp | 35 ++++---- src/core/mavsdk.h | 16 ++-- src/core/mavsdk_impl.cpp | 83 +++++++++---------- src/core/mavsdk_impl.h | 19 ++--- src/core/mocks/mavsdk_mock.h | 2 +- src/core/plugin_impl_base.h | 2 +- src/core/system.cpp | 2 +- src/core/system.h | 12 +-- src/core/system_impl.cpp | 2 +- src/core/system_impl.h | 6 +- src/debug_helpers/drop_debug_main.cpp | 2 +- .../integration_tests/hello_world.cpp | 2 +- src/integration_tests/action_goto.cpp | 2 +- src/integration_tests/action_hover_async.cpp | 2 +- src/integration_tests/action_hover_sync.cpp | 2 +- .../action_takeoff_and_kill.cpp | 2 +- ...ction_transition_multicopter_fixedwing.cpp | 4 +- src/integration_tests/calibration.cpp | 12 +-- src/integration_tests/camera_format.cpp | 2 +- src/integration_tests/camera_mode.cpp | 4 +- src/integration_tests/camera_settings.cpp | 8 +- src/integration_tests/camera_status.cpp | 4 +- src/integration_tests/camera_take_photo.cpp | 4 +- .../camera_take_photo_interval.cpp | 2 +- src/integration_tests/follow_me.cpp | 4 +- src/integration_tests/geofence_inclusion.cpp | 2 +- src/integration_tests/gimbal.cpp | 6 +- src/integration_tests/info.cpp | 2 +- src/integration_tests/log_files.cpp | 2 +- src/integration_tests/logging.cpp | 2 +- src/integration_tests/mavlink_passthrough.cpp | 2 +- src/integration_tests/mission.cpp | 2 +- .../mission_cancellation.cpp | 4 +- .../mission_change_speed.cpp | 2 +- .../mission_raw_mission_changed.cpp | 2 +- src/integration_tests/mission_rtl.cpp | 2 +- .../mission_transfer_lossy.cpp | 2 +- src/integration_tests/offboard_attitude.cpp | 2 +- src/integration_tests/offboard_position.cpp | 2 +- src/integration_tests/offboard_velocity.cpp | 4 +- src/integration_tests/param.cpp | 4 +- .../system_connection_async.cpp | 2 +- .../system_connection_sync.cpp | 6 +- .../system_multi_components.cpp | 2 +- src/integration_tests/telemetry_async.cpp | 2 +- src/integration_tests/telemetry_health.cpp | 2 +- src/integration_tests/telemetry_modes.cpp | 2 +- src/integration_tests/telemetry_sync.cpp | 2 +- .../action/include/plugins/action/action.h | 2 +- src/plugins/info/include/plugins/info/info.h | 2 +- src/plugins/mission/mission_impl.cpp | 2 +- .../include/plugins/offboard/offboard.h | 2 +- 62 files changed, 187 insertions(+), 196 deletions(-) diff --git a/src/backend/src/backend.cpp b/src/backend/src/backend.cpp index 4b4e56709b..0fb1abe701 100644 --- a/src/backend/src/backend.cpp +++ b/src/backend/src/backend.cpp @@ -9,7 +9,7 @@ namespace mavsdk { namespace backend { -class DronecodeSDKBackend::Impl { +class MavsdkBackend::Impl { public: Impl() {} ~Impl() {} @@ -29,23 +29,23 @@ class DronecodeSDKBackend::Impl { void wait() { _server->wait(); } private: - DronecodeSDK _dc; - ConnectionInitiator _connection_initiator; + Mavsdk _dc; + ConnectionInitiator _connection_initiator; std::unique_ptr _server; }; -DronecodeSDKBackend::DronecodeSDKBackend() : _impl(new Impl()) {} -DronecodeSDKBackend::~DronecodeSDKBackend() = default; +MavsdkBackend::MavsdkBackend() : _impl(new Impl()) {} +MavsdkBackend::~MavsdkBackend() = default; -void DronecodeSDKBackend::startGRPCServer() +void MavsdkBackend::startGRPCServer() { _impl->startGRPCServer(); } -void DronecodeSDKBackend::connect(const std::string &connection_url) +void MavsdkBackend::connect(const std::string &connection_url) { return _impl->connect(connection_url); } -void DronecodeSDKBackend::wait() +void MavsdkBackend::wait() { _impl->wait(); } diff --git a/src/backend/src/backend.h b/src/backend/src/backend.h index 299f4f7d25..2585a3926b 100644 --- a/src/backend/src/backend.h +++ b/src/backend/src/backend.h @@ -6,12 +6,12 @@ namespace mavsdk { namespace backend { -class DronecodeSDKBackend { +class MavsdkBackend { public: - DronecodeSDKBackend(); - ~DronecodeSDKBackend(); - DronecodeSDKBackend(DronecodeSDKBackend &&) = delete; - DronecodeSDKBackend &operator=(DronecodeSDKBackend &&) = delete; + MavsdkBackend(); + ~MavsdkBackend(); + MavsdkBackend(MavsdkBackend &&) = delete; + MavsdkBackend &operator=(MavsdkBackend &&) = delete; void startGRPCServer(); void connect(const std::string &connection_url = "udp://"); diff --git a/src/backend/src/backend_api.cpp b/src/backend/src/backend_api.cpp index dc92f97508..15ac3e6dfa 100644 --- a/src/backend/src/backend_api.cpp +++ b/src/backend/src/backend_api.cpp @@ -4,7 +4,7 @@ void runBackend(const char *connection_url, void (*onServerStarted)(void *), void *context) { - mavsdk::backend::DronecodeSDKBackend backend; + mavsdk::backend::MavsdkBackend backend; backend.startGRPCServer(); backend.connect(std::string(connection_url)); diff --git a/src/backend/src/connection_initiator.h b/src/backend/src/connection_initiator.h index a3eab301e5..6be15ab68c 100644 --- a/src/backend/src/connection_initiator.h +++ b/src/backend/src/connection_initiator.h @@ -9,12 +9,12 @@ namespace mavsdk { namespace backend { -template class ConnectionInitiator { +template class ConnectionInitiator { public: ConnectionInitiator() {} ~ConnectionInitiator() {} - bool start(DronecodeSDK &dc, const std::string &connection_url) + bool start(Mavsdk &dc, const std::string &connection_url) { init_mutex(); init_timeout_logging(dc); @@ -33,13 +33,13 @@ template class ConnectionInitiator { private: void init_mutex() { _discovery_promise = std::make_shared>(); } - void init_timeout_logging(DronecodeSDK &dc) const + void init_timeout_logging(Mavsdk &dc) const { dc.register_on_timeout( [](uint64_t uuid) { LogInfo() << "System timed out [UUID: " << uuid << "]"; }); } - bool add_any_connection(DronecodeSDK &dc, const std::string &connection_url) + bool add_any_connection(Mavsdk &dc, const std::string &connection_url) { mavsdk::ConnectionResult connection_result = dc.add_any_connection(connection_url); @@ -51,7 +51,7 @@ template class ConnectionInitiator { return true; } - std::future wrapped_register_on_discover(DronecodeSDK &dc) + std::future wrapped_register_on_discover(Mavsdk &dc) { auto future = _discovery_promise->get_future(); diff --git a/src/backend/src/core/core_service_impl.h b/src/backend/src/core/core_service_impl.h index de654b59f0..17c261dc30 100644 --- a/src/backend/src/core/core_service_impl.h +++ b/src/backend/src/core/core_service_impl.h @@ -7,10 +7,10 @@ namespace mavsdk { namespace backend { -template +template class CoreServiceImpl final : public mavsdk::rpc::core::CoreService::Service { public: - CoreServiceImpl(DronecodeSDK &dc) : + CoreServiceImpl(Mavsdk &dc) : _dc(dc), _stop_promise(std::promise()), _stop_future(_stop_promise.get_future()) @@ -67,7 +67,7 @@ class CoreServiceImpl final : public mavsdk::rpc::core::CoreService::Service { void stop() { _stop_promise.set_value(); } private: - DronecodeSDK &_dc; + Mavsdk &_dc; std::promise _stop_promise; std::future _stop_future; diff --git a/src/backend/src/grpc_server.h b/src/backend/src/grpc_server.h index ef879a419a..3d28c3065c 100644 --- a/src/backend/src/grpc_server.h +++ b/src/backend/src/grpc_server.h @@ -28,7 +28,7 @@ namespace backend { class GRPCServer { public: - GRPCServer(DronecodeSDK &dc) : + GRPCServer(Mavsdk &dc) : _dc(dc), _core(_dc), _action(_dc.system()), @@ -57,7 +57,7 @@ class GRPCServer { private: void setup_port(grpc::ServerBuilder &builder); - DronecodeSDK &_dc; + Mavsdk &_dc; CoreServiceImpl<> _core; Action _action; diff --git a/src/backend/test/connection_initiator_test.cpp b/src/backend/test/connection_initiator_test.cpp index 9f11a75a70..b13e662666 100644 --- a/src/backend/test/connection_initiator_test.cpp +++ b/src/backend/test/connection_initiator_test.cpp @@ -10,8 +10,8 @@ using testing::_; using testing::NiceMock; using event_callback_t = mavsdk::testing::event_callback_t; -using MockDronecodeSDK = NiceMock; -using ConnectionInitiator = mavsdk::backend::ConnectionInitiator; +using MockMavsdk = NiceMock; +using ConnectionInitiator = mavsdk::backend::ConnectionInitiator; static constexpr auto ARBITRARY_CONNECTION_URL = "udp://1291"; static constexpr auto ARBITRARY_UUID = 1492; @@ -24,7 +24,7 @@ ACTION_P(SaveCallback, event_callback) TEST(ConnectionInitiator, registerDiscoverIsCalledExactlyOnce) { ConnectionInitiator initiator; - MockDronecodeSDK dc; + MockMavsdk dc; EXPECT_CALL(dc, register_on_discover(_)).Times(1); initiator.start(dc, ARBITRARY_CONNECTION_URL); @@ -33,7 +33,7 @@ TEST(ConnectionInitiator, registerDiscoverIsCalledExactlyOnce) TEST(ConnectionInitiator, startAddsUDPConnection) { ConnectionInitiator initiator; - MockDronecodeSDK dc; + MockMavsdk dc; EXPECT_CALL(dc, add_any_connection(_)); @@ -43,7 +43,7 @@ TEST(ConnectionInitiator, startAddsUDPConnection) TEST(ConnectionInitiator, startHangsUntilSystemDiscovered) { ConnectionInitiator initiator; - MockDronecodeSDK dc; + MockMavsdk dc; event_callback_t discover_callback; EXPECT_CALL(dc, register_on_discover(_)).WillOnce(SaveCallback(&discover_callback)); @@ -61,7 +61,7 @@ TEST(ConnectionInitiator, startHangsUntilSystemDiscovered) TEST(ConnectionInitiator, connectionDetectedIfDiscoverCallbackCalledBeforeWait) { ConnectionInitiator initiator; - MockDronecodeSDK dc; + MockMavsdk dc; event_callback_t discover_callback; EXPECT_CALL(dc, register_on_discover(_)).WillOnce(SaveCallback(&discover_callback)); @@ -73,7 +73,7 @@ TEST(ConnectionInitiator, connectionDetectedIfDiscoverCallbackCalledBeforeWait) TEST(ConnectionInitiator, doesNotCrashIfDiscoverCallbackCalledMoreThanOnce) { ConnectionInitiator initiator; - MockDronecodeSDK dc; + MockMavsdk dc; event_callback_t discover_callback; EXPECT_CALL(dc, register_on_discover(_)).WillOnce(SaveCallback(&discover_callback)); diff --git a/src/backend/test/core_service_impl_test.cpp b/src/backend/test/core_service_impl_test.cpp index d84316fd09..ff72ce502c 100644 --- a/src/backend/test/core_service_impl_test.cpp +++ b/src/backend/test/core_service_impl_test.cpp @@ -14,8 +14,8 @@ namespace { using testing::_; using testing::NiceMock; -using MockDronecodeSDK = NiceMock; -using CoreServiceImpl = mavsdk::backend::CoreServiceImpl; +using MockMavsdk = NiceMock; +using CoreServiceImpl = mavsdk::backend::CoreServiceImpl; using CoreService = mavsdk::rpc::core::CoreService; using ConnectionStateResponse = mavsdk::rpc::core::ConnectionStateResponse; @@ -27,7 +27,7 @@ class CoreServiceImplTest : public ::testing::Test { protected: virtual void SetUp() { - _dc = std::unique_ptr(new MockDronecodeSDK()); + _dc = std::unique_ptr(new MockMavsdk()); _core_service = std::unique_ptr(new CoreServiceImpl(*_dc)); grpc::ServerBuilder builder; @@ -45,7 +45,7 @@ class CoreServiceImplTest : public ::testing::Test { std::future subscribeConnectionStateAsync(std::vector> &events); std::unique_ptr _core_service{}; - std::unique_ptr _dc{}; + std::unique_ptr _dc{}; std::unique_ptr _server{}; std::unique_ptr _stub{}; }; diff --git a/src/core/connection_result.h b/src/core/connection_result.h index cd450b9612..936bde61b8 100644 --- a/src/core/connection_result.h +++ b/src/core/connection_result.h @@ -8,7 +8,7 @@ namespace mavsdk { /** * @brief Result type returned when adding a connection. * - * **Note**: DronecodeSDK does not throw exceptions. Instead a result of this type will be + * **Note**: Mavsdk does not throw exceptions. Instead a result of this type will be * returned when you add a connection: add_udp_connection(). */ enum class ConnectionResult { diff --git a/src/core/log.h b/src/core/log.h index 03ce7fcb2a..6e81a240c6 100644 --- a/src/core/log.h +++ b/src/core/log.h @@ -47,16 +47,16 @@ class LogDetailed { #if ANDROID switch (_log_level) { case LogLevel::Debug: - __android_log_print(ANDROID_LOG_DEBUG, "DronecodeSDK", "%s", _s.str().c_str()); + __android_log_print(ANDROID_LOG_DEBUG, "Mavsdk", "%s", _s.str().c_str()); break; case LogLevel::Info: - __android_log_print(ANDROID_LOG_INFO, "DronecodeSDK", "%s", _s.str().c_str()); + __android_log_print(ANDROID_LOG_INFO, "Mavsdk", "%s", _s.str().c_str()); break; case LogLevel::Warn: - __android_log_print(ANDROID_LOG_WARN, "DronecodeSDK", "%s", _s.str().c_str()); + __android_log_print(ANDROID_LOG_WARN, "Mavsdk", "%s", _s.str().c_str()); break; case LogLevel::Err: - __android_log_print(ANDROID_LOG_ERROR, "DronecodeSDK", "%s", _s.str().c_str()); + __android_log_print(ANDROID_LOG_ERROR, "Mavsdk", "%s", _s.str().c_str()); break; } // Unused: diff --git a/src/core/mavsdk.cpp b/src/core/mavsdk.cpp index e34e02acd4..885e7f8b6d 100644 --- a/src/core/mavsdk.cpp +++ b/src/core/mavsdk.cpp @@ -5,74 +5,71 @@ namespace mavsdk { -DronecodeSDK::DronecodeSDK() : _impl{new DronecodeSDKImpl()} {} +Mavsdk::Mavsdk() : _impl{new MavsdkImpl()} {} -DronecodeSDK::~DronecodeSDK() {} +Mavsdk::~Mavsdk() {} -ConnectionResult DronecodeSDK::add_any_connection(const std::string &connection_url) +ConnectionResult Mavsdk::add_any_connection(const std::string &connection_url) { return _impl->add_any_connection(connection_url); } -ConnectionResult DronecodeSDK::add_udp_connection(int local_port) +ConnectionResult Mavsdk::add_udp_connection(int local_port) { - return DronecodeSDK::add_udp_connection(DEFAULT_UDP_BIND_IP, local_port); + return Mavsdk::add_udp_connection(DEFAULT_UDP_BIND_IP, local_port); } -ConnectionResult DronecodeSDK::add_udp_connection(const std::string &local_bind_ip, - const int local_port) +ConnectionResult Mavsdk::add_udp_connection(const std::string &local_bind_ip, const int local_port) { return _impl->add_udp_connection(local_bind_ip, local_port); } -ConnectionResult DronecodeSDK::add_tcp_connection(const std::string &remote_ip, - const int remote_port) +ConnectionResult Mavsdk::add_tcp_connection(const std::string &remote_ip, const int remote_port) { return _impl->add_tcp_connection(remote_ip, remote_port); } -ConnectionResult DronecodeSDK::add_serial_connection(const std::string &dev_path, - const int baudrate) +ConnectionResult Mavsdk::add_serial_connection(const std::string &dev_path, const int baudrate) { return _impl->add_serial_connection(dev_path, baudrate); } -void DronecodeSDK::set_configuration(Configuration configuration) +void Mavsdk::set_configuration(Configuration configuration) { _impl->set_configuration(configuration); } -std::vector DronecodeSDK::system_uuids() const +std::vector Mavsdk::system_uuids() const { return _impl->get_system_uuids(); } -System &DronecodeSDK::system() const +System &Mavsdk::system() const { return _impl->get_system(); } -System &DronecodeSDK::system(const uint64_t uuid) const +System &Mavsdk::system(const uint64_t uuid) const { return _impl->get_system(uuid); } -bool DronecodeSDK::is_connected() const +bool Mavsdk::is_connected() const { return _impl->is_connected(); } -bool DronecodeSDK::is_connected(const uint64_t uuid) const +bool Mavsdk::is_connected(const uint64_t uuid) const { return _impl->is_connected(uuid); } -void DronecodeSDK::register_on_discover(const event_callback_t callback) +void Mavsdk::register_on_discover(const event_callback_t callback) { _impl->register_on_discover(callback); } -void DronecodeSDK::register_on_timeout(const event_callback_t callback) +void Mavsdk::register_on_timeout(const event_callback_t callback) { _impl->register_on_timeout(callback); } diff --git a/src/core/mavsdk.h b/src/core/mavsdk.h index c9a17b696c..f5e630723d 100644 --- a/src/core/mavsdk.h +++ b/src/core/mavsdk.h @@ -10,7 +10,7 @@ namespace mavsdk { -class DronecodeSDKImpl; +class MavsdkImpl; class System; /** @@ -22,7 +22,7 @@ class System; * An instance of this class must be created (first) in order to use the library. * The instance must be destroyed after use in order to break connections and release all resources. */ -class DronecodeSDK { +class Mavsdk { public: /** @brief Default UDP bind IP (accepts any incoming connections). */ static constexpr auto DEFAULT_UDP_BIND_IP = "0.0.0.0"; @@ -38,14 +38,14 @@ class DronecodeSDK { /** * @brief Constructor. */ - DronecodeSDK(); + Mavsdk(); /** * @brief Destructor. * * Disconnects all connected vehicles and releases all resources. */ - ~DronecodeSDK(); + ~Mavsdk(); /** * @brief Adds Connection via URL @@ -138,7 +138,7 @@ class DronecodeSDK { * @brief Get vector of system UUIDs. * * This returns a vector of the UUIDs of all systems that have been discovered. - * If a system doesn't have a UUID then DronecodeSDK will instead use its MAVLink system ID + * If a system doesn't have a UUID then Mavsdk will instead use its MAVLink system ID * (range: 0..255). * * @return A vector containing the UUIDs. @@ -226,11 +226,11 @@ class DronecodeSDK { private: /* @private. */ - std::unique_ptr _impl; + std::unique_ptr _impl; // Non-copyable - DronecodeSDK(const DronecodeSDK &) = delete; - const DronecodeSDK &operator=(const DronecodeSDK &) = delete; + Mavsdk(const Mavsdk &) = delete; + const Mavsdk &operator=(const Mavsdk &) = delete; }; } // namespace mavsdk diff --git a/src/core/mavsdk_impl.cpp b/src/core/mavsdk_impl.cpp index 3dbed5847d..4b40c3c6e0 100644 --- a/src/core/mavsdk_impl.cpp +++ b/src/core/mavsdk_impl.cpp @@ -14,7 +14,7 @@ namespace mavsdk { -DronecodeSDKImpl::DronecodeSDKImpl() : +MavsdkImpl::MavsdkImpl() : _connections_mutex(), _connections(), _systems_mutex(), @@ -22,10 +22,10 @@ DronecodeSDKImpl::DronecodeSDKImpl() : _on_discover_callback(nullptr), _on_timeout_callback(nullptr) { - LogInfo() << "DronecodeSDK version: " << dronecode_sdk_version; + LogInfo() << "Mavsdk version: " << dronecode_sdk_version; } -DronecodeSDKImpl::~DronecodeSDKImpl() +MavsdkImpl::~MavsdkImpl() { { std::lock_guard lock(_systems_mutex); @@ -40,7 +40,7 @@ DronecodeSDKImpl::~DronecodeSDKImpl() } } -void DronecodeSDKImpl::receive_message(mavlink_message_t &message) +void MavsdkImpl::receive_message(mavlink_message_t &message) { // Don't ever create a system with sysid 0. if (message.sysid == 0) { @@ -82,7 +82,7 @@ void DronecodeSDKImpl::receive_message(mavlink_message_t &message) } } -bool DronecodeSDKImpl::send_message(mavlink_message_t &message) +bool MavsdkImpl::send_message(mavlink_message_t &message) { std::lock_guard lock(_connections_mutex); @@ -96,7 +96,7 @@ bool DronecodeSDKImpl::send_message(mavlink_message_t &message) return true; } -ConnectionResult DronecodeSDKImpl::add_any_connection(const std::string &connection_url) +ConnectionResult MavsdkImpl::add_any_connection(const std::string &connection_url) { CliArg cli_arg; if (!cli_arg.parse(connection_url)) { @@ -105,8 +105,8 @@ ConnectionResult DronecodeSDKImpl::add_any_connection(const std::string &connect switch (cli_arg.get_protocol()) { case CliArg::Protocol::UDP: { - std::string path = DronecodeSDK::DEFAULT_UDP_BIND_IP; - int port = DronecodeSDK::DEFAULT_UDP_PORT; + std::string path = Mavsdk::DEFAULT_UDP_BIND_IP; + int port = Mavsdk::DEFAULT_UDP_PORT; if (!cli_arg.get_path().empty()) { path = cli_arg.get_path(); } @@ -117,8 +117,8 @@ ConnectionResult DronecodeSDKImpl::add_any_connection(const std::string &connect } case CliArg::Protocol::TCP: { - std::string path = DronecodeSDK::DEFAULT_TCP_REMOTE_IP; - int port = DronecodeSDK::DEFAULT_TCP_REMOTE_PORT; + std::string path = Mavsdk::DEFAULT_TCP_REMOTE_IP; + int port = Mavsdk::DEFAULT_TCP_REMOTE_PORT; if (!cli_arg.get_path().empty()) { path = cli_arg.get_path(); } @@ -129,7 +129,7 @@ ConnectionResult DronecodeSDKImpl::add_any_connection(const std::string &connect } case CliArg::Protocol::SERIAL: { - int baudrate = DronecodeSDK::DEFAULT_SERIAL_BAUDRATE; + int baudrate = Mavsdk::DEFAULT_SERIAL_BAUDRATE; if (cli_arg.get_baudrate()) { baudrate = cli_arg.get_baudrate(); } @@ -141,13 +141,10 @@ ConnectionResult DronecodeSDKImpl::add_any_connection(const std::string &connect } } -ConnectionResult DronecodeSDKImpl::add_udp_connection(const std::string &local_ip, - const int local_port) +ConnectionResult MavsdkImpl::add_udp_connection(const std::string &local_ip, const int local_port) { auto new_conn = std::make_shared( - std::bind(&DronecodeSDKImpl::receive_message, this, std::placeholders::_1), - local_ip, - local_port); + std::bind(&MavsdkImpl::receive_message, this, std::placeholders::_1), local_ip, local_port); ConnectionResult ret = new_conn->start(); if (ret == ConnectionResult::SUCCESS) { @@ -156,10 +153,10 @@ ConnectionResult DronecodeSDKImpl::add_udp_connection(const std::string &local_i return ret; } -ConnectionResult DronecodeSDKImpl::add_tcp_connection(const std::string &remote_ip, int remote_port) +ConnectionResult MavsdkImpl::add_tcp_connection(const std::string &remote_ip, int remote_port) { auto new_conn = std::make_shared( - std::bind(&DronecodeSDKImpl::receive_message, this, std::placeholders::_1), + std::bind(&MavsdkImpl::receive_message, this, std::placeholders::_1), remote_ip, remote_port); @@ -170,12 +167,10 @@ ConnectionResult DronecodeSDKImpl::add_tcp_connection(const std::string &remote_ return ret; } -ConnectionResult DronecodeSDKImpl::add_serial_connection(const std::string &dev_path, int baudrate) +ConnectionResult MavsdkImpl::add_serial_connection(const std::string &dev_path, int baudrate) { auto new_conn = std::make_shared( - std::bind(&DronecodeSDKImpl::receive_message, this, std::placeholders::_1), - dev_path, - baudrate); + std::bind(&MavsdkImpl::receive_message, this, std::placeholders::_1), dev_path, baudrate); ConnectionResult ret = new_conn->start(); if (ret == ConnectionResult::SUCCESS) { @@ -184,18 +179,18 @@ ConnectionResult DronecodeSDKImpl::add_serial_connection(const std::string &dev_ return ret; } -void DronecodeSDKImpl::add_connection(std::shared_ptr new_connection) +void MavsdkImpl::add_connection(std::shared_ptr new_connection) { std::lock_guard lock(_connections_mutex); _connections.push_back(new_connection); } -void DronecodeSDKImpl::set_configuration(DronecodeSDK::Configuration configuration) +void MavsdkImpl::set_configuration(Mavsdk::Configuration configuration) { _configuration = configuration; } -std::vector DronecodeSDKImpl::get_system_uuids() const +std::vector MavsdkImpl::get_system_uuids() const { std::vector uuids = {}; @@ -209,7 +204,7 @@ std::vector DronecodeSDKImpl::get_system_uuids() const return uuids; } -System &DronecodeSDKImpl::get_system() +System &MavsdkImpl::get_system() { { std::lock_guard lock(_systems_mutex); @@ -232,7 +227,7 @@ System &DronecodeSDKImpl::get_system() } } -System &DronecodeSDKImpl::get_system(const uint64_t uuid) +System &MavsdkImpl::get_system(const uint64_t uuid) { { std::lock_guard lock(_systems_mutex); @@ -255,14 +250,14 @@ System &DronecodeSDKImpl::get_system(const uint64_t uuid) return *_systems[system_id]; } -uint8_t DronecodeSDKImpl::get_own_system_id() const +uint8_t MavsdkImpl::get_own_system_id() const { switch (_configuration.load()) { - case DronecodeSDK::Configuration::GroundStation: + case Mavsdk::Configuration::GroundStation: // FIXME: This doesn't make much sense actually but it seems to work. return 0; - case DronecodeSDK::Configuration::CompanionComputer: + case Mavsdk::Configuration::CompanionComputer: // FIXME: This should be the same as the drone but we need to // add auto detection for it. return 1; @@ -273,14 +268,14 @@ uint8_t DronecodeSDKImpl::get_own_system_id() const } } -uint8_t DronecodeSDKImpl::get_own_component_id() const +uint8_t MavsdkImpl::get_own_component_id() const { switch (_configuration.load()) { - case DronecodeSDK::Configuration::GroundStation: + case Mavsdk::Configuration::GroundStation: // FIXME: For now we increment by 1 to avoid conflicts with others. return MAV_COMP_ID_MISSIONPLANNER + 1; - case DronecodeSDK::Configuration::CompanionComputer: + case Mavsdk::Configuration::CompanionComputer: // It's at least a possibility that we are bridging MAVLink traffic. return MAV_COMP_ID_UDP_BRIDGE; @@ -290,12 +285,12 @@ uint8_t DronecodeSDKImpl::get_own_component_id() const } } -uint8_t DronecodeSDKImpl::get_mav_type() const +uint8_t MavsdkImpl::get_mav_type() const { switch (_configuration.load()) { - case DronecodeSDK::Configuration::GroundStation: + case Mavsdk::Configuration::GroundStation: return MAV_TYPE_GCS; - case DronecodeSDK::Configuration::CompanionComputer: + case Mavsdk::Configuration::CompanionComputer: return MAV_TYPE_ONBOARD_CONTROLLER; default: LogErr() << "Unknown configuration"; @@ -303,7 +298,7 @@ uint8_t DronecodeSDKImpl::get_mav_type() const } } -bool DronecodeSDKImpl::is_connected() const +bool MavsdkImpl::is_connected() const { std::lock_guard lock(_systems_mutex); @@ -314,7 +309,7 @@ bool DronecodeSDKImpl::is_connected() const return _systems.begin()->second->is_connected(); } -bool DronecodeSDKImpl::is_connected(const uint64_t uuid) const +bool MavsdkImpl::is_connected(const uint64_t uuid) const { std::lock_guard lock(_systems_mutex); @@ -326,7 +321,7 @@ bool DronecodeSDKImpl::is_connected(const uint64_t uuid) const return false; } -void DronecodeSDKImpl::make_system_with_component(uint8_t system_id, uint8_t comp_id) +void MavsdkImpl::make_system_with_component(uint8_t system_id, uint8_t comp_id) { std::lock_guard lock(_systems_mutex); @@ -342,7 +337,7 @@ void DronecodeSDKImpl::make_system_with_component(uint8_t system_id, uint8_t com _systems.insert(system_entry_t(system_id, new_system)); } -bool DronecodeSDKImpl::does_system_exist(uint8_t system_id) +bool MavsdkImpl::does_system_exist(uint8_t system_id) { std::lock_guard lock(_systems_mutex); @@ -353,14 +348,14 @@ bool DronecodeSDKImpl::does_system_exist(uint8_t system_id) return false; } -void DronecodeSDKImpl::notify_on_discover(const uint64_t uuid) +void MavsdkImpl::notify_on_discover(const uint64_t uuid) { if (_on_discover_callback != nullptr) { _on_discover_callback(uuid); } } -void DronecodeSDKImpl::notify_on_timeout(const uint64_t uuid) +void MavsdkImpl::notify_on_timeout(const uint64_t uuid) { LogDebug() << "Lost " << uuid; if (_on_timeout_callback != nullptr) { @@ -368,7 +363,7 @@ void DronecodeSDKImpl::notify_on_timeout(const uint64_t uuid) } } -void DronecodeSDKImpl::register_on_discover(const DronecodeSDK::event_callback_t callback) +void MavsdkImpl::register_on_discover(const Mavsdk::event_callback_t callback) { std::lock_guard lock(_systems_mutex); @@ -389,7 +384,7 @@ void DronecodeSDKImpl::register_on_discover(const DronecodeSDK::event_callback_t _on_discover_callback = callback; } -void DronecodeSDKImpl::register_on_timeout(const DronecodeSDK::event_callback_t callback) +void MavsdkImpl::register_on_timeout(const Mavsdk::event_callback_t callback) { _on_timeout_callback = callback; } diff --git a/src/core/mavsdk_impl.h b/src/core/mavsdk_impl.h index 2ecf499ca6..961155ce1d 100644 --- a/src/core/mavsdk_impl.h +++ b/src/core/mavsdk_impl.h @@ -12,10 +12,10 @@ namespace mavsdk { -class DronecodeSDKImpl { +class MavsdkImpl { public: - DronecodeSDKImpl(); - ~DronecodeSDKImpl(); + MavsdkImpl(); + ~MavsdkImpl(); void receive_message(mavlink_message_t &message); bool send_message(mavlink_message_t &message); @@ -27,7 +27,7 @@ class DronecodeSDKImpl { ConnectionResult add_tcp_connection(const std::string &remote_ip, int remote_port); ConnectionResult add_serial_connection(const std::string &dev_path, int baudrate); - void set_configuration(DronecodeSDK::Configuration configuration); + void set_configuration(Mavsdk::Configuration configuration); std::vector get_system_uuids() const; System &get_system(); @@ -40,8 +40,8 @@ class DronecodeSDKImpl { bool is_connected() const; bool is_connected(uint64_t uuid) const; - void register_on_discover(DronecodeSDK::event_callback_t callback); - void register_on_timeout(DronecodeSDK::event_callback_t callback); + void register_on_discover(Mavsdk::event_callback_t callback); + void register_on_timeout(Mavsdk::event_callback_t callback); void notify_on_discover(uint64_t uuid); void notify_on_timeout(uint64_t uuid); @@ -59,11 +59,10 @@ class DronecodeSDKImpl { mutable std::recursive_mutex _systems_mutex; std::map> _systems; - DronecodeSDK::event_callback_t _on_discover_callback; - DronecodeSDK::event_callback_t _on_timeout_callback; + Mavsdk::event_callback_t _on_discover_callback; + Mavsdk::event_callback_t _on_timeout_callback; - std::atomic _configuration{ - DronecodeSDK::Configuration::GroundStation}; + std::atomic _configuration{Mavsdk::Configuration::GroundStation}; std::atomic _should_exit = {false}; }; diff --git a/src/core/mocks/mavsdk_mock.h b/src/core/mocks/mavsdk_mock.h index 06ea0fcce9..b7a4c7bac2 100644 --- a/src/core/mocks/mavsdk_mock.h +++ b/src/core/mocks/mavsdk_mock.h @@ -8,7 +8,7 @@ namespace testing { typedef std::function event_callback_t; -class MockDronecodeSDK { +class MockMavsdk { public: MOCK_CONST_METHOD1(add_any_connection, ConnectionResult(const std::string &)){}; MOCK_CONST_METHOD1(register_on_discover, void(event_callback_t)){}; diff --git a/src/core/plugin_impl_base.h b/src/core/plugin_impl_base.h index 0eaf1d4f13..47135b0e12 100644 --- a/src/core/plugin_impl_base.h +++ b/src/core/plugin_impl_base.h @@ -24,7 +24,7 @@ class PluginImplBase { /* * The method `deinit()` is called before a plugin is destructed which happens - * usually only at the very end when a DronecodeSDK instance is destructed. + * usually only at the very end when a Mavsdk instance is destructed. * * Plugins should do any cleanup of what has been set up during init. */ diff --git a/src/core/system.cpp b/src/core/system.cpp index 2e98564790..052d412e3d 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -15,7 +15,7 @@ namespace mavsdk { using namespace std::placeholders; // for `_1` -System::System(DronecodeSDKImpl &parent, uint8_t system_id, uint8_t component_id) : +System::System(MavsdkImpl &parent, uint8_t system_id, uint8_t component_id) : _system_impl(std::make_shared(parent, system_id, component_id)) {} diff --git a/src/core/system.h b/src/core/system.h index 1a7f59f3f3..c015b754a7 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -16,7 +16,7 @@ enum ComponentType { UNKNOWN = 0, AUTOPILOT, CAMERA, GIMBAL }; typedef std::function discover_callback_t; class SystemImpl; -class DronecodeSDKImpl; +class MavsdkImpl; class PluginImplBase; /** @@ -24,7 +24,7 @@ class PluginImplBase; * (e.g. autopilot, cameras, servos, gimbals, etc). * * System objects are used to interact with UAVs (including their components) and standalone - * cameras. They are not created directly by application code, but are returned by the DronecodeSDK + * cameras. They are not created directly by application code, but are returned by the Mavsdk * class. */ class System { @@ -33,11 +33,11 @@ class System { * * This constructor is not (and should not be) directly called by application code. * - * @param parent `DronecodeSDKImpl` dependency. + * @param parent `MavsdkImpl` dependency. * @param system_id System id. * @param comp_id Component id. */ - explicit System(DronecodeSDKImpl &parent, uint8_t system_id, uint8_t comp_id); + explicit System(MavsdkImpl &parent, uint8_t system_id, uint8_t comp_id); /** * @brief Destructor. */ @@ -109,11 +109,11 @@ class System { std::shared_ptr system_impl() { return _system_impl; }; /* - * DronecodeSDKImpl and PluginImplBase need access to SystemImpl class. + * MavsdkImpl and PluginImplBase need access to SystemImpl class. * This is not pretty but it's not easy to hide the methods from library * users if not like that (or with an ugly reinterpret_cast). */ - friend DronecodeSDKImpl; + friend MavsdkImpl; friend PluginImplBase; std::shared_ptr _system_impl; diff --git a/src/core/system_impl.cpp b/src/core/system_impl.cpp index 6d25106f32..485faff406 100644 --- a/src/core/system_impl.cpp +++ b/src/core/system_impl.cpp @@ -16,7 +16,7 @@ namespace mavsdk { using namespace std::placeholders; // for `_1` -SystemImpl::SystemImpl(DronecodeSDKImpl &parent, uint8_t system_id, uint8_t comp_id) : +SystemImpl::SystemImpl(MavsdkImpl &parent, uint8_t system_id, uint8_t comp_id) : _system_id(system_id), _parent(parent), _params(*this), diff --git a/src/core/system_impl.h b/src/core/system_impl.h index 08d82bd7c8..e10d653261 100644 --- a/src/core/system_impl.h +++ b/src/core/system_impl.h @@ -23,7 +23,7 @@ namespace mavsdk { -class DronecodeSDKImpl; +class MavsdkImpl; class PluginImplBase; // This class is the pimpl of System. This is to hide the private methods @@ -40,7 +40,7 @@ class SystemImpl { OFFBOARD, }; - explicit SystemImpl(DronecodeSDKImpl &parent, uint8_t system_id, uint8_t component_id); + explicit SystemImpl(MavsdkImpl &parent, uint8_t system_id, uint8_t component_id); ~SystemImpl(); void process_mavlink_message(mavlink_message_t &message); @@ -276,7 +276,7 @@ class SystemImpl { std::atomic _armed{false}; std::atomic _hitl_enabled{false}; - DronecodeSDKImpl &_parent; + MavsdkImpl &_parent; command_result_callback_t _command_result_callback{nullptr}; diff --git a/src/debug_helpers/drop_debug_main.cpp b/src/debug_helpers/drop_debug_main.cpp index 802baa830a..d2448712b9 100644 --- a/src/debug_helpers/drop_debug_main.cpp +++ b/src/debug_helpers/drop_debug_main.cpp @@ -20,7 +20,7 @@ int main(int argc, const char *argv[]) UNUSED(argc); UNUSED(argv); - mavsdk::DronecodeSDK dc; + mavsdk::Mavsdk dc; mavsdk::ConnectionResult ret = dc.add_udp_connection(); if (ret != mavsdk::ConnectionResult::SUCCESS) { diff --git a/src/external_example/integration_tests/hello_world.cpp b/src/external_example/integration_tests/hello_world.cpp index 0a26a5617d..fdea279813 100644 --- a/src/external_example/integration_tests/hello_world.cpp +++ b/src/external_example/integration_tests/hello_world.cpp @@ -8,7 +8,7 @@ using namespace mavsdk; TEST_F(SitlTest, ExampleHello) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/action_goto.cpp b/src/integration_tests/action_goto.cpp index c4886714f3..9662eab169 100644 --- a/src/integration_tests/action_goto.cpp +++ b/src/integration_tests/action_goto.cpp @@ -9,7 +9,7 @@ using namespace mavsdk; TEST_F(SitlTest, ActionGoto) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/action_hover_async.cpp b/src/integration_tests/action_hover_async.cpp index 53ff31a4dc..0ffbcc8aa6 100644 --- a/src/integration_tests/action_hover_async.cpp +++ b/src/integration_tests/action_hover_async.cpp @@ -10,7 +10,7 @@ using namespace mavsdk; TEST_F(SitlTest, ActionHoverAsync) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/action_hover_sync.cpp b/src/integration_tests/action_hover_sync.cpp index f699aafb1a..4ede0f0793 100644 --- a/src/integration_tests/action_hover_sync.cpp +++ b/src/integration_tests/action_hover_sync.cpp @@ -26,7 +26,7 @@ TEST_F(SitlTest, ActionHoverSyncLower) void takeoff_and_hover_at_altitude(float altitude_m) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/action_takeoff_and_kill.cpp b/src/integration_tests/action_takeoff_and_kill.cpp index 8e47e2d04f..5e043e1ad3 100644 --- a/src/integration_tests/action_takeoff_and_kill.cpp +++ b/src/integration_tests/action_takeoff_and_kill.cpp @@ -8,7 +8,7 @@ using namespace mavsdk; TEST_F(SitlTest, ActionTakeoffAndKill) { - DronecodeSDK dc; + Mavsdk dc; ASSERT_EQ(dc.add_udp_connection(), ConnectionResult::SUCCESS); { diff --git a/src/integration_tests/action_transition_multicopter_fixedwing.cpp b/src/integration_tests/action_transition_multicopter_fixedwing.cpp index d56bfeeb43..b7b9c53c9f 100644 --- a/src/integration_tests/action_transition_multicopter_fixedwing.cpp +++ b/src/integration_tests/action_transition_multicopter_fixedwing.cpp @@ -6,7 +6,7 @@ using namespace mavsdk; -// static void connect(DronecodeSDK); +// static void connect(Mavsdk); static void takeoff(std::shared_ptr action, std::shared_ptr telemetry); static void takeoff_and_transition_to_fixedwing(); static void land_and_disarm(std::shared_ptr action, std::shared_ptr telemetry); @@ -19,7 +19,7 @@ TEST_F(SitlTest, ActionTransitionSync_standard_vtol) void takeoff_and_transition_to_fixedwing() { // Init & connect - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/calibration.cpp b/src/integration_tests/calibration.cpp index 577a04304f..0e2b27fa3c 100644 --- a/src/integration_tests/calibration.cpp +++ b/src/integration_tests/calibration.cpp @@ -17,7 +17,7 @@ static void receive_calibration_callback(const Calibration::Result result, TEST(HardwareTest, CalibrationGyro) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -44,7 +44,7 @@ TEST(HardwareTest, CalibrationGyro) TEST(HardwareTest, CalibrationAccelerometer) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -71,7 +71,7 @@ TEST(HardwareTest, CalibrationAccelerometer) TEST(HardwareTest, CalibrationMagnetometer) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -98,7 +98,7 @@ TEST(HardwareTest, CalibrationMagnetometer) TEST(HardwareTest, CalibrationGimbalAccelerometer) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -125,7 +125,7 @@ TEST(HardwareTest, CalibrationGimbalAccelerometer) TEST(HardwareTest, CalibrationGyroWithTelemetry) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -166,7 +166,7 @@ TEST(HardwareTest, CalibrationGyroWithTelemetry) TEST(HardwareTest, CalibrationGyroCancelled) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/camera_format.cpp b/src/integration_tests/camera_format.cpp index b20aa1c6b9..6d91e31e97 100644 --- a/src/integration_tests/camera_format.cpp +++ b/src/integration_tests/camera_format.cpp @@ -9,7 +9,7 @@ using namespace mavsdk; TEST(CameraTest, Format) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/camera_mode.cpp b/src/integration_tests/camera_mode.cpp index 6b69e66055..f911856017 100644 --- a/src/integration_tests/camera_mode.cpp +++ b/src/integration_tests/camera_mode.cpp @@ -10,7 +10,7 @@ using namespace mavsdk; TEST(CameraTest, SetModeSync) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -49,7 +49,7 @@ TEST(CameraTest, SetModeSync) TEST(CameraTest, SetModeAsync) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/camera_settings.cpp b/src/integration_tests/camera_settings.cpp index 3a77af6a6d..b193d91d5a 100644 --- a/src/integration_tests/camera_settings.cpp +++ b/src/integration_tests/camera_settings.cpp @@ -17,7 +17,7 @@ const static bool is_et = false; TEST(CameraTest, ShowSettingsAndOptions) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -114,7 +114,7 @@ TEST(CameraTest, ShowSettingsAndOptions) TEST(CameraTest, SetSettings) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult connection_ret = dc.add_udp_connection(); ASSERT_EQ(connection_ret, ConnectionResult::SUCCESS); @@ -254,7 +254,7 @@ static void receive_current_settings(bool &subscription_called, TEST(CameraTest, SubscribeCurrentSettings) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult connection_ret = dc.add_udp_connection(); ASSERT_EQ(connection_ret, ConnectionResult::SUCCESS); @@ -317,7 +317,7 @@ receive_possible_setting_options(bool &subscription_called, TEST(CameraTest, SubscribePossibleSettings) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult connection_ret = dc.add_udp_connection(); ASSERT_EQ(connection_ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/camera_status.cpp b/src/integration_tests/camera_status.cpp index 79eac8fa5b..88faba5c46 100644 --- a/src/integration_tests/camera_status.cpp +++ b/src/integration_tests/camera_status.cpp @@ -17,7 +17,7 @@ static std::atomic _num_received_status{0}; TEST(CameraTest, Status) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -35,7 +35,7 @@ TEST(CameraTest, Status) TEST(CameraTest, StatusSubscription) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/camera_take_photo.cpp b/src/integration_tests/camera_take_photo.cpp index c6de03df45..afd07b7d60 100644 --- a/src/integration_tests/camera_take_photo.cpp +++ b/src/integration_tests/camera_take_photo.cpp @@ -21,7 +21,7 @@ static std::atomic _received_capture_info{false}; TEST(CameraTest, TakePhotoSingle) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -49,7 +49,7 @@ TEST(CameraTest, TakePhotoSingle) TEST(CameraTest, TakePhotosMultiple) { - DronecodeSDK dc; + Mavsdk dc; const int num_photos_to_take = 3; diff --git a/src/integration_tests/camera_take_photo_interval.cpp b/src/integration_tests/camera_take_photo_interval.cpp index 7f16e00d0f..a478a0676b 100644 --- a/src/integration_tests/camera_take_photo_interval.cpp +++ b/src/integration_tests/camera_take_photo_interval.cpp @@ -20,7 +20,7 @@ static std::atomic _received_result{false}; TEST(CameraTest, TakePhotoInterval) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/follow_me.cpp b/src/integration_tests/follow_me.cpp index 56a672f78e..51bf46ce5d 100644 --- a/src/integration_tests/follow_me.cpp +++ b/src/integration_tests/follow_me.cpp @@ -24,7 +24,7 @@ const size_t N_LOCATIONS = 100ul; TEST_F(SitlTest, FollowMeOneLocation) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ConnectionResult::SUCCESS, ret); @@ -92,7 +92,7 @@ TEST_F(SitlTest, FollowMeOneLocation) TEST_F(SitlTest, FollowMeMultiLocationWithConfig) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ConnectionResult::SUCCESS, ret); diff --git a/src/integration_tests/geofence_inclusion.cpp b/src/integration_tests/geofence_inclusion.cpp index 0fde862145..7be03b233c 100644 --- a/src/integration_tests/geofence_inclusion.cpp +++ b/src/integration_tests/geofence_inclusion.cpp @@ -17,7 +17,7 @@ static std::atomic _got_result{false}; TEST_F(SitlTest, GeofenceInclusion) { - DronecodeSDK dl; + Mavsdk dl; ConnectionResult ret = dl.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/gimbal.cpp b/src/integration_tests/gimbal.cpp index fdeaeaf85a..d369383774 100644 --- a/src/integration_tests/gimbal.cpp +++ b/src/integration_tests/gimbal.cpp @@ -23,7 +23,7 @@ void receive_gimbal_attitude_euler_angles(Telemetry::EulerAngle euler_angle); TEST(SitlTestGimbal, GimbalMove) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -51,7 +51,7 @@ TEST(SitlTestGimbal, GimbalMove) TEST(SitlTestGimbal, GimbalTakeoffAndMove) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -92,7 +92,7 @@ TEST(SitlTestGimbal, GimbalTakeoffAndMove) TEST(SitlTestGimbal, GimbalROIOffboard) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/info.cpp b/src/integration_tests/info.cpp index 80c101c8dc..0db53ba035 100644 --- a/src/integration_tests/info.cpp +++ b/src/integration_tests/info.cpp @@ -7,7 +7,7 @@ using namespace mavsdk; TEST_F(SitlTest, Info) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/log_files.cpp b/src/integration_tests/log_files.cpp index f3a71213dc..d5d4180b4f 100644 --- a/src/integration_tests/log_files.cpp +++ b/src/integration_tests/log_files.cpp @@ -9,7 +9,7 @@ using namespace mavsdk; TEST(HardwareTest, LogFiles) { - DronecodeSDK dc; + Mavsdk dc; // ConnectionResult ret = dc.add_serial_connection("/dev/ttyACM0"); ConnectionResult ret = dc.add_udp_connection(); diff --git a/src/integration_tests/logging.cpp b/src/integration_tests/logging.cpp index 0eca90483b..cbdeac29c6 100644 --- a/src/integration_tests/logging.cpp +++ b/src/integration_tests/logging.cpp @@ -7,7 +7,7 @@ using namespace mavsdk; TEST_F(SitlTest, Logging) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/mavlink_passthrough.cpp b/src/integration_tests/mavlink_passthrough.cpp index 4836f64bb4..ea8f651b10 100644 --- a/src/integration_tests/mavlink_passthrough.cpp +++ b/src/integration_tests/mavlink_passthrough.cpp @@ -9,7 +9,7 @@ using namespace mavsdk; TEST_F(SitlTest, MavlinkPassthrough) { - DronecodeSDK dc; + Mavsdk dc; ASSERT_EQ(dc.add_udp_connection(), ConnectionResult::SUCCESS); { diff --git a/src/integration_tests/mission.cpp b/src/integration_tests/mission.cpp index 75e0cf0f0c..462ce58d64 100644 --- a/src/integration_tests/mission.cpp +++ b/src/integration_tests/mission.cpp @@ -38,7 +38,7 @@ static std::atomic pause_already_done{false}; TEST_F(SitlTest, MissionAddWaypointsAndFly) { - DronecodeSDK dc; + Mavsdk dc; { auto prom = std::make_shared>(); diff --git a/src/integration_tests/mission_cancellation.cpp b/src/integration_tests/mission_cancellation.cpp index 6de4bb4103..4555c08d17 100644 --- a/src/integration_tests/mission_cancellation.cpp +++ b/src/integration_tests/mission_cancellation.cpp @@ -22,7 +22,7 @@ static std::shared_ptr add_waypoint(double latitude_deg, TEST_F(SitlTest, MissionUploadCancellation) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -65,7 +65,7 @@ TEST_F(SitlTest, MissionUploadCancellation) TEST_F(SitlTest, MissionDownloadCancellation) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/mission_change_speed.cpp b/src/integration_tests/mission_change_speed.cpp index c2517a9944..ce754c5040 100644 --- a/src/integration_tests/mission_change_speed.cpp +++ b/src/integration_tests/mission_change_speed.cpp @@ -32,7 +32,7 @@ const static float speeds[4] = {10.0f, 3.0f, 8.0f, 5.0f}; TEST_F(SitlTest, MissionChangeSpeed) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/mission_raw_mission_changed.cpp b/src/integration_tests/mission_raw_mission_changed.cpp index 6eb86b85e0..da51dc1830 100644 --- a/src/integration_tests/mission_raw_mission_changed.cpp +++ b/src/integration_tests/mission_raw_mission_changed.cpp @@ -18,7 +18,7 @@ validate_items(const std::vector>(); diff --git a/src/integration_tests/mission_transfer_lossy.cpp b/src/integration_tests/mission_transfer_lossy.cpp index bb83c4b74a..7029633965 100644 --- a/src/integration_tests/mission_transfer_lossy.cpp +++ b/src/integration_tests/mission_transfer_lossy.cpp @@ -23,7 +23,7 @@ static std::atomic _lossy_counter{0}; TEST_F(SitlTest, MissionTransferLossy) { - DronecodeSDK dc; + Mavsdk dc; ASSERT_EQ(dc.add_udp_connection(), ConnectionResult::SUCCESS); { diff --git a/src/integration_tests/offboard_attitude.cpp b/src/integration_tests/offboard_attitude.cpp index 403f09743f..308bd877f9 100644 --- a/src/integration_tests/offboard_attitude.cpp +++ b/src/integration_tests/offboard_attitude.cpp @@ -18,7 +18,7 @@ static void turn_yaw(std::shared_ptr offboard); TEST_F(SitlTest, OffboardAttitudeRate) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ConnectionResult::SUCCESS, ret); diff --git a/src/integration_tests/offboard_position.cpp b/src/integration_tests/offboard_position.cpp index c4fd5c4668..39515ba3ff 100644 --- a/src/integration_tests/offboard_position.cpp +++ b/src/integration_tests/offboard_position.cpp @@ -11,7 +11,7 @@ using namespace mavsdk; TEST_F(SitlTest, OffboardPositionNED) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ConnectionResult::SUCCESS, ret); diff --git a/src/integration_tests/offboard_velocity.cpp b/src/integration_tests/offboard_velocity.cpp index 852be8269a..be1ef7cbf6 100644 --- a/src/integration_tests/offboard_velocity.cpp +++ b/src/integration_tests/offboard_velocity.cpp @@ -11,7 +11,7 @@ using namespace mavsdk; TEST_F(SitlTest, OffboardVelocityNED) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ConnectionResult::SUCCESS, ret); @@ -108,7 +108,7 @@ TEST_F(SitlTest, OffboardVelocityNED) TEST_F(SitlTest, OffboardVelocityBody) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ConnectionResult::SUCCESS, ret); diff --git a/src/integration_tests/param.cpp b/src/integration_tests/param.cpp index d2f8574016..bee351bca7 100644 --- a/src/integration_tests/param.cpp +++ b/src/integration_tests/param.cpp @@ -7,7 +7,7 @@ using namespace mavsdk; TEST_F(SitlTest, ParamSad) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); @@ -39,7 +39,7 @@ TEST_F(SitlTest, ParamSad) TEST_F(SitlTest, ParamHappy) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/system_connection_async.cpp b/src/integration_tests/system_connection_async.cpp index 0e8abc8927..8815344c3a 100644 --- a/src/integration_tests/system_connection_async.cpp +++ b/src/integration_tests/system_connection_async.cpp @@ -19,7 +19,7 @@ void on_timeout(uint64_t uuid); TEST_F(SitlTest, SystemConnectionAsync) { - DronecodeSDK dc; + Mavsdk dc; ASSERT_EQ(dc.add_udp_connection(), ConnectionResult::SUCCESS); diff --git a/src/integration_tests/system_connection_sync.cpp b/src/integration_tests/system_connection_sync.cpp index 5bd565e131..f166e5ee04 100644 --- a/src/integration_tests/system_connection_sync.cpp +++ b/src/integration_tests/system_connection_sync.cpp @@ -7,8 +7,8 @@ using namespace mavsdk; TEST(SitlTestMultiple, SystemConnectionMultiple) { - mavsdk::DronecodeSDK *dc; - dc = new mavsdk::DronecodeSDK(); + mavsdk::Mavsdk *dc; + dc = new mavsdk::Mavsdk(); std::cout << "started" << std::endl; ASSERT_EQ(dc->add_udp_connection(14540), ConnectionResult::SUCCESS); @@ -31,7 +31,7 @@ TEST(SitlTestMultiple, SystemConnectionMultiple) std::this_thread::sleep_for(std::chrono::seconds(1)); - dc = new mavsdk::DronecodeSDK(); + dc = new mavsdk::Mavsdk(); ASSERT_EQ(dc->add_udp_connection(14540), ConnectionResult::SUCCESS); diff --git a/src/integration_tests/system_multi_components.cpp b/src/integration_tests/system_multi_components.cpp index 919e47b26f..30b80bfe50 100644 --- a/src/integration_tests/system_multi_components.cpp +++ b/src/integration_tests/system_multi_components.cpp @@ -25,7 +25,7 @@ using namespace std::chrono; */ TEST(SitlTestMultiple, SystemMultipleComponents) { - DronecodeSDK dc; + Mavsdk dc; // For both Autopilot and Camera ASSERT_EQ(dc.add_udp_connection(), ConnectionResult::SUCCESS); diff --git a/src/integration_tests/telemetry_async.cpp b/src/integration_tests/telemetry_async.cpp index 4757a19bff..030c308024 100644 --- a/src/integration_tests/telemetry_async.cpp +++ b/src/integration_tests/telemetry_async.cpp @@ -44,7 +44,7 @@ static bool _received_position_velocity_ned = false; TEST_F(SitlTest, TelemetryAsync) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); diff --git a/src/integration_tests/telemetry_health.cpp b/src/integration_tests/telemetry_health.cpp index 2b95806ce4..6f926ebc1c 100644 --- a/src/integration_tests/telemetry_health.cpp +++ b/src/integration_tests/telemetry_health.cpp @@ -9,7 +9,7 @@ void print_health(Telemetry::Health health); TEST_F(SitlTest, TelemetryHealth) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/telemetry_modes.cpp b/src/integration_tests/telemetry_modes.cpp index 909c6ff3d2..5cfba4e175 100644 --- a/src/integration_tests/telemetry_modes.cpp +++ b/src/integration_tests/telemetry_modes.cpp @@ -11,7 +11,7 @@ static Telemetry::FlightMode _flight_mode = Telemetry::FlightMode::UNKNOWN; TEST_F(SitlTest, TelemetryFlightModes) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/integration_tests/telemetry_sync.cpp b/src/integration_tests/telemetry_sync.cpp index b48e0dcbae..e5d3ddcfe2 100644 --- a/src/integration_tests/telemetry_sync.cpp +++ b/src/integration_tests/telemetry_sync.cpp @@ -7,7 +7,7 @@ using namespace mavsdk; TEST_F(SitlTest, TelemetrySync) { - DronecodeSDK dc; + Mavsdk dc; ConnectionResult ret = dc.add_udp_connection(); ASSERT_EQ(ret, ConnectionResult::SUCCESS); diff --git a/src/plugins/action/include/plugins/action/action.h b/src/plugins/action/include/plugins/action/action.h index 360b9849a1..25610a921e 100644 --- a/src/plugins/action/include/plugins/action/action.h +++ b/src/plugins/action/include/plugins/action/action.h @@ -45,7 +45,7 @@ class Action : public PluginBase { /** * @brief Possible results returned for commanded actions. * - * @note DronecodeSDK does not throw exceptions. Instead a result of this type will be + * @note Mavsdk does not throw exceptions. Instead a result of this type will be * returned when you execute actions. */ enum class Result { diff --git a/src/plugins/info/include/plugins/info/info.h b/src/plugins/info/include/plugins/info/info.h index fe74ed0c41..8c5c098fe6 100644 --- a/src/plugins/info/include/plugins/info/info.h +++ b/src/plugins/info/include/plugins/info/info.h @@ -37,7 +37,7 @@ class Info : public PluginBase { /** * @brief Possible results returned for requests. * - * @note DronecodeSDK does not throw exceptions. Instead a result of this + * @note Mavsdk does not throw exceptions. Instead a result of this * type will be returned. */ enum class Result { diff --git a/src/plugins/mission/mission_impl.cpp b/src/plugins/mission/mission_impl.cpp index d39fdf0a08..86a68c8c1c 100644 --- a/src/plugins/mission/mission_impl.cpp +++ b/src/plugins/mission/mission_impl.cpp @@ -1463,7 +1463,7 @@ Mission::Result MissionImpl::import_mission_items(Mission::mission_items_t &all_ Mission::Result result = Mission::Result::SUCCESS; auto new_mission_item = std::make_shared(); - // Iterate JSON mission items and build DronecodeSDK mission items + // Iterate JSON mission items and build Mavsdk mission items for (auto &json_mission_item : json_mission_items["items"].array_items()) { // Parameters of Mission item & MAV command of it. MAV_CMD command = static_cast(json_mission_item["command"].int_value()); diff --git a/src/plugins/offboard/include/plugins/offboard/offboard.h b/src/plugins/offboard/include/plugins/offboard/offboard.h index 3859c59754..a94ea1bd3e 100644 --- a/src/plugins/offboard/include/plugins/offboard/offboard.h +++ b/src/plugins/offboard/include/plugins/offboard/offboard.h @@ -17,7 +17,7 @@ class System; * as opposed to onboard control right inside the autopilot "board". * * Client code must specify a setpoint before starting offboard mode. - * DronecodeSDK automatically resends setpoints at 20Hz (PX4 Offboard mode requires that setpoints + * Mavsdk automatically resends setpoints at 20Hz (PX4 Offboard mode requires that setpoints * are minimally resent at 2Hz). If more precise control is required, clients can call the setpoint * methods at whatever rate is required. * From fff8b761856ff788dab84da9f7fca837ce58c69f Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 15 Jun 2019 18:54:12 +0200 Subject: [PATCH 08/15] DronecodeSDK -> MAVSDK --- .ycm_extra_conf.py | 2 +- CMakeLists.txt | 22 ++++---- Jenkinsfile | 22 ++++---- ...DKConfig.cmake.in => MAVSDKConfig.cmake.in | 4 +- README.md | 4 +- appveyor.yml | 14 +++--- docker/Dockerfile-Fedora-28 | 4 +- docker/Dockerfile-Fedora-29 | 4 +- docker/Dockerfile-Ubuntu-16.04 | 4 +- docker/Dockerfile-Ubuntu-18.04 | 4 +- docker/Dockerfile-Ubuntu-18.04-PX4-SITL | 5 +- docker/Dockerfile-backend | 4 +- docker/README.md | 14 +++--- docker/build_and_push_docker_images.sh | 50 +++++++++---------- example/battery/CMakeLists.txt | 6 +-- example/battery/battery.cpp | 6 +-- example/calibrate/CMakeLists.txt | 4 +- example/calibrate/calibrate.cpp | 4 +- example/fly_mission/CMakeLists.txt | 8 +-- example/fly_mission/fly_mission.cpp | 8 +-- example/fly_multiple_drones/CMakeLists.txt | 8 +-- .../fly_multiple_drones.cpp | 8 +-- example/fly_qgc_mission/CMakeLists.txt | 8 +-- example/fly_qgc_mission/fly_qgc_mission.cpp | 8 +-- example/follow_me/CMakeLists.txt | 8 +-- example/follow_me/follow_me.cpp | 8 +-- example/geofence_inclusion/CMakeLists.txt | 10 ++-- .../geofence_inclusion/geofence_inclusion.cpp | 10 ++-- example/multiple_drones/CMakeLists.txt | 6 +-- example/multiple_drones/multiple_drones.cpp | 6 +-- example/offboard_velocity/CMakeLists.txt | 8 +-- .../offboard_velocity/offboard_velocity.cpp | 14 +++--- example/takeoff_land/CMakeLists.txt | 6 +-- example/takeoff_land/takeoff_and_land.cpp | 6 +-- .../transition_vtol_fixed_wing/CMakeLists.txt | 6 +-- .../transition_vtol_fixed_wing.cpp | 6 +-- src/CMakeLists.txt | 10 ++-- src/backend/README.md | 2 +- src/backend/proto | 2 +- src/backend/src/CMakeLists.txt | 28 +++++------ src/backend/test/CMakeLists.txt | 12 ++--- .../test/connection_initiator_test.cpp | 2 +- src/backend/test/core_service_impl_test.cpp | 2 +- .../test/mission_service_impl_test.cpp | 6 +-- src/cmake/compiler_flags.cmake | 4 +- src/cmake/unit_tests.cmake | 8 +-- src/core/CMakeLists.txt | 20 ++++---- src/core/connection_result.h | 2 +- src/core/mavsdk.h | 3 +- src/core/mavsdk_impl.cpp | 2 +- src/core/version.h.in | 2 +- .../integration_tests/CMakeLists.txt | 4 +- .../plugins/example/CMakeLists.txt | 12 ++--- src/integration_tests/CMakeLists.txt | 30 +++++------ src/plugins/action/CMakeLists.txt | 18 +++---- src/plugins/calibration/CMakeLists.txt | 18 +++---- src/plugins/camera/CMakeLists.txt | 18 +++---- src/plugins/follow_me/CMakeLists.txt | 18 +++---- src/plugins/geofence/CMakeLists.txt | 18 +++---- src/plugins/gimbal/CMakeLists.txt | 18 +++---- src/plugins/info/CMakeLists.txt | 18 +++---- src/plugins/log_files/CMakeLists.txt | 18 +++---- src/plugins/logging/CMakeLists.txt | 12 ++--- src/plugins/logging/logging.h | 2 +- .../mavlink_passthrough/CMakeLists.txt | 20 ++++---- src/plugins/mission/CMakeLists.txt | 18 +++---- src/plugins/mission_raw/CMakeLists.txt | 18 +++---- src/plugins/offboard/CMakeLists.txt | 18 +++---- src/plugins/param/CMakeLists.txt | 18 +++---- src/plugins/telemetry/CMakeLists.txt | 18 +++---- tools/generate_docs.sh | 2 +- tools/run-docker.sh | 2 +- 72 files changed, 370 insertions(+), 372 deletions(-) rename DronecodeSDKConfig.cmake.in => MAVSDKConfig.cmake.in (71%) diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py index 89f4da6251..483e0d6884 100644 --- a/.ycm_extra_conf.py +++ b/.ycm_extra_conf.py @@ -63,7 +63,7 @@ '-I', 'core', '-I', -'core/include/dronecode_sdk', +'core/include/mavsdk', '-I', 'plugins/action/include', '-I', diff --git a/CMakeLists.txt b/CMakeLists.txt index fd13bbee4a..7c469fb133 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) -project(dronecode_sdk_superbuild) +project(mavsdk_superbuild) option(SUPERBUILD "Build dependencies" ON) option(BUILD_BACKEND "Build gRPC backend server" OFF) @@ -18,19 +18,19 @@ endif() add_subdirectory(src) -install(EXPORT dronecode-sdk-targets - FILE DronecodeSDKTargets.cmake - NAMESPACE DronecodeSDK:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DronecodeSDK +install(EXPORT mavsdk-targets + FILE MAVSDKTargets.cmake + NAMESPACE MAVSDK:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MAVSDK ) # For the build tree -configure_file(DronecodeSDKConfig.cmake.in - "${PROJECT_BINARY_DIR}/DronecodeSDKConfig.cmake" @ONLY) +configure_file(MAVSDKConfig.cmake.in + "${PROJECT_BINARY_DIR}/MAVSDKConfig.cmake" @ONLY) # For the install tree -configure_file(DronecodeSDKConfig.cmake.in - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/DronecodeSDKConfig.cmake" @ONLY) +configure_file(MAVSDKConfig.cmake.in + "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/MAVSDKConfig.cmake" @ONLY) install(FILES - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/DronecodeSDKConfig.cmake" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DronecodeSDK) + "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/MAVSDKConfig.cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MAVSDK) diff --git a/Jenkinsfile b/Jenkinsfile index 3f11c83b57..69c1c1a135 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { stage('Ubuntu 16.04 Debug') { agent { docker { - image 'dronecode/dronecode-sdk-ubuntu-16.04:2019-03-25' + image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -40,7 +40,7 @@ pipeline { stage('Ubuntu 16.04 Release') { agent { docker { - image 'dronecode/dronecode-sdk-ubuntu-16.04:2019-03-25' + image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -70,7 +70,7 @@ pipeline { stage('Ubuntu 18.04 Debug') { agent { docker { - image 'dronecode/dronecode-sdk-ubuntu-18.04:2019-03-25' + image 'mavlink/mavsdk-ubuntu-18.04:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -100,7 +100,7 @@ pipeline { stage('Ubuntu 18.04 Release') { agent { docker { - image 'dronecode/dronecode-sdk-ubuntu-18.04:2019-03-25' + image 'mavlink/mavsdk-ubuntu-18.04:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -130,7 +130,7 @@ pipeline { stage('Ubuntu 18.04 Debug PX4 SITL') { agent { docker { - image 'dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl:2019-05-15' + image 'mavlink/mavsdk-ubuntu-18.04-px4-sitl:2019-05-15' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -158,7 +158,7 @@ pipeline { stage('Fedora 27 Debug') { agent { docker { - image 'dronecode/dronecode-sdk-fedora-28:2019-03-25' + image 'mavlink/mavsdk-fedora-28:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -188,7 +188,7 @@ pipeline { stage('Fedora 27 Release') { agent { docker { - image 'dronecode/dronecode-sdk-fedora-28:2019-03-25' + image 'mavlink/mavsdk-fedora-28:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -218,7 +218,7 @@ pipeline { stage('Fedora 28 Debug') { agent { docker { - image 'dronecode/dronecode-sdk-fedora-29:2019-03-25' + image 'mavlink/mavsdk-fedora-29:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -248,7 +248,7 @@ pipeline { stage('Fedora 28 Release') { agent { docker { - image 'dronecode/dronecode-sdk-fedora-29:2019-03-25' + image 'mavlink/mavsdk-fedora-29:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -344,7 +344,7 @@ pipeline { stage('check style') { agent { docker { - image 'dronecode/dronecode-sdk-ubuntu-16.04:2019-03-25' + image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -368,7 +368,7 @@ pipeline { stage('Generate Docs') { agent { docker { - image 'dronecode/dronecode-sdk-ubuntu-16.04:2019-03-25' + image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/DronecodeSDKConfig.cmake.in b/MAVSDKConfig.cmake.in similarity index 71% rename from DronecodeSDKConfig.cmake.in rename to MAVSDKConfig.cmake.in index 3a97d4acfa..521ea8a177 100644 --- a/DronecodeSDKConfig.cmake.in +++ b/MAVSDKConfig.cmake.in @@ -15,5 +15,5 @@ if(NOT @BUILD_SHARED_LIBS@) endif() endif() -get_filename_component(DRONECODESDK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include("${DRONECODESDK_CMAKE_DIR}/DronecodeSDKTargets.cmake") +get_filename_component(MAVSDK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +include("${MAVSDK_CMAKE_DIR}/MAVSDKTargets.cmake") diff --git a/README.md b/README.md index 7d247cfaed..78084aac19 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ API consumers use `MAVSDK` class to discover and manage vehicles (`System` objec The links below take you to the respective header files: -- [dronecode_sdk](core/include/dronecode_sdk/dronecode_sdk.h): set up connection, discover devices -- [system](core/include/dronecode_sdk/system.h): an class representing one drone which can consist of multiple components +- [mavsdk](core/include/mavsdk/mavsdk.h): set up connection, discover devices +- [system](core/include/mavsdk/system.h): an class representing one drone which can consist of multiple components - [info](plugins/info/include/plugins/info/info.h): general info about a device - [telemetry](plugins/telemetry/include/plugins/telemetry/telemetry.h): to receive telemetry data - [action](plugins/action/include/plugins/action/action.h): to send commands such as arm, disarm, takeoff, land to drone diff --git a/appveyor.yml b/appveyor.yml index 7aab737e6c..ec3289fdf2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,13 +34,13 @@ init: - msbuild /version # clone directory -clone_folder: C:\dronecode_sdk +clone_folder: C:\mavsdk # scripts to run before build before_build: - if "%COMPILER%"=="mingw-64" set PATH=%PATH:C:\Program Files\Git\usr\bin;=% - if "%COMPILER%"=="mingw-64" set PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% - - cd C:\dronecode_sdk + - cd C:\mavsdk - git submodule update --init --recursive --depth 200 - cd C:\ @@ -49,16 +49,16 @@ build: on build_script: - set CL=/MP - if "%COMPILER%"=="msvc2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - - set dronecode_sdk_dir=C:\dronecode_sdk - - cd %dronecode_sdk_dir% - - cmake -DCMAKE_BUILD_TYPE="%configuration%" -G "%GENERATOR%" -DCMAKE_INSTALL_PREFIX=%dronecode_sdk_dir%\install -DBUILD_BACKEND=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_MAVLINK_PASSTHROUGH=ON -Bbuild -H. + - set mavsdk_dir=C:\mavsdk + - cd %mavsdk_dir% + - cmake -DCMAKE_BUILD_TYPE="%configuration%" -G "%GENERATOR%" -DCMAKE_INSTALL_PREFIX=%mavsdk_dir%\install -DBUILD_BACKEND=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_MAVLINK_PASSTHROUGH=ON -Bbuild -H. - cmake --build build --target install --config %configuration% - - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_PREFIX_PATH="%dronecode_sdk_dir%\install;%dronecode_sdk_dir%\build\third_party\install" -Bexample\build -Hexample + - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_PREFIX_PATH="%mavsdk_dir%\install;%mavsdk_dir%\build\third_party\install" -Bexample\build -Hexample - cmake --build example\build --config %configuration% test: on test_script: - - cd %dronecode_sdk_dir% + - cd %mavsdk_dir% - build\src\unit_tests_runner.exe - build\src\backend\test\unit_tests_backend.exe diff --git a/docker/Dockerfile-Fedora-28 b/docker/Dockerfile-Fedora-28 index a9d4534a5b..f7676c352a 100644 --- a/docker/Dockerfile-Fedora-28 +++ b/docker/Dockerfile-Fedora-28 @@ -1,5 +1,5 @@ # -# Development environment for the Dronecode SDK based on Fedora 28. +# Development environment for the MAVSDK based on Fedora 28. # # Author: Julian Oes # @@ -51,4 +51,4 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] -WORKDIR "/home/user/DronecodeSDK" +WORKDIR "/home/user/MAVSDK" diff --git a/docker/Dockerfile-Fedora-29 b/docker/Dockerfile-Fedora-29 index 9838f5c1f0..24407845e9 100644 --- a/docker/Dockerfile-Fedora-29 +++ b/docker/Dockerfile-Fedora-29 @@ -1,5 +1,5 @@ # -# Development environment for the Dronecode SDK based on Fedora 29. +# Development environment for the MAVSDK based on Fedora 29. # # Author: Julian Oes # @@ -51,4 +51,4 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] -WORKDIR "/home/user/DronecodeSDK" +WORKDIR "/home/user/MAVSDK" diff --git a/docker/Dockerfile-Ubuntu-16.04 b/docker/Dockerfile-Ubuntu-16.04 index d5f147f529..243588424b 100644 --- a/docker/Dockerfile-Ubuntu-16.04 +++ b/docker/Dockerfile-Ubuntu-16.04 @@ -1,5 +1,5 @@ # -# Development environment for the Dronecode SDK based on Ubuntu 16.04. +# Development environment for MAVSDK based on Ubuntu 16.04. # # Author: Julian Oes # @@ -61,4 +61,4 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] -WORKDIR "/home/user/DronecodeSDK" +WORKDIR "/home/user/MAVSDK" diff --git a/docker/Dockerfile-Ubuntu-18.04 b/docker/Dockerfile-Ubuntu-18.04 index 0281654755..b938dcaba2 100644 --- a/docker/Dockerfile-Ubuntu-18.04 +++ b/docker/Dockerfile-Ubuntu-18.04 @@ -1,5 +1,5 @@ # -# Development environment for the Dronecode SDK based on Ubuntu 18.04. +# Development environment for MAVSDK based on Ubuntu 18.04. # # Author: Julian Oes # @@ -57,4 +57,4 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] -WORKDIR "/home/user/DronecodeSDK" +WORKDIR "/home/user/MAVSDK" diff --git a/docker/Dockerfile-Ubuntu-18.04-PX4-SITL b/docker/Dockerfile-Ubuntu-18.04-PX4-SITL index 6168dfe49e..33e3ed410f 100644 --- a/docker/Dockerfile-Ubuntu-18.04-PX4-SITL +++ b/docker/Dockerfile-Ubuntu-18.04-PX4-SITL @@ -1,9 +1,8 @@ # -# PX4 SITL testing environment for the Dronecode SDK based on Ubuntu 18.04. -# +# PX4 SITL testing environment for MAVSDK based on Ubuntu 18.04. # Author: Julian Oes # -FROM dronecode/dronecode-sdk-ubuntu-18.04 +FROM mavlink/mavsdk-ubuntu-18.04 MAINTAINER Julian Oes ENV FIRMWARE_DIR ${WORKDIR}../Firmware diff --git a/docker/Dockerfile-backend b/docker/Dockerfile-backend index 19b4556524..a11f2e4d65 100644 --- a/docker/Dockerfile-backend +++ b/docker/Dockerfile-backend @@ -9,7 +9,7 @@ RUN apk add build-base \ linux-headers \ perl -WORKDIR /root/dronecode_sdk +WORKDIR /root/mavsdk COPY . . @@ -23,7 +23,7 @@ RUN apk add libcurl \ libstdc++ COPY --from=builder /root/dcsdk_install /usr/local -COPY --from=builder /root/dronecode_sdk/build/default/backend/src/backend_bin /root/backend_bin +COPY --from=builder /root/mavsdk/build/default/backend/src/backend_bin /root/backend_bin EXPOSE 14540/udp ENTRYPOINT /root/backend_bin diff --git a/docker/README.md b/docker/README.md index 3e343efba5..6dcb66e058 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,12 +1,12 @@ ## Building and using Docker development images. -These Dockerfiles will create a DronecodeSDK development container image based on whichever flavour of Ubuntu or Fedora you prefer. +These Dockerfiles will create a MAVSDK development container image based on whichever flavour of Ubuntu or Fedora you prefer. Docker images are built by the project and are hosted on Docker Hub. You can use them simply by : ```bash -cd /whereever/DroncodeSDK +cd /whereever/MAVSDK ./run-docker.sh ``` @@ -15,20 +15,20 @@ Should you wish to create and use your own local images, use the following. To create an image : ```bash -cd /whereever/DronecodeSDK/docker -docker build -t dronecode/dronecode-sdk-ubuntu-18.04 -f Dockerfile-Ubuntu-18.04 . +cd /whereever/MAVSDK/docker +docker build -t mavlink/mavsdk-ubuntu-18.04 -f Dockerfile-Ubuntu-18.04 . ``` To use the image : ```bash -cd /whereever/DronecodeSDK +cd /whereever/MAVSDK ./run-docker.sh ``` This will create and run a container based on your image. -/whereever/DronecodeSDK will be mounted inside the container at /home/dronecode/DronecodeSDK +/whereever/MAVSDK will be mounted inside the container at /home/user/MAVSDK ```bash -dronecode@a476023ed255:~/DronecodeSDK$ make default +user@a476023ed255:~/MAVSDK$ ``` diff --git a/docker/build_and_push_docker_images.sh b/docker/build_and_push_docker_images.sh index ed8ae691db..5915016585 100755 --- a/docker/build_and_push_docker_images.sh +++ b/docker/build_and_push_docker_images.sh @@ -2,35 +2,35 @@ set -e -docker pull dronecode/dronecode-sdk-fedora-28 -docker pull dronecode/dronecode-sdk-fedora-29 -docker pull dronecode/dronecode-sdk-ubuntu-16.04 -docker pull dronecode/dronecode-sdk-ubuntu-18.04 -docker pull dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl +docker pull mavlink/mavsdk-fedora-28 +docker pull mavlink/mavsdk-fedora-29 +docker pull mavlink/mavsdk-ubuntu-16.04 +docker pull mavlink/mavsdk-ubuntu-18.04 +docker pull mavlink/mavsdk-ubuntu-18.04-px4-sitl -docker build -f Dockerfile-Fedora-28 -t dronecode/dronecode-sdk-fedora-28 . -docker build -f Dockerfile-Fedora-29 -t dronecode/dronecode-sdk-fedora-29 . -docker build -f Dockerfile-Ubuntu-16.04 -t dronecode/dronecode-sdk-ubuntu-16.04 . -docker build -f Dockerfile-Ubuntu-18.04 -t dronecode/dronecode-sdk-ubuntu-18.04 . -docker build -f Dockerfile-Ubuntu-18.04-PX4-SITL -t dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl . +docker build -f Dockerfile-Fedora-28 -t mavlink/mavsdk-fedora-28 . +docker build -f Dockerfile-Fedora-29 -t mavlink/mavsdk-fedora-29 . +docker build -f Dockerfile-Ubuntu-16.04 -t mavlink/mavsdk-ubuntu-16.04 . +docker build -f Dockerfile-Ubuntu-18.04 -t mavlink/mavsdk-ubuntu-18.04 . +docker build -f Dockerfile-Ubuntu-18.04-PX4-SITL -t mavlink/mavsdk-ubuntu-18.04-px4-sitl . DATE=`date +%Y-%m-%d` -docker tag dronecode/dronecode-sdk-fedora-28:latest dronecode/dronecode-sdk-fedora-28:$DATE -docker tag dronecode/dronecode-sdk-fedora-29:latest dronecode/dronecode-sdk-fedora-29:$DATE -docker tag dronecode/dronecode-sdk-ubuntu-16.04:latest dronecode/dronecode-sdk-ubuntu-16.04:$DATE -docker tag dronecode/dronecode-sdk-ubuntu-18.04:latest dronecode/dronecode-sdk-ubuntu-18.04:$DATE -docker tag dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl:latest dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl:$DATE +docker tag mavlink/mavsdk-fedora-28:latest mavlink/mavsdk-fedora-28:$DATE +docker tag mavlink/mavsdk-fedora-29:latest mavlink/mavsdk-fedora-29:$DATE +docker tag mavlink/mavsdk-ubuntu-16.04:latest mavlink/mavsdk-ubuntu-16.04:$DATE +docker tag mavlink/mavsdk-ubuntu-18.04:latest mavlink/mavsdk-ubuntu-18.04:$DATE +docker tag mavlink/mavsdk-ubuntu-18.04-px4-sitl:latest mavlink/mavsdk-ubuntu-18.04-px4-sitl:$DATE -docker push dronecode/dronecode-sdk-fedora-28:latest -docker push dronecode/dronecode-sdk-fedora-28:$DATE -docker push dronecode/dronecode-sdk-fedora-29:latest -docker push dronecode/dronecode-sdk-fedora-29:$DATE -docker push dronecode/dronecode-sdk-ubuntu-16.04:latest -docker push dronecode/dronecode-sdk-ubuntu-16.04:$DATE -docker push dronecode/dronecode-sdk-ubuntu-18.04:latest -docker push dronecode/dronecode-sdk-ubuntu-18.04:$DATE -docker push dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl:latest -docker push dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl:$DATE +docker push mavlink/mavsdk-fedora-28:latest +docker push mavlink/mavsdk-fedora-28:$DATE +docker push mavlink/mavsdk-fedora-29:latest +docker push mavlink/mavsdk-fedora-29:$DATE +docker push mavlink/mavsdk-ubuntu-16.04:latest +docker push mavlink/mavsdk-ubuntu-16.04:$DATE +docker push mavlink/mavsdk-ubuntu-18.04:latest +docker push mavlink/mavsdk-ubuntu-18.04:$DATE +docker push mavlink/mavsdk-ubuntu-18.04-px4-sitl:latest +docker push mavlink/mavsdk-ubuntu-18.04-px4-sitl:$DATE echo "Please update tag in Jenkinsfile to '$DATE'" diff --git a/example/battery/CMakeLists.txt b/example/battery/CMakeLists.txt index 8e250c8abf..b58d244581 100644 --- a/example/battery/CMakeLists.txt +++ b/example/battery/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable(battery ) target_link_libraries(battery - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk_mavlink_passthrough - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk_mavlink_passthrough + DronecodeSDK::mavsdk ) diff --git a/example/battery/battery.cpp b/example/battery/battery.cpp index 2aa0c5548f..ca319fd7f3 100644 --- a/example/battery/battery.cpp +++ b/example/battery/battery.cpp @@ -3,9 +3,9 @@ // // Author: Julian Oes -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/example/calibrate/CMakeLists.txt b/example/calibrate/CMakeLists.txt index a0b18da879..a14c1ccbe8 100644 --- a/example/calibrate/CMakeLists.txt +++ b/example/calibrate/CMakeLists.txt @@ -17,8 +17,8 @@ add_executable(calibrate ) target_link_libraries(calibrate - DronecodeSDK::dronecode_sdk_calibration - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_calibration + DronecodeSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/calibrate/calibrate.cpp b/example/calibrate/calibrate.cpp index 79abef94a8..9b4e95aefd 100644 --- a/example/calibrate/calibrate.cpp +++ b/example/calibrate/calibrate.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include diff --git a/example/fly_mission/CMakeLists.txt b/example/fly_mission/CMakeLists.txt index c4b5f90d1c..2d834bded0 100644 --- a/example/fly_mission/CMakeLists.txt +++ b/example/fly_mission/CMakeLists.txt @@ -17,9 +17,9 @@ add_executable(fly_mission ) target_link_libraries(fly_mission - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk_mission - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk_mission + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/fly_mission/fly_mission.cpp b/example/fly_mission/fly_mission.cpp index 642ac877ef..656b3b666b 100644 --- a/example/fly_mission/fly_mission.cpp +++ b/example/fly_mission/fly_mission.cpp @@ -13,10 +13,10 @@ * @date 2017-09-06 */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/example/fly_multiple_drones/CMakeLists.txt b/example/fly_multiple_drones/CMakeLists.txt index 1387aa5fb3..4fd0fbe781 100644 --- a/example/fly_multiple_drones/CMakeLists.txt +++ b/example/fly_multiple_drones/CMakeLists.txt @@ -17,9 +17,9 @@ add_executable(fly_multiple_drones ) target_link_libraries(fly_multiple_drones - DronecodeSDK::dronecode_sdk - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk_mission - DronecodeSDK::dronecode_sdk_action + DronecodeSDK::mavsdk + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk_mission + DronecodeSDK::mavsdk_action ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/fly_multiple_drones/fly_multiple_drones.cpp b/example/fly_multiple_drones/fly_multiple_drones.cpp index df7471d228..6c2751e33a 100644 --- a/example/fly_multiple_drones/fly_multiple_drones.cpp +++ b/example/fly_multiple_drones/fly_multiple_drones.cpp @@ -9,10 +9,10 @@ Author: Shayaan Haider (via Slack) Author: Shusil Shapkota (Air Matrix) */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/example/fly_qgc_mission/CMakeLists.txt b/example/fly_qgc_mission/CMakeLists.txt index 213eb69118..fcec8dd620 100644 --- a/example/fly_qgc_mission/CMakeLists.txt +++ b/example/fly_qgc_mission/CMakeLists.txt @@ -15,8 +15,8 @@ add_executable(fly_qgc_mission ) target_link_libraries(fly_qgc_mission - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk_mission - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk_mission + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk ) diff --git a/example/fly_qgc_mission/fly_qgc_mission.cpp b/example/fly_qgc_mission/fly_qgc_mission.cpp index 4ec57a8861..8fccf1baf1 100644 --- a/example/fly_qgc_mission/fly_qgc_mission.cpp +++ b/example/fly_qgc_mission/fly_qgc_mission.cpp @@ -24,10 +24,10 @@ * @date 2018-02-04 */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/example/follow_me/CMakeLists.txt b/example/follow_me/CMakeLists.txt index f59851ec90..260488d57d 100644 --- a/example/follow_me/CMakeLists.txt +++ b/example/follow_me/CMakeLists.txt @@ -18,9 +18,9 @@ add_executable(follow_me ) target_link_libraries(follow_me - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk_follow_me - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk_follow_me + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/follow_me/follow_me.cpp b/example/follow_me/follow_me.cpp index bce9b6baf8..a7149a297e 100644 --- a/example/follow_me/follow_me.cpp +++ b/example/follow_me/follow_me.cpp @@ -11,10 +11,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/example/geofence_inclusion/CMakeLists.txt b/example/geofence_inclusion/CMakeLists.txt index 37e9e6145a..bd106b8127 100644 --- a/example/geofence_inclusion/CMakeLists.txt +++ b/example/geofence_inclusion/CMakeLists.txt @@ -15,9 +15,9 @@ add_executable(geofence_inclusion ) target_link_libraries(geofence_inclusion - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk_mission - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk_geofence - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk_mission + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk_geofence + DronecodeSDK::mavsdk ) diff --git a/example/geofence_inclusion/geofence_inclusion.cpp b/example/geofence_inclusion/geofence_inclusion.cpp index 4dedce257a..f946654445 100644 --- a/example/geofence_inclusion/geofence_inclusion.cpp +++ b/example/geofence_inclusion/geofence_inclusion.cpp @@ -10,11 +10,11 @@ * @date 2019-05-09 */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/example/multiple_drones/CMakeLists.txt b/example/multiple_drones/CMakeLists.txt index 5b8f0cc2a9..aa3f11d77b 100644 --- a/example/multiple_drones/CMakeLists.txt +++ b/example/multiple_drones/CMakeLists.txt @@ -17,8 +17,8 @@ add_executable(multiple_drones ) target_link_libraries(multiple_drones - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/multiple_drones/multiple_drones.cpp b/example/multiple_drones/multiple_drones.cpp index a31b874f4b..665adbf30f 100644 --- a/example/multiple_drones/multiple_drones.cpp +++ b/example/multiple_drones/multiple_drones.cpp @@ -5,9 +5,9 @@ // Author: Julian Oes // Author: Shayaan Haider (via Slack) -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/example/offboard_velocity/CMakeLists.txt b/example/offboard_velocity/CMakeLists.txt index d952a9e995..56fcc5ffe3 100644 --- a/example/offboard_velocity/CMakeLists.txt +++ b/example/offboard_velocity/CMakeLists.txt @@ -20,8 +20,8 @@ add_executable(offboard ) target_link_libraries(offboard - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk_offboard - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk_offboard + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk ) diff --git a/example/offboard_velocity/offboard_velocity.cpp b/example/offboard_velocity/offboard_velocity.cpp index b6ee1a6b5c..188cb6c2e1 100644 --- a/example/offboard_velocity/offboard_velocity.cpp +++ b/example/offboard_velocity/offboard_velocity.cpp @@ -12,10 +12,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace mavsdk; using std::this_thread::sleep_for; @@ -67,7 +67,7 @@ inline void offboard_log(const std::string &offb_mode, const std::string msg) * * returns true if everything went well in Offboard control, exits with a log otherwise. */ -bool offb_ctrl_ned(std::shared_ptr offboard) +bool offb_ctrl_ned(std::shared_ptr offboard) { const std::string offb_mode = "NED"; // Send it once before starting offboard, otherwise it will be rejected. @@ -119,7 +119,7 @@ bool offb_ctrl_ned(std::shared_ptr offboard) * * returns true if everything went well in Offboard control, exits with a log otherwise. */ -bool offb_ctrl_body(std::shared_ptr offboard) +bool offb_ctrl_body(std::shared_ptr offboard) { const std::string offb_mode = "BODY"; @@ -170,7 +170,7 @@ bool offb_ctrl_body(std::shared_ptr offboard) * * returns true if everything went well in Offboard control, exits with a log otherwise. */ -bool offb_ctrl_attitude(std::shared_ptr offboard) +bool offb_ctrl_attitude(std::shared_ptr offboard) { const std::string offb_mode = "ATTITUDE"; diff --git a/example/takeoff_land/CMakeLists.txt b/example/takeoff_land/CMakeLists.txt index b5106266c1..dd9ec44d25 100644 --- a/example/takeoff_land/CMakeLists.txt +++ b/example/takeoff_land/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(takeoff_and_land ) target_link_libraries(takeoff_and_land - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk ) diff --git a/example/takeoff_land/takeoff_and_land.cpp b/example/takeoff_land/takeoff_and_land.cpp index 403aef85bd..53f1625586 100644 --- a/example/takeoff_land/takeoff_and_land.cpp +++ b/example/takeoff_land/takeoff_and_land.cpp @@ -5,9 +5,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/example/transition_vtol_fixed_wing/CMakeLists.txt b/example/transition_vtol_fixed_wing/CMakeLists.txt index 09889212da..298cbc747c 100644 --- a/example/transition_vtol_fixed_wing/CMakeLists.txt +++ b/example/transition_vtol_fixed_wing/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(transition_vtol_fixed_wing ) target_link_libraries(transition_vtol_fixed_wing - DronecodeSDK::dronecode_sdk_action - DronecodeSDK::dronecode_sdk_telemetry - DronecodeSDK::dronecode_sdk + DronecodeSDK::mavsdk_action + DronecodeSDK::mavsdk_telemetry + DronecodeSDK::mavsdk ) diff --git a/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp b/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp index 51b57febd0..a540e9fb48 100644 --- a/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp +++ b/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp @@ -3,9 +3,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include using std::this_thread::sleep_for; using std::chrono::seconds; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9935c735b6..50184a047c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 11) cmake_policy(SET CMP0025 NEW) -project(dronecode_sdk) +project(mavsdk) # ccache option(CCACHE "Use ccache if available" ON) @@ -56,8 +56,8 @@ else() set(lib_path "lib") endif() -set(dronecode_sdk_install_include_dir "include/dronecode_sdk") -set(dronecode_sdk_install_lib_dir ${lib_path}) +set(mavsdk_install_include_dir "include/mavsdk") +set(mavsdk_install_lib_dir ${lib_path}) execute_process( COMMAND git describe --abbrev=8 --dirty --always --tags @@ -95,7 +95,7 @@ if(BUILD_TESTS) endif() if (BUILD_BACKEND) - message(STATUS "Building dronecode_sdk server") + message(STATUS "Building mavsdk server") add_subdirectory(backend) else() message(STATUS "BUILD_BACKEND not set: not building grpc backend") @@ -109,6 +109,6 @@ if (DROP_DEBUG EQUAL 1) ) target_link_libraries(drop_debug - dronecode_sdk + mavsdk ) endif() diff --git a/src/backend/README.md b/src/backend/README.md index e4bbe934d2..2af8693bc5 100644 --- a/src/backend/README.md +++ b/src/backend/README.md @@ -1,4 +1,4 @@ -# Dronecode SDK with GRPC +# MAVSDK with GRPC ### Build with backend diff --git a/src/backend/proto b/src/backend/proto index 3385c8b9b4..6464818789 160000 --- a/src/backend/proto +++ b/src/backend/proto @@ -1 +1 @@ -Subproject commit 3385c8b9b411bfe47df95c7c9e10bb7930ee5298 +Subproject commit 6464818789db1388c266e144489bfc9856fd0ef6 diff --git a/src/backend/src/CMakeLists.txt b/src/backend/src/CMakeLists.txt index 5d47adfeb6..d7d2d0f83f 100644 --- a/src/backend/src/CMakeLists.txt +++ b/src/backend/src/CMakeLists.txt @@ -40,16 +40,16 @@ endif() target_link_libraries(backend PRIVATE - dronecode_sdk_action - dronecode_sdk_calibration - dronecode_sdk_gimbal - dronecode_sdk_camera - dronecode_sdk_mission - dronecode_sdk_offboard - dronecode_sdk_telemetry - dronecode_sdk_info - dronecode_sdk_param - dronecode_sdk + mavsdk_action + mavsdk_calibration + mavsdk_gimbal + mavsdk_camera + mavsdk_mission + mavsdk_offboard + mavsdk_telemetry + mavsdk_info + mavsdk_param + mavsdk gRPC::grpc++ ${COMPONENTS_PROTOGENS} ) @@ -80,23 +80,23 @@ else() target_link_libraries(backend_bin backend - dronecode_sdk + mavsdk ) install(TARGETS backend_bin - EXPORT dronecode-sdk-targets + EXPORT mavsdk-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) if(BUILD_SHARED_LIBS) install(TARGETS backend - EXPORT dronecode-sdk-targets + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES backend_api.h - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/backend" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/backend" ) endif() endif() diff --git a/src/backend/test/CMakeLists.txt b/src/backend/test/CMakeLists.txt index b5bbfa6792..3cb9c26b2d 100644 --- a/src/backend/test/CMakeLists.txt +++ b/src/backend/test/CMakeLists.txt @@ -30,12 +30,12 @@ target_include_directories(unit_tests_backend target_link_libraries(unit_tests_backend backend - dronecode_sdk_action - dronecode_sdk_camera - dronecode_sdk_info - dronecode_sdk_mission - dronecode_sdk_offboard - dronecode_sdk_telemetry + mavsdk_action + mavsdk_camera + mavsdk_info + mavsdk_mission + mavsdk_offboard + mavsdk_telemetry gRPC::grpc++ gtest gmock diff --git a/src/backend/test/connection_initiator_test.cpp b/src/backend/test/connection_initiator_test.cpp index b13e662666..ef27eb3b94 100644 --- a/src/backend/test/connection_initiator_test.cpp +++ b/src/backend/test/connection_initiator_test.cpp @@ -2,7 +2,7 @@ #include #include "connection_initiator.h" -#include "mocks/dronecode_sdk_mock.h" +#include "mocks/mavsdk_mock.h" namespace { diff --git a/src/backend/test/core_service_impl_test.cpp b/src/backend/test/core_service_impl_test.cpp index ff72ce502c..8effe97ad7 100644 --- a/src/backend/test/core_service_impl_test.cpp +++ b/src/backend/test/core_service_impl_test.cpp @@ -7,7 +7,7 @@ #include #include "core/core_service_impl.h" -#include "core/mocks/dronecode_sdk_mock.h" +#include "core/mocks/mavsdk_mock.h" namespace { diff --git a/src/backend/test/mission_service_impl_test.cpp b/src/backend/test/mission_service_impl_test.cpp index 60f4c528af..d9c4ed621a 100644 --- a/src/backend/test/mission_service_impl_test.cpp +++ b/src/backend/test/mission_service_impl_test.cpp @@ -13,7 +13,7 @@ namespace { -namespace dc = dronecode_sdk; +namespace dc = mavsdk; namespace rpc = mavsdk::rpc::mission; using testing::_; @@ -156,7 +156,7 @@ class MissionServiceImplUploadTest : public MissionServiceImplTestBase { protected: /** * Uploads the mission and saves the result callback together with the actual list of items - * that are sent to dronecode_sdk. The result callback is saved in _result_callback, and the + * that are sent to mavsdk. The result callback is saved in _result_callback, and the * mission items are saved in _uploaded_mission. */ std::future uploadMissionAndSaveParams(std::shared_ptr request, @@ -173,7 +173,7 @@ class MissionServiceImplUploadTest : public MissionServiceImplTestBase { void checkItemsAreUploadedCorrectly(std::vector> &mission_items); - /* Captures the actual mission sent to dronecode_sdk by the backend. */ + /* Captures the actual mission sent to mavsdk by the backend. */ std::vector> _uploaded_mission{}; }; diff --git a/src/cmake/compiler_flags.cmake b/src/cmake/compiler_flags.cmake index 333d3223b1..389369a6d3 100644 --- a/src/cmake/compiler_flags.cmake +++ b/src/cmake/compiler_flags.cmake @@ -7,8 +7,8 @@ if(MSVC) set(warnings "-WX -W2") set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - # We need this so Windows links to e.g. dronecode_sdk_telemetry.dll. - # Without this option it will look for dronecode_sdk_telemetry.lib and fail. + # We need this so Windows links to e.g. mavsdk_telemetry.dll. + # Without this option it will look for mavsdk_telemetry.lib and fail. option(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS "Export all symbols on Windows" ON) if(NOT BUILD_SHARED_LIBS) diff --git a/src/cmake/unit_tests.cmake b/src/cmake/unit_tests.cmake index a1923c6589..53fa1790f1 100644 --- a/src/cmake/unit_tests.cmake +++ b/src/cmake/unit_tests.cmake @@ -12,10 +12,10 @@ set_target_properties(unit_tests_runner ) target_link_libraries(unit_tests_runner - dronecode_sdk - dronecode_sdk_mission - dronecode_sdk_camera - dronecode_sdk_calibration + mavsdk + mavsdk_mission + mavsdk_camera + mavsdk_calibration CURL::libcurl tinyxml2::tinyxml2 gtest diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7746da593e..512cac094e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( configure_file(version.h.in version.h) -add_library(dronecode_sdk +add_library(mavsdk call_every_handler.cpp connection.cpp curl_wrapper.cpp @@ -30,7 +30,7 @@ add_library(dronecode_sdk thread_pool.cpp ) -target_link_libraries(dronecode_sdk +target_link_libraries(mavsdk PRIVATE tinyxml2::tinyxml2 CURL::libcurl @@ -38,7 +38,7 @@ target_link_libraries(dronecode_sdk ) if (IOS) - target_link_libraries(dronecode_sdk + target_link_libraries(mavsdk PUBLIC "-framework Foundation" "-framework Security" @@ -47,30 +47,30 @@ endif() # Link to Windows networking lib. if (MSVC OR MINGW) - target_link_libraries(dronecode_sdk + target_link_libraries(mavsdk PRIVATE ws2_32 ) endif() if(ANDROID) - target_link_libraries(dronecode_sdk + target_link_libraries(mavsdk PRIVATE log ) endif() -set_target_properties(dronecode_sdk +set_target_properties(mavsdk PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk PUBLIC +target_include_directories(mavsdk PUBLIC $ $ ) -install(TARGETS dronecode_sdk - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) @@ -80,7 +80,7 @@ install(FILES system.h mavsdk.h plugin_base.h - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mavsdk" ) list(APPEND UNIT_TEST_SOURCES diff --git a/src/core/connection_result.h b/src/core/connection_result.h index 936bde61b8..cc6ab5a418 100644 --- a/src/core/connection_result.h +++ b/src/core/connection_result.h @@ -1,7 +1,7 @@ #pragma once /** - * @brief Namespace for all dronecode_sdk types. + * @brief Namespace for all mavsdk types. */ namespace mavsdk { diff --git a/src/core/mavsdk.h b/src/core/mavsdk.h index f5e630723d..d2156c7cf1 100644 --- a/src/core/mavsdk.h +++ b/src/core/mavsdk.h @@ -14,8 +14,7 @@ class MavsdkImpl; class System; /** - * @brief This is the main class of Dronecode SDK (a MAVLink API Library for the Dronecode - Platform). + * @brief This is the main class of MAVSDK (a MAVLink API Library). * It is used to discover vehicles and manage active connections. * diff --git a/src/core/mavsdk_impl.cpp b/src/core/mavsdk_impl.cpp index 4b40c3c6e0..d903c79623 100644 --- a/src/core/mavsdk_impl.cpp +++ b/src/core/mavsdk_impl.cpp @@ -22,7 +22,7 @@ MavsdkImpl::MavsdkImpl() : _on_discover_callback(nullptr), _on_timeout_callback(nullptr) { - LogInfo() << "Mavsdk version: " << dronecode_sdk_version; + LogInfo() << "Mavsdk version: " << mavsdk_version; } MavsdkImpl::~MavsdkImpl() diff --git a/src/core/version.h.in b/src/core/version.h.in index 3ad11fa76f..f140603352 100644 --- a/src/core/version.h.in +++ b/src/core/version.h.in @@ -2,6 +2,6 @@ namespace mavsdk { -constexpr auto dronecode_sdk_version = "@VERSION_STR@"; +constexpr auto mavsdk_version = "@VERSION_STR@"; } // namespace mavsdk diff --git a/src/external_example/integration_tests/CMakeLists.txt b/src/external_example/integration_tests/CMakeLists.txt index 8660ca8339..0babec5b12 100644 --- a/src/external_example/integration_tests/CMakeLists.txt +++ b/src/external_example/integration_tests/CMakeLists.txt @@ -13,8 +13,8 @@ include_directories( ) target_link_libraries(external_example_integration_tests_runner - dronecode_sdk - dronecode_sdk_example + mavsdk + mavsdk_example gtest gtest_main gmock diff --git a/src/external_example/plugins/example/CMakeLists.txt b/src/external_example/plugins/example/CMakeLists.txt index 187f403bed..3d994fe221 100644 --- a/src/external_example/plugins/example/CMakeLists.txt +++ b/src/external_example/plugins/example/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(dronecode_sdk_example SHARED +add_library(mavsdk_example SHARED example.cpp example_impl.cpp ) @@ -8,15 +8,15 @@ include_directories( SYSTEM ${PROJECT_SOURCE_DIR}/third_party/mavlink/include ) -target_link_libraries(dronecode_sdk_example - dronecode_sdk +target_link_libraries(mavsdk_example + mavsdk ) install(FILES example.h - DESTINATION ${dronecode_sdk_install_include_dir} + DESTINATION ${mavsdk_install_include_dir} ) -install(TARGETS dronecode_sdk_example - DESTINATION ${dronecode_sdk_install_lib_dir} +install(TARGETS mavsdk_example + DESTINATION ${mavsdk_install_lib_dir} ) diff --git a/src/integration_tests/CMakeLists.txt b/src/integration_tests/CMakeLists.txt index a745885eaa..81832fa4b9 100644 --- a/src/integration_tests/CMakeLists.txt +++ b/src/integration_tests/CMakeLists.txt @@ -14,7 +14,7 @@ if (ENABLE_MAVLINK_PASSTHROUGH) set(additional_sources mavlink_passthrough.cpp mission_transfer_lossy.cpp) - set(additional_libs "dronecode_sdk_mavlink_passthrough") + set(additional_libs "mavsdk_mavlink_passthrough") endif() # This includes all GTests that run integration tests @@ -72,20 +72,20 @@ set_target_properties(integration_tests_runner ) target_link_libraries(integration_tests_runner - dronecode_sdk - dronecode_sdk_telemetry - dronecode_sdk_action - dronecode_sdk_mission - dronecode_sdk_mission_raw - dronecode_sdk_offboard - dronecode_sdk_log_files - dronecode_sdk_info - dronecode_sdk_gimbal - dronecode_sdk_follow_me - dronecode_sdk_camera - dronecode_sdk_calibration - dronecode_sdk_geofence - dronecode_sdk_param + mavsdk + mavsdk_telemetry + mavsdk_action + mavsdk_mission + mavsdk_mission_raw + mavsdk_offboard + mavsdk_log_files + mavsdk_info + mavsdk_gimbal + mavsdk_follow_me + mavsdk_camera + mavsdk_calibration + mavsdk_geofence + mavsdk_param ${additional_libs} gtest gtest_main diff --git a/src/plugins/action/CMakeLists.txt b/src/plugins/action/CMakeLists.txt index 8ce84c29ec..519a440a5b 100644 --- a/src/plugins/action/CMakeLists.txt +++ b/src/plugins/action/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_action +add_library(mavsdk_action action.cpp action_impl.cpp ) -target_link_libraries(dronecode_sdk_action - dronecode_sdk +target_link_libraries(mavsdk_action + mavsdk ) -set_target_properties(dronecode_sdk_action +set_target_properties(mavsdk_action PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_action PUBLIC +target_include_directories(mavsdk_action PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_action - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_action + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/action/action.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/action + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/action ) diff --git a/src/plugins/calibration/CMakeLists.txt b/src/plugins/calibration/CMakeLists.txt index 3683bd6ca7..d8f6ca1ffc 100644 --- a/src/plugins/calibration/CMakeLists.txt +++ b/src/plugins/calibration/CMakeLists.txt @@ -1,31 +1,31 @@ -add_library(dronecode_sdk_calibration +add_library(mavsdk_calibration calibration.cpp calibration_impl.cpp calibration_statustext_parser.cpp ) -target_link_libraries(dronecode_sdk_calibration - dronecode_sdk +target_link_libraries(mavsdk_calibration + mavsdk ) -set_target_properties(dronecode_sdk_calibration +set_target_properties(mavsdk_calibration PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_calibration PUBLIC +target_include_directories(mavsdk_calibration PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_calibration - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_calibration + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/calibration/calibration.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/calibration + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/calibration ) list(APPEND UNIT_TEST_SOURCES diff --git a/src/plugins/camera/CMakeLists.txt b/src/plugins/camera/CMakeLists.txt index 98ad922465..25a94b7eb0 100644 --- a/src/plugins/camera/CMakeLists.txt +++ b/src/plugins/camera/CMakeLists.txt @@ -11,39 +11,39 @@ if(NOT MSVC AND NOT MINGW) include_directories(${RSC_H_DIR}) endif() -add_library(dronecode_sdk_camera +add_library(mavsdk_camera camera.cpp camera_impl.cpp camera_definition.cpp ${RSC_CPP_FILE} ) -target_link_libraries(dronecode_sdk_camera +target_link_libraries(mavsdk_camera PUBLIC - dronecode_sdk + mavsdk PRIVATE tinyxml2::tinyxml2 CURL::libcurl ) -set_target_properties(dronecode_sdk_camera +set_target_properties(mavsdk_camera PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_camera PUBLIC +target_include_directories(mavsdk_camera PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_camera - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_camera + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/camera/camera.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/camera + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/camera ) list(APPEND UNIT_TEST_SOURCES diff --git a/src/plugins/follow_me/CMakeLists.txt b/src/plugins/follow_me/CMakeLists.txt index 24a24a618e..d70486dc6c 100644 --- a/src/plugins/follow_me/CMakeLists.txt +++ b/src/plugins/follow_me/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_follow_me +add_library(mavsdk_follow_me follow_me.cpp follow_me_impl.cpp ) -target_link_libraries(dronecode_sdk_follow_me - dronecode_sdk +target_link_libraries(mavsdk_follow_me + mavsdk ) -set_target_properties(dronecode_sdk_follow_me +set_target_properties(mavsdk_follow_me PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_follow_me PUBLIC +target_include_directories(mavsdk_follow_me PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_follow_me - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_follow_me + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/follow_me/follow_me.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/follow_me + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/follow_me ) diff --git a/src/plugins/geofence/CMakeLists.txt b/src/plugins/geofence/CMakeLists.txt index 1cdf876445..97131dc739 100644 --- a/src/plugins/geofence/CMakeLists.txt +++ b/src/plugins/geofence/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_geofence +add_library(mavsdk_geofence geofence.cpp geofence_impl.cpp ) -target_link_libraries(dronecode_sdk_geofence - dronecode_sdk +target_link_libraries(mavsdk_geofence + mavsdk ) -set_target_properties(dronecode_sdk_geofence +set_target_properties(mavsdk_geofence PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_geofence PUBLIC +target_include_directories(mavsdk_geofence PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_geofence - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_geofence + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/geofence/geofence.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/geofence + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/geofence ) diff --git a/src/plugins/gimbal/CMakeLists.txt b/src/plugins/gimbal/CMakeLists.txt index c2520c0464..2bf8887917 100644 --- a/src/plugins/gimbal/CMakeLists.txt +++ b/src/plugins/gimbal/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_gimbal +add_library(mavsdk_gimbal gimbal.cpp gimbal_impl.cpp ) -target_link_libraries(dronecode_sdk_gimbal - dronecode_sdk +target_link_libraries(mavsdk_gimbal + mavsdk ) -set_target_properties(dronecode_sdk_gimbal +set_target_properties(mavsdk_gimbal PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_gimbal PUBLIC +target_include_directories(mavsdk_gimbal PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_gimbal - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_gimbal + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/gimbal/gimbal.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/gimbal + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/gimbal ) diff --git a/src/plugins/info/CMakeLists.txt b/src/plugins/info/CMakeLists.txt index 310866a0c5..262b02e1ca 100644 --- a/src/plugins/info/CMakeLists.txt +++ b/src/plugins/info/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_info +add_library(mavsdk_info info.cpp info_impl.cpp ) -target_link_libraries(dronecode_sdk_info - dronecode_sdk +target_link_libraries(mavsdk_info + mavsdk ) -set_target_properties(dronecode_sdk_info +set_target_properties(mavsdk_info PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_info PUBLIC +target_include_directories(mavsdk_info PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_info - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_info + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/info/info.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/info + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/info ) diff --git a/src/plugins/log_files/CMakeLists.txt b/src/plugins/log_files/CMakeLists.txt index bc82f9672c..80acf5f3f8 100644 --- a/src/plugins/log_files/CMakeLists.txt +++ b/src/plugins/log_files/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_log_files +add_library(mavsdk_log_files log_files.cpp log_files_impl.cpp ) -target_link_libraries(dronecode_sdk_log_files - dronecode_sdk +target_link_libraries(mavsdk_log_files + mavsdk ) -set_target_properties(dronecode_sdk_log_files +set_target_properties(mavsdk_log_files PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_log_files PUBLIC +target_include_directories(mavsdk_log_files PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_log_files - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_log_files + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/log_files/log_files.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/log_files + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/log_files ) diff --git a/src/plugins/logging/CMakeLists.txt b/src/plugins/logging/CMakeLists.txt index 09f4fc6cf0..50b5d3d333 100644 --- a/src/plugins/logging/CMakeLists.txt +++ b/src/plugins/logging/CMakeLists.txt @@ -1,18 +1,18 @@ -add_library(dronecode_sdk_logging +add_library(mavsdk_logging logging.cpp logging_impl.cpp ) -target_link_libraries(dronecode_sdk_logging - dronecode_sdk +target_link_libraries(mavsdk_logging + mavsdk ) -set_target_properties(dronecode_sdk_logging +set_target_properties(mavsdk_logging PROPERTIES COMPILE_FLAGS ${warnings} ) -install(TARGETS dronecode_sdk_logging - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_logging + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) diff --git a/src/plugins/logging/logging.h b/src/plugins/logging/logging.h index 617a091f54..d445bd240b 100644 --- a/src/plugins/logging/logging.h +++ b/src/plugins/logging/logging.h @@ -3,7 +3,7 @@ #include #include -#include +#include namespace mavsdk { diff --git a/src/plugins/mavlink_passthrough/CMakeLists.txt b/src/plugins/mavlink_passthrough/CMakeLists.txt index dc2a4490c2..d0a4740cbe 100644 --- a/src/plugins/mavlink_passthrough/CMakeLists.txt +++ b/src/plugins/mavlink_passthrough/CMakeLists.txt @@ -1,33 +1,33 @@ -add_library(dronecode_sdk_mavlink_passthrough +add_library(mavsdk_mavlink_passthrough mavlink_passthrough.cpp mavlink_passthrough_impl.cpp ) -target_link_libraries(dronecode_sdk_mavlink_passthrough - dronecode_sdk +target_link_libraries(mavsdk_mavlink_passthrough + mavsdk ) -set_target_properties(dronecode_sdk_mavlink_passthrough +set_target_properties(mavsdk_mavlink_passthrough PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_mavlink_passthrough PUBLIC +target_include_directories(mavsdk_mavlink_passthrough PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_mavlink_passthrough - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_mavlink_passthrough + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/mavlink_passthrough/mavlink_passthrough.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/mavlink_passthrough + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mavlink_passthrough ) install(DIRECTORY ../../third_party/mavlink/include/mavlink - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/mavlink_passthrough + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mavlink_passthrough ) diff --git a/src/plugins/mission/CMakeLists.txt b/src/plugins/mission/CMakeLists.txt index a82a570840..dee0c6f59f 100644 --- a/src/plugins/mission/CMakeLists.txt +++ b/src/plugins/mission/CMakeLists.txt @@ -1,6 +1,6 @@ find_package(json11 REQUIRED) -add_library(dronecode_sdk_mission +add_library(mavsdk_mission mission.cpp mission_impl.cpp mission_item.cpp @@ -11,24 +11,24 @@ include_directories( ${PROJECT_SOURCE_DIR}/core ) -set_target_properties(dronecode_sdk_mission +set_target_properties(mavsdk_mission PROPERTIES COMPILE_FLAGS ${warnings} ) -target_link_libraries(dronecode_sdk_mission +target_link_libraries(mavsdk_mission PUBLIC - dronecode_sdk + mavsdk PRIVATE json11::json11 ) -target_include_directories(dronecode_sdk_mission PUBLIC +target_include_directories(mavsdk_mission PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_mission - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_mission + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) @@ -36,7 +36,7 @@ install(TARGETS dronecode_sdk_mission install(FILES include/plugins/mission/mission.h include/plugins/mission/mission_item.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/mission + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mission ) list(APPEND UNIT_TEST_SOURCES diff --git a/src/plugins/mission_raw/CMakeLists.txt b/src/plugins/mission_raw/CMakeLists.txt index 48b062c847..1eafa865d2 100644 --- a/src/plugins/mission_raw/CMakeLists.txt +++ b/src/plugins/mission_raw/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(dronecode_sdk_mission_raw +add_library(mavsdk_mission_raw mission_raw.cpp mission_raw_impl.cpp ) @@ -7,26 +7,26 @@ include_directories( ${PROJECT_SOURCE_DIR}/core ) -set_target_properties(dronecode_sdk_mission_raw +set_target_properties(mavsdk_mission_raw PROPERTIES COMPILE_FLAGS ${warnings} ) -target_link_libraries(dronecode_sdk_mission_raw - dronecode_sdk +target_link_libraries(mavsdk_mission_raw + mavsdk ) -target_include_directories(dronecode_sdk_mission_raw PUBLIC +target_include_directories(mavsdk_mission_raw PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_mission_raw - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_mission_raw + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/mission_raw/mission_raw.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/mission_raw + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mission_raw ) diff --git a/src/plugins/offboard/CMakeLists.txt b/src/plugins/offboard/CMakeLists.txt index 51373c74a8..92f320e20a 100644 --- a/src/plugins/offboard/CMakeLists.txt +++ b/src/plugins/offboard/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_offboard +add_library(mavsdk_offboard offboard.cpp offboard_impl.cpp ) -target_link_libraries(dronecode_sdk_offboard - dronecode_sdk +target_link_libraries(mavsdk_offboard + mavsdk ) -set_target_properties(dronecode_sdk_offboard +set_target_properties(mavsdk_offboard PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_offboard PUBLIC +target_include_directories(mavsdk_offboard PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_offboard - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_offboard + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/offboard/offboard.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/offboard + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/offboard ) diff --git a/src/plugins/param/CMakeLists.txt b/src/plugins/param/CMakeLists.txt index acd272675f..112f5069c8 100644 --- a/src/plugins/param/CMakeLists.txt +++ b/src/plugins/param/CMakeLists.txt @@ -1,28 +1,28 @@ -add_library(dronecode_sdk_param +add_library(mavsdk_param param.cpp param_impl.cpp ) -target_link_libraries(dronecode_sdk_param - dronecode_sdk +target_link_libraries(mavsdk_param + mavsdk ) -set_target_properties(dronecode_sdk_param +set_target_properties(mavsdk_param PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_param PUBLIC +target_include_directories(mavsdk_param PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_param - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_param + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/param/param.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/param + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/param ) diff --git a/src/plugins/telemetry/CMakeLists.txt b/src/plugins/telemetry/CMakeLists.txt index 3853c2339c..40765e8b09 100644 --- a/src/plugins/telemetry/CMakeLists.txt +++ b/src/plugins/telemetry/CMakeLists.txt @@ -1,29 +1,29 @@ -add_library(dronecode_sdk_telemetry +add_library(mavsdk_telemetry telemetry.cpp telemetry_impl.cpp math_conversions.cpp ) -target_link_libraries(dronecode_sdk_telemetry - dronecode_sdk +target_link_libraries(mavsdk_telemetry + mavsdk ) -set_target_properties(dronecode_sdk_telemetry +set_target_properties(mavsdk_telemetry PROPERTIES COMPILE_FLAGS ${warnings} ) -target_include_directories(dronecode_sdk_telemetry PUBLIC +target_include_directories(mavsdk_telemetry PUBLIC $ - $ + $ ) -install(TARGETS dronecode_sdk_telemetry - EXPORT dronecode-sdk-targets +install(TARGETS mavsdk_telemetry + EXPORT mavsdk-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES include/plugins/telemetry/telemetry.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dronecode_sdk/plugins/telemetry + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/telemetry ) diff --git a/tools/generate_docs.sh b/tools/generate_docs.sh index 0ed7fdd29b..844fd5e744 100755 --- a/tools/generate_docs.sh +++ b/tools/generate_docs.sh @@ -39,7 +39,7 @@ make -C${BUILD_DIR} install -j4; return_result=0 # Doxygen likes to run where the source is (because INPUT in .doxygen is empty), # so we cd there. -pushd ${INSTALL_DIR}/include/dronecode_sdk +pushd ${INSTALL_DIR}/include/mavsdk # If any warnings are thrown, we should not flag this as a success. doxygen_output_file=".doxygen_output.tmp" diff --git a/tools/run-docker.sh b/tools/run-docker.sh index 9f6eefa7c6..d75aa43d9e 100755 --- a/tools/run-docker.sh +++ b/tools/run-docker.sh @@ -1,3 +1,3 @@ #!/usr/bin/env sh -docker run -it --rm -v $(pwd):/home/user/DronecodeSDK:z -e LOCAL_USER_ID=`id -u` dronecode/dronecode-sdk-ubuntu-18.04-px4-sitl "$@" +docker run -it --rm -v $(pwd):/home/user/MAVSDK:z -e LOCAL_USER_ID=`id -u` mavlink/mavsdk-ubuntu-18.04-px4-sitl "$@" From 7e9b06045c6623caae114c4f2633ba596b004854 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 17 Jun 2019 09:46:52 +0200 Subject: [PATCH 09/15] proto: update submodule This is to change from DronecodeSDK to MAVSDK. --- src/backend/proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/proto b/src/backend/proto index 6464818789..d2042e2dc1 160000 --- a/src/backend/proto +++ b/src/backend/proto @@ -1 +1 @@ -Subproject commit 6464818789db1388c266e144489bfc9856fd0ef6 +Subproject commit d2042e2dc116529db30d0b0c31aa7121cdc7e4b7 From 5a7ab2ac9578c00fbe664754f9fa3049787d6f8b Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 17 Jun 2019 16:50:12 +0200 Subject: [PATCH 10/15] core: print out nice version on load --- src/core/mavsdk_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mavsdk_impl.cpp b/src/core/mavsdk_impl.cpp index d903c79623..6969ec65a2 100644 --- a/src/core/mavsdk_impl.cpp +++ b/src/core/mavsdk_impl.cpp @@ -22,7 +22,7 @@ MavsdkImpl::MavsdkImpl() : _on_discover_callback(nullptr), _on_timeout_callback(nullptr) { - LogInfo() << "Mavsdk version: " << mavsdk_version; + LogInfo() << "MAVSDK version: " << mavsdk_version; } MavsdkImpl::~MavsdkImpl() From 2ff0269a12df3f5bdd476ac89073ed5160463ab1 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 17 Jun 2019 17:28:15 +0200 Subject: [PATCH 11/15] docker: fix after gem cli changes --- docker/Dockerfile-Fedora-28 | 2 +- docker/Dockerfile-Fedora-29 | 2 +- docker/Dockerfile-Ubuntu-16.04 | 2 +- docker/Dockerfile-Ubuntu-18.04 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile-Fedora-28 b/docker/Dockerfile-Fedora-28 index f7676c352a..70341418be 100644 --- a/docker/Dockerfile-Fedora-28 +++ b/docker/Dockerfile-Fedora-28 @@ -36,7 +36,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN gem install --no-ri --no-rdoc fpm; +RUN gem install --no-document fpm; RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \ cd su-exec-* && make && mv su-exec /usr/local/bin && cd .. && rm -rf su-exec-* diff --git a/docker/Dockerfile-Fedora-29 b/docker/Dockerfile-Fedora-29 index 24407845e9..9d4d0e40ae 100644 --- a/docker/Dockerfile-Fedora-29 +++ b/docker/Dockerfile-Fedora-29 @@ -36,7 +36,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN gem install --no-ri --no-rdoc fpm; +RUN gem install --no-document fpm; RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \ cd su-exec-* && make && mv su-exec /usr/local/bin && cd .. && rm -rf su-exec-* diff --git a/docker/Dockerfile-Ubuntu-16.04 b/docker/Dockerfile-Ubuntu-16.04 index 243588424b..5d75a7b482 100644 --- a/docker/Dockerfile-Ubuntu-16.04 +++ b/docker/Dockerfile-Ubuntu-16.04 @@ -46,7 +46,7 @@ RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* \ && update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 1000 -RUN gem install --no-ri --no-rdoc fpm; +RUN gem install --no-document fpm; RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \ cd su-exec-* && make && mv su-exec /usr/local/bin && cd .. && rm -rf su-exec-* diff --git a/docker/Dockerfile-Ubuntu-18.04 b/docker/Dockerfile-Ubuntu-18.04 index b938dcaba2..52726ab207 100644 --- a/docker/Dockerfile-Ubuntu-18.04 +++ b/docker/Dockerfile-Ubuntu-18.04 @@ -42,7 +42,7 @@ RUN apt-get update \ RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 1000 -RUN gem install --no-ri --no-rdoc fpm; +RUN gem install --no-document fpm; RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \ cd su-exec-* && make && mv su-exec /usr/local/bin && cd .. && rm -rf su-exec-* From 1d4dd12df12998e03c24f4baadacb8c485b651ed Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 17 Jun 2019 17:29:41 +0200 Subject: [PATCH 12/15] docker: move from mavlink to mavsdk org --- docker/build_and_push_docker_images.sh | 50 +++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docker/build_and_push_docker_images.sh b/docker/build_and_push_docker_images.sh index 5915016585..0727de000d 100755 --- a/docker/build_and_push_docker_images.sh +++ b/docker/build_and_push_docker_images.sh @@ -2,35 +2,35 @@ set -e -docker pull mavlink/mavsdk-fedora-28 -docker pull mavlink/mavsdk-fedora-29 -docker pull mavlink/mavsdk-ubuntu-16.04 -docker pull mavlink/mavsdk-ubuntu-18.04 -docker pull mavlink/mavsdk-ubuntu-18.04-px4-sitl +docker pull mavsdk/mavsdk-fedora-28 +docker pull mavsdk/mavsdk-fedora-29 +docker pull mavsdk/mavsdk-ubuntu-16.04 +docker pull mavsdk/mavsdk-ubuntu-18.04 +docker pull mavsdk/mavsdk-ubuntu-18.04-px4-sitl -docker build -f Dockerfile-Fedora-28 -t mavlink/mavsdk-fedora-28 . -docker build -f Dockerfile-Fedora-29 -t mavlink/mavsdk-fedora-29 . -docker build -f Dockerfile-Ubuntu-16.04 -t mavlink/mavsdk-ubuntu-16.04 . -docker build -f Dockerfile-Ubuntu-18.04 -t mavlink/mavsdk-ubuntu-18.04 . -docker build -f Dockerfile-Ubuntu-18.04-PX4-SITL -t mavlink/mavsdk-ubuntu-18.04-px4-sitl . +docker build -f Dockerfile-Fedora-28 -t mavsdk/mavsdk-fedora-28 . +docker build -f Dockerfile-Fedora-29 -t mavsdk/mavsdk-fedora-29 . +docker build -f Dockerfile-Ubuntu-16.04 -t mavsdk/mavsdk-ubuntu-16.04 . +docker build -f Dockerfile-Ubuntu-18.04 -t mavsdk/mavsdk-ubuntu-18.04 . +docker build -f Dockerfile-Ubuntu-18.04-PX4-SITL -t mavsdk/mavsdk-ubuntu-18.04-px4-sitl . DATE=`date +%Y-%m-%d` -docker tag mavlink/mavsdk-fedora-28:latest mavlink/mavsdk-fedora-28:$DATE -docker tag mavlink/mavsdk-fedora-29:latest mavlink/mavsdk-fedora-29:$DATE -docker tag mavlink/mavsdk-ubuntu-16.04:latest mavlink/mavsdk-ubuntu-16.04:$DATE -docker tag mavlink/mavsdk-ubuntu-18.04:latest mavlink/mavsdk-ubuntu-18.04:$DATE -docker tag mavlink/mavsdk-ubuntu-18.04-px4-sitl:latest mavlink/mavsdk-ubuntu-18.04-px4-sitl:$DATE +docker tag mavsdk/mavsdk-fedora-28:latest mavsdk/mavsdk-fedora-28:$DATE +docker tag mavsdk/mavsdk-fedora-29:latest mavsdk/mavsdk-fedora-29:$DATE +docker tag mavsdk/mavsdk-ubuntu-16.04:latest mavsdk/mavsdk-ubuntu-16.04:$DATE +docker tag mavsdk/mavsdk-ubuntu-18.04:latest mavsdk/mavsdk-ubuntu-18.04:$DATE +docker tag mavsdk/mavsdk-ubuntu-18.04-px4-sitl:latest mavsdk/mavsdk-ubuntu-18.04-px4-sitl:$DATE -docker push mavlink/mavsdk-fedora-28:latest -docker push mavlink/mavsdk-fedora-28:$DATE -docker push mavlink/mavsdk-fedora-29:latest -docker push mavlink/mavsdk-fedora-29:$DATE -docker push mavlink/mavsdk-ubuntu-16.04:latest -docker push mavlink/mavsdk-ubuntu-16.04:$DATE -docker push mavlink/mavsdk-ubuntu-18.04:latest -docker push mavlink/mavsdk-ubuntu-18.04:$DATE -docker push mavlink/mavsdk-ubuntu-18.04-px4-sitl:latest -docker push mavlink/mavsdk-ubuntu-18.04-px4-sitl:$DATE +docker push mavsdk/mavsdk-fedora-28:latest +docker push mavsdk/mavsdk-fedora-28:$DATE +docker push mavsdk/mavsdk-fedora-29:latest +docker push mavsdk/mavsdk-fedora-29:$DATE +docker push mavsdk/mavsdk-ubuntu-16.04:latest +docker push mavsdk/mavsdk-ubuntu-16.04:$DATE +docker push mavsdk/mavsdk-ubuntu-18.04:latest +docker push mavsdk/mavsdk-ubuntu-18.04:$DATE +docker push mavsdk/mavsdk-ubuntu-18.04-px4-sitl:latest +docker push mavsdk/mavsdk-ubuntu-18.04-px4-sitl:$DATE echo "Please update tag in Jenkinsfile to '$DATE'" From 56a4a6188af44c5baaa68199ecf1e1ae408c81eb Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 17 Jun 2019 17:31:58 +0200 Subject: [PATCH 13/15] docker: add Fedora 30, remove Fedora 28 --- docker/{Dockerfile-Fedora-28 => Dockerfile-Fedora-30} | 4 ++-- docker/build_and_push_docker_images.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename docker/{Dockerfile-Fedora-28 => Dockerfile-Fedora-30} (93%) diff --git a/docker/Dockerfile-Fedora-28 b/docker/Dockerfile-Fedora-30 similarity index 93% rename from docker/Dockerfile-Fedora-28 rename to docker/Dockerfile-Fedora-30 index 70341418be..d1dd503c5f 100644 --- a/docker/Dockerfile-Fedora-28 +++ b/docker/Dockerfile-Fedora-30 @@ -1,10 +1,10 @@ # -# Development environment for the MAVSDK based on Fedora 28. +# Development environment for the MAVSDK based on Fedora 30. # # Author: Julian Oes # -FROM fedora:28 +FROM fedora:30 MAINTAINER Julian Oes diff --git a/docker/build_and_push_docker_images.sh b/docker/build_and_push_docker_images.sh index 0727de000d..2f09ffe475 100755 --- a/docker/build_and_push_docker_images.sh +++ b/docker/build_and_push_docker_images.sh @@ -2,30 +2,30 @@ set -e -docker pull mavsdk/mavsdk-fedora-28 docker pull mavsdk/mavsdk-fedora-29 +docker pull mavsdk/mavsdk-fedora-30 docker pull mavsdk/mavsdk-ubuntu-16.04 docker pull mavsdk/mavsdk-ubuntu-18.04 docker pull mavsdk/mavsdk-ubuntu-18.04-px4-sitl -docker build -f Dockerfile-Fedora-28 -t mavsdk/mavsdk-fedora-28 . docker build -f Dockerfile-Fedora-29 -t mavsdk/mavsdk-fedora-29 . +docker build -f Dockerfile-Fedora-30 -t mavsdk/mavsdk-fedora-30 . docker build -f Dockerfile-Ubuntu-16.04 -t mavsdk/mavsdk-ubuntu-16.04 . docker build -f Dockerfile-Ubuntu-18.04 -t mavsdk/mavsdk-ubuntu-18.04 . docker build -f Dockerfile-Ubuntu-18.04-PX4-SITL -t mavsdk/mavsdk-ubuntu-18.04-px4-sitl . DATE=`date +%Y-%m-%d` -docker tag mavsdk/mavsdk-fedora-28:latest mavsdk/mavsdk-fedora-28:$DATE docker tag mavsdk/mavsdk-fedora-29:latest mavsdk/mavsdk-fedora-29:$DATE +docker tag mavsdk/mavsdk-fedora-30:latest mavsdk/mavsdk-fedora-30:$DATE docker tag mavsdk/mavsdk-ubuntu-16.04:latest mavsdk/mavsdk-ubuntu-16.04:$DATE docker tag mavsdk/mavsdk-ubuntu-18.04:latest mavsdk/mavsdk-ubuntu-18.04:$DATE docker tag mavsdk/mavsdk-ubuntu-18.04-px4-sitl:latest mavsdk/mavsdk-ubuntu-18.04-px4-sitl:$DATE -docker push mavsdk/mavsdk-fedora-28:latest -docker push mavsdk/mavsdk-fedora-28:$DATE docker push mavsdk/mavsdk-fedora-29:latest docker push mavsdk/mavsdk-fedora-29:$DATE +docker push mavsdk/mavsdk-fedora-30:latest +docker push mavsdk/mavsdk-fedora-30:$DATE docker push mavsdk/mavsdk-ubuntu-16.04:latest docker push mavsdk/mavsdk-ubuntu-16.04:$DATE docker push mavsdk/mavsdk-ubuntu-18.04:latest From eb698d94a1d94cdad28d22e2606a153df9b5e749 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 17 Jun 2019 17:34:39 +0200 Subject: [PATCH 14/15] Jenkins: update docker images --- Jenkinsfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69c1c1a135..011ea7e9c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { stage('Ubuntu 16.04 Debug') { agent { docker { - image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' + image 'mavsdk/mavsdk-ubuntu-16.04:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -40,7 +40,7 @@ pipeline { stage('Ubuntu 16.04 Release') { agent { docker { - image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' + image 'mavsdk/mavsdk-ubuntu-16.04:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -70,7 +70,7 @@ pipeline { stage('Ubuntu 18.04 Debug') { agent { docker { - image 'mavlink/mavsdk-ubuntu-18.04:2019-03-25' + image 'mavsdk/mavsdk-ubuntu-18.04:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -100,7 +100,7 @@ pipeline { stage('Ubuntu 18.04 Release') { agent { docker { - image 'mavlink/mavsdk-ubuntu-18.04:2019-03-25' + image 'mavsdk/mavsdk-ubuntu-18.04:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -130,7 +130,7 @@ pipeline { stage('Ubuntu 18.04 Debug PX4 SITL') { agent { docker { - image 'mavlink/mavsdk-ubuntu-18.04-px4-sitl:2019-05-15' + image 'mavsdk/mavsdk-ubuntu-18.04-px4-sitl:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -155,10 +155,10 @@ pipeline { } } - stage('Fedora 27 Debug') { + stage('Fedora 29 Debug') { agent { docker { - image 'mavlink/mavsdk-fedora-28:2019-03-25' + image 'mavsdk/mavsdk-fedora-29:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -185,10 +185,10 @@ pipeline { } } - stage('Fedora 27 Release') { + stage('Fedora 29 Release') { agent { docker { - image 'mavlink/mavsdk-fedora-28:2019-03-25' + image 'mavsdk/mavsdk-fedora-29:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -215,10 +215,10 @@ pipeline { } } - stage('Fedora 28 Debug') { + stage('Fedora 30 Debug') { agent { docker { - image 'mavlink/mavsdk-fedora-29:2019-03-25' + image 'mavsdk/mavsdk-fedora-30:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -245,10 +245,10 @@ pipeline { } } - stage('Fedora 28 Release') { + stage('Fedora 30 Release') { agent { docker { - image 'mavlink/mavsdk-fedora-29:2019-03-25' + image 'mavsdk/mavsdk-fedora-30:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -344,7 +344,7 @@ pipeline { stage('check style') { agent { docker { - image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' + image 'mavsdk/mavsdk-ubuntu-16.04:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -368,7 +368,7 @@ pipeline { stage('Generate Docs') { agent { docker { - image 'mavlink/mavsdk-ubuntu-16.04:2019-03-25' + image 'mavsdk/mavsdk-ubuntu-16.04:2019-06-17' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } From 4acbe29af86936bc8e0f3f67ab03772a5aa20573 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 17 Jun 2019 19:50:24 +0200 Subject: [PATCH 15/15] example: DronecodeSDK -> MAVSDK --- example/battery/CMakeLists.txt | 8 ++++---- example/battery/battery.cpp | 2 +- example/calibrate/CMakeLists.txt | 6 +++--- example/calibrate/calibrate.cpp | 6 +++--- example/fly_mission/CMakeLists.txt | 10 +++++----- example/fly_mission/fly_mission.cpp | 2 +- example/fly_multiple_drones/CMakeLists.txt | 10 +++++----- example/fly_multiple_drones/fly_multiple_drones.cpp | 2 +- example/fly_qgc_mission/CMakeLists.txt | 10 +++++----- example/fly_qgc_mission/fly_qgc_mission.cpp | 2 +- example/follow_me/CMakeLists.txt | 10 +++++----- example/follow_me/follow_me.cpp | 2 +- example/geofence_inclusion/CMakeLists.txt | 12 ++++++------ example/geofence_inclusion/geofence_inclusion.cpp | 2 +- example/multiple_drones/CMakeLists.txt | 8 ++++---- example/multiple_drones/multiple_drones.cpp | 2 +- example/offboard_velocity/CMakeLists.txt | 10 +++++----- example/offboard_velocity/offboard_velocity.cpp | 2 +- example/takeoff_land/CMakeLists.txt | 8 ++++---- example/takeoff_land/takeoff_and_land.cpp | 2 +- example/transition_vtol_fixed_wing/CMakeLists.txt | 8 ++++---- .../transition_vtol_fixed_wing.cpp | 2 +- 22 files changed, 63 insertions(+), 63 deletions(-) diff --git a/example/battery/CMakeLists.txt b/example/battery/CMakeLists.txt index b58d244581..9d8965a997 100644 --- a/example/battery/CMakeLists.txt +++ b/example/battery/CMakeLists.txt @@ -10,14 +10,14 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(battery battery.cpp ) target_link_libraries(battery - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk_mavlink_passthrough - DronecodeSDK::mavsdk + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk_mavlink_passthrough + MAVSDK::mavsdk ) diff --git a/example/battery/battery.cpp b/example/battery/battery.cpp index ca319fd7f3..ef25309e95 100644 --- a/example/battery/battery.cpp +++ b/example/battery/battery.cpp @@ -20,7 +20,7 @@ static void usage(const std::string &bin_name); int main(int argc, char **argv) { - DronecodeSDK dc; + Mavsdk dc; std::string connection_url; ConnectionResult connection_result; diff --git a/example/calibrate/CMakeLists.txt b/example/calibrate/CMakeLists.txt index a14c1ccbe8..3d1f812274 100644 --- a/example/calibrate/CMakeLists.txt +++ b/example/calibrate/CMakeLists.txt @@ -10,15 +10,15 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(calibrate calibrate.cpp ) target_link_libraries(calibrate - DronecodeSDK::mavsdk_calibration - DronecodeSDK::mavsdk + MAVSDK::mavsdk_calibration + MAVSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/calibrate/calibrate.cpp b/example/calibrate/calibrate.cpp index 9b4e95aefd..74eeb33c70 100644 --- a/example/calibrate/calibrate.cpp +++ b/example/calibrate/calibrate.cpp @@ -7,7 +7,7 @@ using namespace mavsdk; bool are_arguments_valid(int argc, char **argv); void print_usage(const std::string &); -void wait_until_discover(DronecodeSDK &); +void wait_until_discover(Mavsdk &); void calibrate_accelerometer(Calibration &); Calibration::calibration_callback_t create_calibration_callback(std::promise &); void calibrate_gyro(Calibration &); @@ -22,7 +22,7 @@ int main(int argc, char **argv) return 1; } - DronecodeSDK dc; + Mavsdk dc; const auto connection_url = argv[1]; const auto connection_result = dc.add_any_connection(connection_url); @@ -58,7 +58,7 @@ void print_usage(const std::string &bin_name) << "For example, to connect to the simulator use URL: udp://:14540" << std::endl; } -void wait_until_discover(DronecodeSDK &dc) +void wait_until_discover(Mavsdk &dc) { std::cout << "Waiting to discover system..." << std::endl; std::promise discover_promise; diff --git a/example/fly_mission/CMakeLists.txt b/example/fly_mission/CMakeLists.txt index 2d834bded0..b430bbbe8c 100644 --- a/example/fly_mission/CMakeLists.txt +++ b/example/fly_mission/CMakeLists.txt @@ -10,16 +10,16 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(fly_mission fly_mission.cpp ) target_link_libraries(fly_mission - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk_mission - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk + MAVSDK::mavsdk_action + MAVSDK::mavsdk_mission + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/fly_mission/fly_mission.cpp b/example/fly_mission/fly_mission.cpp index 656b3b666b..9af7a69c0f 100644 --- a/example/fly_mission/fly_mission.cpp +++ b/example/fly_mission/fly_mission.cpp @@ -60,7 +60,7 @@ void usage(std::string bin_name) int main(int argc, char **argv) { - DronecodeSDK dc; + Mavsdk dc; { auto prom = std::make_shared>(); diff --git a/example/fly_multiple_drones/CMakeLists.txt b/example/fly_multiple_drones/CMakeLists.txt index 4fd0fbe781..98ec6bf610 100644 --- a/example/fly_multiple_drones/CMakeLists.txt +++ b/example/fly_multiple_drones/CMakeLists.txt @@ -10,16 +10,16 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(fly_multiple_drones fly_multiple_drones.cpp ) target_link_libraries(fly_multiple_drones - DronecodeSDK::mavsdk - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk_mission - DronecodeSDK::mavsdk_action + MAVSDK::mavsdk + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk_mission + MAVSDK::mavsdk_action ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/fly_multiple_drones/fly_multiple_drones.cpp b/example/fly_multiple_drones/fly_multiple_drones.cpp index 6c2751e33a..51ad684152 100644 --- a/example/fly_multiple_drones/fly_multiple_drones.cpp +++ b/example/fly_multiple_drones/fly_multiple_drones.cpp @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) return 1; } - DronecodeSDK dc; + Mavsdk dc; // Half of argc is how many udp ports is being used int total_ports_used = argc / 2; diff --git a/example/fly_qgc_mission/CMakeLists.txt b/example/fly_qgc_mission/CMakeLists.txt index fcec8dd620..f6d8ea4180 100644 --- a/example/fly_qgc_mission/CMakeLists.txt +++ b/example/fly_qgc_mission/CMakeLists.txt @@ -8,15 +8,15 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(fly_qgc_mission fly_qgc_mission.cpp ) target_link_libraries(fly_qgc_mission - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk_mission - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk + MAVSDK::mavsdk_action + MAVSDK::mavsdk_mission + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk ) diff --git a/example/fly_qgc_mission/fly_qgc_mission.cpp b/example/fly_qgc_mission/fly_qgc_mission.cpp index 8fccf1baf1..d5cad0e7bd 100644 --- a/example/fly_qgc_mission/fly_qgc_mission.cpp +++ b/example/fly_qgc_mission/fly_qgc_mission.cpp @@ -62,7 +62,7 @@ void usage(std::string bin_name) int main(int argc, char **argv) { - DronecodeSDK dc; + Mavsdk dc; std::string connection_url; ConnectionResult connection_result; diff --git a/example/follow_me/CMakeLists.txt b/example/follow_me/CMakeLists.txt index 260488d57d..222b251789 100644 --- a/example/follow_me/CMakeLists.txt +++ b/example/follow_me/CMakeLists.txt @@ -10,7 +10,7 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(follow_me follow_me.cpp @@ -18,9 +18,9 @@ add_executable(follow_me ) target_link_libraries(follow_me - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk_follow_me - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk + MAVSDK::mavsdk_action + MAVSDK::mavsdk_follow_me + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/follow_me/follow_me.cpp b/example/follow_me/follow_me.cpp index a7149a297e..c8ca0249b0 100644 --- a/example/follow_me/follow_me.cpp +++ b/example/follow_me/follow_me.cpp @@ -47,7 +47,7 @@ void usage(std::string bin_name) int main(int argc, char **argv) { - DronecodeSDK dc; + Mavsdk dc; std::string connection_url; ConnectionResult connection_result; diff --git a/example/geofence_inclusion/CMakeLists.txt b/example/geofence_inclusion/CMakeLists.txt index bd106b8127..748aa881f6 100644 --- a/example/geofence_inclusion/CMakeLists.txt +++ b/example/geofence_inclusion/CMakeLists.txt @@ -8,16 +8,16 @@ else() add_definitions("-std=c++11 -Wall -Wextra -Werror") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(geofence_inclusion geofence_inclusion.cpp ) target_link_libraries(geofence_inclusion - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk_mission - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk_geofence - DronecodeSDK::mavsdk + MAVSDK::mavsdk_action + MAVSDK::mavsdk_mission + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk_geofence + MAVSDK::mavsdk ) diff --git a/example/geofence_inclusion/geofence_inclusion.cpp b/example/geofence_inclusion/geofence_inclusion.cpp index f946654445..ac69f2ce16 100644 --- a/example/geofence_inclusion/geofence_inclusion.cpp +++ b/example/geofence_inclusion/geofence_inclusion.cpp @@ -44,7 +44,7 @@ void usage(std::string bin_name) int main(int argc, char **argv) { - DronecodeSDK dc; + Mavsdk dc; { auto prom = std::make_shared>(); diff --git a/example/multiple_drones/CMakeLists.txt b/example/multiple_drones/CMakeLists.txt index aa3f11d77b..c88eba2af7 100644 --- a/example/multiple_drones/CMakeLists.txt +++ b/example/multiple_drones/CMakeLists.txt @@ -10,15 +10,15 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(multiple_drones multiple_drones.cpp ) target_link_libraries(multiple_drones - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk_action + MAVSDK::mavsdk ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/example/multiple_drones/multiple_drones.cpp b/example/multiple_drones/multiple_drones.cpp index 665adbf30f..8615f1176d 100644 --- a/example/multiple_drones/multiple_drones.cpp +++ b/example/multiple_drones/multiple_drones.cpp @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) return 1; } - DronecodeSDK dc; + Mavsdk dc; // the loop below adds the number of ports the sdk monitors. for (int i = 1; i < argc; ++i) { diff --git a/example/offboard_velocity/CMakeLists.txt b/example/offboard_velocity/CMakeLists.txt index 56fcc5ffe3..c6e8250590 100644 --- a/example/offboard_velocity/CMakeLists.txt +++ b/example/offboard_velocity/CMakeLists.txt @@ -13,15 +13,15 @@ else() add_definitions("-std=c++11 -Wall -Wextra -Werror") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(offboard offboard_velocity.cpp ) target_link_libraries(offboard - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk_offboard - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk + MAVSDK::mavsdk_action + MAVSDK::mavsdk_offboard + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk ) diff --git a/example/offboard_velocity/offboard_velocity.cpp b/example/offboard_velocity/offboard_velocity.cpp index 188cb6c2e1..a664e1294b 100644 --- a/example/offboard_velocity/offboard_velocity.cpp +++ b/example/offboard_velocity/offboard_velocity.cpp @@ -213,7 +213,7 @@ void usage(std::string bin_name) int main(int argc, char **argv) { - DronecodeSDK dc; + Mavsdk dc; std::string connection_url; ConnectionResult connection_result; diff --git a/example/takeoff_land/CMakeLists.txt b/example/takeoff_land/CMakeLists.txt index dd9ec44d25..3e697f30fb 100644 --- a/example/takeoff_land/CMakeLists.txt +++ b/example/takeoff_land/CMakeLists.txt @@ -8,14 +8,14 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(takeoff_and_land takeoff_and_land.cpp ) target_link_libraries(takeoff_and_land - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk_action + MAVSDK::mavsdk ) diff --git a/example/takeoff_land/takeoff_and_land.cpp b/example/takeoff_land/takeoff_and_land.cpp index 53f1625586..6ace3ada88 100644 --- a/example/takeoff_land/takeoff_and_land.cpp +++ b/example/takeoff_land/takeoff_and_land.cpp @@ -37,7 +37,7 @@ void component_discovered(ComponentType component_type) int main(int argc, char **argv) { - DronecodeSDK dc; + Mavsdk dc; std::string connection_url; ConnectionResult connection_result; diff --git a/example/transition_vtol_fixed_wing/CMakeLists.txt b/example/transition_vtol_fixed_wing/CMakeLists.txt index 298cbc747c..ded7899275 100644 --- a/example/transition_vtol_fixed_wing/CMakeLists.txt +++ b/example/transition_vtol_fixed_wing/CMakeLists.txt @@ -8,14 +8,14 @@ else() add_definitions("-std=c++11 -WX -W2") endif() -find_package(DronecodeSDK REQUIRED) +find_package(MAVSDK REQUIRED) add_executable(transition_vtol_fixed_wing transition_vtol_fixed_wing.cpp ) target_link_libraries(transition_vtol_fixed_wing - DronecodeSDK::mavsdk_action - DronecodeSDK::mavsdk_telemetry - DronecodeSDK::mavsdk + MAVSDK::mavsdk_action + MAVSDK::mavsdk_telemetry + MAVSDK::mavsdk ) diff --git a/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp b/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp index a540e9fb48..a1965fbae1 100644 --- a/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp +++ b/example/transition_vtol_fixed_wing/transition_vtol_fixed_wing.cpp @@ -27,7 +27,7 @@ int main(int argc, char **argv) const std::string connection_url = argv[1]; - DronecodeSDK dc; + Mavsdk dc; // Add connection specified by CLI argument. const ConnectionResult connection_result = dc.add_any_connection(connection_url);