Merge pull request #2160 from mavlink/pr-split-mission-transfer

Split mission transfer into client and server
mavlink · Nov 4, 2023 · d4f0ca3 · d4f0ca3
2 parents 578ec76 + eecaaa2
commit d4f0ca3
Show file tree

Hide file tree

Showing 21 changed files with 1,347 additions and 1,092 deletions.
diff --git a/src/mavsdk/core/CMakeLists.txt b/src/mavsdk/core/CMakeLists.txt
@@ -30,7 +30,8 @@ target_sources(mavsdk
     mavlink_command_sender.cpp
     mavlink_ftp_client.cpp
     mavlink_ftp_server.cpp
-    mavlink_mission_transfer.cpp
+    mavlink_mission_transfer_client.cpp
+    mavlink_mission_transfer_server.cpp
     mavlink_parameter_cache.cpp
     mavlink_parameter_client.cpp
     mavlink_parameter_server.cpp
@@ -154,7 +155,8 @@ list(APPEND UNIT_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/mavsdk/core/mavsdk_test.cpp
     ${PROJECT_SOURCE_DIR}/mavsdk/core/mavsdk_time_test.cpp
     ${PROJECT_SOURCE_DIR}/mavsdk/core/mavlink_channels_test.cpp
-    ${PROJECT_SOURCE_DIR}/mavsdk/core/mavlink_mission_transfer_test.cpp
+    ${PROJECT_SOURCE_DIR}/mavsdk/core/mavlink_mission_transfer_client_test.cpp
+    ${PROJECT_SOURCE_DIR}/mavsdk/core/mavlink_mission_transfer_server_test.cpp
     ${PROJECT_SOURCE_DIR}/mavsdk/core/mavlink_statustext_handler_test.cpp
     ${PROJECT_SOURCE_DIR}/mavsdk/core/ringbuffer_test.cpp
     ${PROJECT_SOURCE_DIR}/mavsdk/core/safe_queue_test.cpp

diff --git a/src/mavsdk/core/flight_mode.h b/src/mavsdk/core/flight_mode.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "mavlink_mission_transfer.h" // FIXME: remove this dependency
+#include "mavlink_include.h"
 #include "autopilot.h"
 
 namespace mavsdk {