refactor: move experimental setpoint types under 'experimental'

These will likely still change.
Auterion · Nov 6, 2023 · df7eba7 · df7eba7
1 parent ec4050b
commit df7eba7
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/examples/cpp/modes/manual/include/mode.hpp b/examples/cpp/modes/manual/include/mode.hpp
@@ -5,8 +5,8 @@
 #pragma once
 
 #include <px4_ros2/components/mode.hpp>
-#include <px4_ros2/control/setpoint_types/rates.hpp>
-#include <px4_ros2/control/setpoint_types/attitude.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/rates.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/attitude.hpp>
 #include <px4_ros2/control/offboard_actuators.hpp>
 
 #include <Eigen/Eigen>

diff --git a/examples/cpp/modes/mode_with_executor/include/mode.hpp b/examples/cpp/modes/mode_with_executor/include/mode.hpp
@@ -7,7 +7,7 @@
 #include <px4_ros2/components/mode.hpp>
 #include <px4_ros2/components/mode_executor.hpp>
 #include <px4_ros2/components/wait_for_fmu.hpp>
-#include <px4_ros2/control/setpoint_types/trajectory.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/trajectory.hpp>
 
 #include <rclcpp/rclcpp.hpp>
 

diff --git a/examples/cpp/modes/rtl_replacement/include/mode.hpp b/examples/cpp/modes/rtl_replacement/include/mode.hpp
@@ -7,7 +7,7 @@
 #include <px4_ros2/components/mode.hpp>
 #include <px4_ros2/components/health_and_arming_checks.hpp>
 #include <px4_ros2/components/mode_executor.hpp>
-#include <px4_ros2/control/setpoint_types/trajectory.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/trajectory.hpp>
 #include <px4_msgs/msg/vehicle_land_detected.hpp>
 
 #include <rclcpp/rclcpp.hpp>

diff --git a/px4_ros2_cpp/CMakeLists.txt b/px4_ros2_cpp/CMakeLists.txt
@@ -31,10 +31,10 @@ set(HEADER_FILES
         include/px4_ros2/components/overrides.hpp
         include/px4_ros2/components/wait_for_fmu.hpp
         include/px4_ros2/control/offboard_actuators.hpp
-        include/px4_ros2/control/setpoint_types/attitude.hpp
         include/px4_ros2/control/setpoint_types/direct_actuators.hpp
-        include/px4_ros2/control/setpoint_types/rates.hpp
-        include/px4_ros2/control/setpoint_types/trajectory.hpp
+        include/px4_ros2/control/setpoint_types/experimental/attitude.hpp
+        include/px4_ros2/control/setpoint_types/experimental/rates.hpp
+        include/px4_ros2/control/setpoint_types/experimental/trajectory.hpp
         include/px4_ros2/odometry/global_position.hpp
         include/px4_ros2/odometry/local_position.hpp
 )
@@ -50,10 +50,10 @@ add_library(px4_ros2_cpp
         src/components/registration.cpp
         src/components/wait_for_fmu.cpp
         src/control/offboard_actuators.cpp
-        src/control/setpoint_types/attitude.cpp
         src/control/setpoint_types/direct_actuators.cpp
-        src/control/setpoint_types/rates.cpp
-        src/control/setpoint_types/trajectory.cpp
+        src/control/setpoint_types/experimental/attitude.cpp
+        src/control/setpoint_types/experimental/rates.cpp
+        src/control/setpoint_types/experimental/trajectory.cpp
         src/odometry/global_position.cpp
         src/odometry/local_position.cpp
 )

diff --git a/..._ros2/control/setpoint_types/attitude.hpp → .../setpoint_types/experimental/attitude.hpp b/..._ros2/control/setpoint_types/attitude.hpp → .../setpoint_types/experimental/attitude.hpp
diff --git a/...px4_ros2/control/setpoint_types/rates.hpp → ...rol/setpoint_types/experimental/rates.hpp b/...px4_ros2/control/setpoint_types/rates.hpp → ...rol/setpoint_types/experimental/rates.hpp
diff --git a/...os2/control/setpoint_types/trajectory.hpp → ...etpoint_types/experimental/trajectory.hpp b/...os2/control/setpoint_types/trajectory.hpp → ...etpoint_types/experimental/trajectory.hpp
diff --git a/...p/src/control/setpoint_types/attitude.cpp → .../setpoint_types/experimental/attitude.cpp b/...p/src/control/setpoint_types/attitude.cpp → .../setpoint_types/experimental/attitude.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ****************************************************************************/
 
-#include <px4_ros2/control/setpoint_types/attitude.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/attitude.hpp>
 
 
 namespace px4_ros2

diff --git a/..._cpp/src/control/setpoint_types/rates.cpp → ...rol/setpoint_types/experimental/rates.cpp b/..._cpp/src/control/setpoint_types/rates.cpp → ...rol/setpoint_types/experimental/rates.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ****************************************************************************/
 
-#include <px4_ros2/control/setpoint_types/rates.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/rates.hpp>
 
 
 namespace px4_ros2

diff --git a/...src/control/setpoint_types/trajectory.cpp → ...etpoint_types/experimental/trajectory.cpp b/...src/control/setpoint_types/trajectory.cpp → ...etpoint_types/experimental/trajectory.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ****************************************************************************/
 
-#include <px4_ros2/control/setpoint_types/trajectory.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/trajectory.hpp>
 
 
 namespace px4_ros2

diff --git a/px4_ros2_cpp/test/integration/mode.cpp b/px4_ros2_cpp/test/integration/mode.cpp
@@ -9,7 +9,7 @@
 
 #include <px4_ros2/components/mode.hpp>
 #include <px4_ros2/components/wait_for_fmu.hpp>
-#include <px4_ros2/control/setpoint_types/trajectory.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/trajectory.hpp>
 
 #include <rclcpp/rclcpp.hpp>
 

diff --git a/px4_ros2_cpp/test/integration/mode_executor.cpp b/px4_ros2_cpp/test/integration/mode_executor.cpp
@@ -9,7 +9,7 @@
 
 #include <px4_ros2/components/mode_executor.hpp>
 #include <px4_ros2/components/wait_for_fmu.hpp>
-#include <px4_ros2/control/setpoint_types/trajectory.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/trajectory.hpp>
 
 #include <rclcpp/rclcpp.hpp>
 

diff --git a/px4_ros2_cpp/test/integration/overrides.cpp b/px4_ros2_cpp/test/integration/overrides.cpp
@@ -9,7 +9,7 @@
 
 #include <px4_ros2/components/mode_executor.hpp>
 #include <px4_ros2/components/wait_for_fmu.hpp>
-#include <px4_ros2/control/setpoint_types/trajectory.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/trajectory.hpp>
 
 #include <rclcpp/rclcpp.hpp>
 

diff --git a/px4_ros2_cpp/test/unit/modes.cpp b/px4_ros2_cpp/test/unit/modes.cpp
@@ -7,7 +7,7 @@
 #include <rclcpp/rclcpp.hpp>
 #include <px4_ros2/components/health_and_arming_checks.hpp>
 #include <px4_ros2/components/mode.hpp>
-#include <px4_ros2/control/setpoint_types/rates.hpp>
+#include <px4_ros2/control/setpoint_types/experimental/rates.hpp>
 #include <px4_ros2/odometry/global_position.hpp>
 #include "fake_registration.hpp"