mavlink/lib: move open_drone_id helpers to mavlink

I could not extract the open_drone_id helpers to a separate lib because it would require the mavlink headers while the mavlink library would also depend on it, so it ended up being a circular dependency. Instead, I'm now just using the headers from within the mavlink module as well as from the uavcan driver.
PX4 · Sep 2, 2024 · 8f6ce4e · 8f6ce4e
1 parent b7c5ba1
commit 8f6ce4e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 45 deletions.
diff --git a/src/drivers/uavcan/remoteid.cpp b/src/drivers/uavcan/remoteid.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 #include "remoteid.hpp"
-#include <lib/open_drone_id/open_drone_id_translations.hpp>
+#include <modules/mavlink/open_drone_id_translations.hpp>
 #include <drivers/drv_hrt.h>
 
 using namespace time_literals;

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -60,7 +60,6 @@ add_subdirectory(mathlib EXCLUDE_FROM_ALL)
 add_subdirectory(mixer_module EXCLUDE_FROM_ALL)
 add_subdirectory(motion_planning EXCLUDE_FROM_ALL)
 add_subdirectory(npfg EXCLUDE_FROM_ALL)
-add_subdirectory(open_drone_id EXCLUDE_FROM_ALL)
 add_subdirectory(perf EXCLUDE_FROM_ALL)
 add_subdirectory(fw_performance_model EXCLUDE_FROM_ALL)
 add_subdirectory(pid EXCLUDE_FROM_ALL)

diff --git a/src/lib/open_drone_id/CMakeLists.txt b/src/lib/open_drone_id/CMakeLists.txt
diff --git a/src/modules/mavlink/CMakeLists.txt b/src/modules/mavlink/CMakeLists.txt
@@ -120,6 +120,7 @@ px4_add_module(
 		mavlink_timesync.cpp
 		mavlink_ulog.cpp
 		MavlinkStatustextHandler.cpp
+		open_drone_id_translations.cpp
 		tune_publisher.cpp
 	MODULE_CONFIG
 		module.yaml
@@ -135,7 +136,6 @@ px4_add_module(
 		sensor_calibration
 		geo
 		mavlink_c
-		open_drone_id
 		timesync
 		tunes
 		variable_length_ringbuffer

diff --git a/...n_drone_id/open_drone_id_translations.cpp → ...es/mavlink/open_drone_id_translations.cpp b/...n_drone_id/open_drone_id_translations.cpp → ...es/mavlink/open_drone_id_translations.cpp
diff --git a/...n_drone_id/open_drone_id_translations.hpp → ...es/mavlink/open_drone_id_translations.hpp b/...n_drone_id/open_drone_id_translations.hpp → ...es/mavlink/open_drone_id_translations.hpp
diff --git a/src/modules/mavlink/streams/OPEN_DRONE_ID_BASIC_ID.hpp b/src/modules/mavlink/streams/OPEN_DRONE_ID_BASIC_ID.hpp
@@ -35,7 +35,7 @@
 #define OPEN_DRONE_ID_BASIC_ID_HPP
 
 #include <uORB/topics/vehicle_status.h>
-#include <lib/open_drone_id/open_drone_id_translations.hpp>
+#include <modules/mavlink/open_drone_id_translations.hpp>
 
 class MavlinkStreamOpenDroneIdBasicId : public MavlinkStream
 {