Remove more circular dependencies with ActuatorEffectiveness

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)

src/lib/actuator_effectiveness/ActuatorEffectivenessFixedWing.cpp

@@ -32,7 +32,6 @@
  ****************************************************************************/
 
 #include "ActuatorEffectivenessFixedWing.hpp"
-#include <ControlAllocation/ControlAllocation.hpp>
 
 using namespace matrix;
 

src/lib/actuator_effectiveness/ActuatorEffectivenessRoverAckermann.cpp

@@ -32,7 +32,6 @@
  ****************************************************************************/
 
 #include "ActuatorEffectivenessRoverAckermann.hpp"
-#include <ControlAllocation/ControlAllocation.hpp>
 
 using namespace matrix;
 

src/lib/actuator_effectiveness/ActuatorEffectivenessStandardVTOL.cpp

@@ -32,7 +32,6 @@
  ****************************************************************************/
 
 #include "ActuatorEffectivenessStandardVTOL.hpp"
-#include <ControlAllocation/ControlAllocation.hpp>
 
 using namespace matrix;
 

src/lib/control_allocation/ControlAllocation.hpp

@@ -71,7 +71,7 @@
 
 #include <matrix/matrix/math.hpp>
 
-#include "ActuatorEffectiveness/ActuatorEffectiveness.hpp"
+#include "actuator_effectiveness/ActuatorEffectiveness.hpp"
 
 class ControlAllocation
 {

src/lib/control_allocation/ControlAllocationSequentialDesaturationTest.cpp

@@ -40,7 +40,7 @@
 
 #include <gtest/gtest.h>
 #include <ControlAllocationSequentialDesaturation.hpp>
-#include <../ActuatorEffectiveness/ActuatorEffectivenessRotors.hpp>
+#include <actuator_effectiveness/ActuatorEffectivenessRotors.hpp>
 
 using namespace matrix;
 

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