Remove more circular dependencies with ActuatorEffectiveness

PX4 · Jan 10, 2025 · 6e6108b · 6e6108b
1 parent 208d37e
commit 6e6108b
Show file tree

Hide file tree

Showing 44 changed files with 4 additions and 6 deletions.
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -31,6 +31,7 @@
 #
 ############################################################################
 
+add_subdirectory(actuator_effectiveness EXCLUDE_FROM_ALL)
 add_subdirectory(adsb EXCLUDE_FROM_ALL)
 add_subdirectory(airspeed EXCLUDE_FROM_ALL)
 add_subdirectory(atmosphere EXCLUDE_FROM_ALL)
@@ -43,6 +44,7 @@ add_subdirectory(cdrstream EXCLUDE_FROM_ALL)
 add_subdirectory(circuit_breaker EXCLUDE_FROM_ALL)
 add_subdirectory(collision_prevention EXCLUDE_FROM_ALL)
 add_subdirectory(component_information EXCLUDE_FROM_ALL)
+add_subdirectory(control_allocation EXCLUDE_FROM_ALL)
 add_subdirectory(controllib EXCLUDE_FROM_ALL)
 add_subdirectory(conversion EXCLUDE_FROM_ALL)
 add_subdirectory(crc EXCLUDE_FROM_ALL)

diff --git a/...orEffectiveness/ActuatorEffectiveness.cpp → ...r_effectiveness/ActuatorEffectiveness.cpp b/...orEffectiveness/ActuatorEffectiveness.cpp → ...r_effectiveness/ActuatorEffectiveness.cpp
diff --git a/...orEffectiveness/ActuatorEffectiveness.hpp → ...r_effectiveness/ActuatorEffectiveness.hpp b/...orEffectiveness/ActuatorEffectiveness.hpp → ...r_effectiveness/ActuatorEffectiveness.hpp
diff --git a/.../ActuatorEffectivenessControlSurfaces.cpp → .../ActuatorEffectivenessControlSurfaces.cpp b/.../ActuatorEffectivenessControlSurfaces.cpp → .../ActuatorEffectivenessControlSurfaces.cpp
diff --git a/.../ActuatorEffectivenessControlSurfaces.hpp → .../ActuatorEffectivenessControlSurfaces.hpp b/.../ActuatorEffectivenessControlSurfaces.hpp → .../ActuatorEffectivenessControlSurfaces.hpp
diff --git a/...ctiveness/ActuatorEffectivenessCustom.cpp → ...ctiveness/ActuatorEffectivenessCustom.cpp b/...ctiveness/ActuatorEffectivenessCustom.cpp → ...ctiveness/ActuatorEffectivenessCustom.cpp
diff --git a/...ctiveness/ActuatorEffectivenessCustom.hpp → ...ctiveness/ActuatorEffectivenessCustom.hpp b/...ctiveness/ActuatorEffectivenessCustom.hpp → ...ctiveness/ActuatorEffectivenessCustom.hpp
diff --git a/...veness/ActuatorEffectivenessFixedWing.cpp → ...veness/ActuatorEffectivenessFixedWing.cpp b/...veness/ActuatorEffectivenessFixedWing.cpp → ...veness/ActuatorEffectivenessFixedWing.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 #include "ActuatorEffectivenessFixedWing.hpp"
-#include <ControlAllocation/ControlAllocation.hpp>
+#include <control_allocation/ControlAllocation.hpp>
 
 using namespace matrix;
 

diff --git a/...veness/ActuatorEffectivenessFixedWing.hpp → ...veness/ActuatorEffectivenessFixedWing.hpp b/...veness/ActuatorEffectivenessFixedWing.hpp → ...veness/ActuatorEffectivenessFixedWing.hpp
diff --git a/...eness/ActuatorEffectivenessHelicopter.cpp → ...eness/ActuatorEffectivenessHelicopter.cpp b/...eness/ActuatorEffectivenessHelicopter.cpp → ...eness/ActuatorEffectivenessHelicopter.cpp
diff --git a/...eness/ActuatorEffectivenessHelicopter.hpp → ...eness/ActuatorEffectivenessHelicopter.hpp b/...eness/ActuatorEffectivenessHelicopter.hpp → ...eness/ActuatorEffectivenessHelicopter.hpp
diff --git a/...ctuatorEffectivenessHelicopterCoaxial.cpp → ...ctuatorEffectivenessHelicopterCoaxial.cpp b/...ctuatorEffectivenessHelicopterCoaxial.cpp → ...ctuatorEffectivenessHelicopterCoaxial.cpp
diff --git a/...ctuatorEffectivenessHelicopterCoaxial.hpp → ...ctuatorEffectivenessHelicopterCoaxial.hpp b/...ctuatorEffectivenessHelicopterCoaxial.hpp → ...ctuatorEffectivenessHelicopterCoaxial.hpp
diff --git a/...s/ActuatorEffectivenessHelicopterTest.cpp → ...s/ActuatorEffectivenessHelicopterTest.cpp b/...s/ActuatorEffectivenessHelicopterTest.cpp → ...s/ActuatorEffectivenessHelicopterTest.cpp
diff --git a/...ctiveness/ActuatorEffectivenessMCTilt.cpp → ...ctiveness/ActuatorEffectivenessMCTilt.cpp b/...ctiveness/ActuatorEffectivenessMCTilt.cpp → ...ctiveness/ActuatorEffectivenessMCTilt.cpp
diff --git a/...ctiveness/ActuatorEffectivenessMCTilt.hpp → ...ctiveness/ActuatorEffectivenessMCTilt.hpp b/...ctiveness/ActuatorEffectivenessMCTilt.hpp → ...ctiveness/ActuatorEffectivenessMCTilt.hpp
diff --git a/...eness/ActuatorEffectivenessMultirotor.cpp → ...eness/ActuatorEffectivenessMultirotor.cpp b/...eness/ActuatorEffectivenessMultirotor.cpp → ...eness/ActuatorEffectivenessMultirotor.cpp
diff --git a/...eness/ActuatorEffectivenessMultirotor.hpp → ...eness/ActuatorEffectivenessMultirotor.hpp b/...eness/ActuatorEffectivenessMultirotor.hpp → ...eness/ActuatorEffectivenessMultirotor.hpp
diff --git a/...ctiveness/ActuatorEffectivenessRotors.cpp → ...ctiveness/ActuatorEffectivenessRotors.cpp b/...ctiveness/ActuatorEffectivenessRotors.cpp → ...ctiveness/ActuatorEffectivenessRotors.cpp
diff --git a/...ctiveness/ActuatorEffectivenessRotors.hpp → ...ctiveness/ActuatorEffectivenessRotors.hpp b/...ctiveness/ActuatorEffectivenessRotors.hpp → ...ctiveness/ActuatorEffectivenessRotors.hpp
diff --git a/...eness/ActuatorEffectivenessRotorsTest.cpp → ...eness/ActuatorEffectivenessRotorsTest.cpp b/...eness/ActuatorEffectivenessRotorsTest.cpp → ...eness/ActuatorEffectivenessRotorsTest.cpp
diff --git a/...s/ActuatorEffectivenessRoverAckermann.cpp → ...s/ActuatorEffectivenessRoverAckermann.cpp b/...s/ActuatorEffectivenessRoverAckermann.cpp → ...s/ActuatorEffectivenessRoverAckermann.cpp
@@ -32,7 +32,6 @@
  ****************************************************************************/
 
 #include "ActuatorEffectivenessRoverAckermann.hpp"
-#include <ControlAllocation/ControlAllocation.hpp>
 
 using namespace matrix;
 

diff --git a/...s/ActuatorEffectivenessRoverAckermann.hpp → ...s/ActuatorEffectivenessRoverAckermann.hpp b/...s/ActuatorEffectivenessRoverAckermann.hpp → ...s/ActuatorEffectivenessRoverAckermann.hpp
diff --git a/...ess/ActuatorEffectivenessStandardVTOL.cpp → ...ess/ActuatorEffectivenessStandardVTOL.cpp b/...ess/ActuatorEffectivenessStandardVTOL.cpp → ...ess/ActuatorEffectivenessStandardVTOL.cpp
@@ -32,7 +32,6 @@
  ****************************************************************************/
 
 #include "ActuatorEffectivenessStandardVTOL.hpp"
-#include <ControlAllocation/ControlAllocation.hpp>
 
 using namespace matrix;
 

diff --git a/...ess/ActuatorEffectivenessStandardVTOL.hpp → ...ess/ActuatorEffectivenessStandardVTOL.hpp b/...ess/ActuatorEffectivenessStandardVTOL.hpp → ...ess/ActuatorEffectivenessStandardVTOL.hpp
diff --git a/...s/ActuatorEffectivenessTailsitterVTOL.cpp → ...s/ActuatorEffectivenessTailsitterVTOL.cpp b/...s/ActuatorEffectivenessTailsitterVTOL.cpp → ...s/ActuatorEffectivenessTailsitterVTOL.cpp
diff --git a/...s/ActuatorEffectivenessTailsitterVTOL.hpp → ...s/ActuatorEffectivenessTailsitterVTOL.hpp b/...s/ActuatorEffectivenessTailsitterVTOL.hpp → ...s/ActuatorEffectivenessTailsitterVTOL.hpp
diff --git a/...ss/ActuatorEffectivenessTiltrotorVTOL.cpp → ...ss/ActuatorEffectivenessTiltrotorVTOL.cpp b/...ss/ActuatorEffectivenessTiltrotorVTOL.cpp → ...ss/ActuatorEffectivenessTiltrotorVTOL.cpp
diff --git a/...ss/ActuatorEffectivenessTiltrotorVTOL.hpp → ...ss/ActuatorEffectivenessTiltrotorVTOL.hpp b/...ss/ActuatorEffectivenessTiltrotorVTOL.hpp → ...ss/ActuatorEffectivenessTiltrotorVTOL.hpp
diff --git a/...ectiveness/ActuatorEffectivenessTilts.cpp → ...ectiveness/ActuatorEffectivenessTilts.cpp b/...ectiveness/ActuatorEffectivenessTilts.cpp → ...ectiveness/ActuatorEffectivenessTilts.cpp
diff --git a/...ectiveness/ActuatorEffectivenessTilts.hpp → ...ectiveness/ActuatorEffectivenessTilts.hpp b/...ectiveness/ActuatorEffectivenessTilts.hpp → ...ectiveness/ActuatorEffectivenessTilts.hpp
diff --git a/...ffectiveness/ActuatorEffectivenessUUV.cpp → ...ffectiveness/ActuatorEffectivenessUUV.cpp b/...ffectiveness/ActuatorEffectivenessUUV.cpp → ...ffectiveness/ActuatorEffectivenessUUV.cpp
diff --git a/...ffectiveness/ActuatorEffectivenessUUV.hpp → ...ffectiveness/ActuatorEffectivenessUUV.hpp b/...ffectiveness/ActuatorEffectivenessUUV.hpp → ...ffectiveness/ActuatorEffectivenessUUV.hpp
diff --git a/...ator/ActuatorEffectiveness/CMakeLists.txt → ...lib/actuator_effectiveness/CMakeLists.txt b/...ator/ActuatorEffectiveness/CMakeLists.txt → ...lib/actuator_effectiveness/CMakeLists.txt
diff --git a/...llocator/ControlAllocation/CMakeLists.txt → src/lib/control_allocation/CMakeLists.txt b/...llocator/ControlAllocation/CMakeLists.txt → src/lib/control_allocation/CMakeLists.txt
diff --git a/...r/ControlAllocation/ControlAllocation.cpp → .../control_allocation/ControlAllocation.cpp b/...r/ControlAllocation/ControlAllocation.cpp → .../control_allocation/ControlAllocation.cpp
diff --git a/...r/ControlAllocation/ControlAllocation.hpp → .../control_allocation/ControlAllocation.hpp b/...r/ControlAllocation/ControlAllocation.hpp → .../control_allocation/ControlAllocation.hpp
@@ -71,7 +71,7 @@
 
 #include <matrix/matrix/math.hpp>
 
-#include "ActuatorEffectiveness/ActuatorEffectiveness.hpp"
+#include "actuator_effectiveness/ActuatorEffectiveness.hpp"
 
 class ControlAllocation
 {

diff --git a/...cation/ControlAllocationPseudoInverse.cpp → ...cation/ControlAllocationPseudoInverse.cpp b/...cation/ControlAllocationPseudoInverse.cpp → ...cation/ControlAllocationPseudoInverse.cpp
diff --git a/...cation/ControlAllocationPseudoInverse.hpp → ...cation/ControlAllocationPseudoInverse.hpp b/...cation/ControlAllocationPseudoInverse.hpp → ...cation/ControlAllocationPseudoInverse.hpp
diff --git a/...on/ControlAllocationPseudoInverseTest.cpp → ...on/ControlAllocationPseudoInverseTest.cpp b/...on/ControlAllocationPseudoInverseTest.cpp → ...on/ControlAllocationPseudoInverseTest.cpp
diff --git a/...ntrolAllocationSequentialDesaturation.cpp → ...ntrolAllocationSequentialDesaturation.cpp b/...ntrolAllocationSequentialDesaturation.cpp → ...ntrolAllocationSequentialDesaturation.cpp
diff --git a/...ntrolAllocationSequentialDesaturation.hpp → ...ntrolAllocationSequentialDesaturation.hpp b/...ntrolAllocationSequentialDesaturation.hpp → ...ntrolAllocationSequentialDesaturation.hpp
diff --git a/...lAllocationSequentialDesaturationTest.cpp → ...lAllocationSequentialDesaturationTest.cpp b/...lAllocationSequentialDesaturationTest.cpp → ...lAllocationSequentialDesaturationTest.cpp
diff --git a/src/modules/control_allocator/CMakeLists.txt b/src/modules/control_allocator/CMakeLists.txt
@@ -32,8 +32,6 @@
 ############################################################################
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_subdirectory(ActuatorEffectiveness)
-add_subdirectory(ControlAllocation)
 
 px4_add_module(
 	MODULE modules__control_allocator