From 41393f0618e43796019310fc42bbfb32ce18c600 Mon Sep 17 00:00:00 2001 From: Silvan Fuhrer Date: Tue, 28 May 2024 09:14:07 +0200 Subject: [PATCH] CA: rename ControlAllocation::getEffectivenessMatrix to getEffectivenessMatrixAllocation Signed-off-by: Silvan Fuhrer --- .../control_allocator/ControlAllocation/ControlAllocation.hpp | 2 +- src/modules/control_allocator/ControlAllocator.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/control_allocator/ControlAllocation/ControlAllocation.hpp b/src/modules/control_allocator/ControlAllocation/ControlAllocation.hpp index 123f34b9de..bba12a30b8 100644 --- a/src/modules/control_allocator/ControlAllocation/ControlAllocation.hpp +++ b/src/modules/control_allocator/ControlAllocation/ControlAllocation.hpp @@ -150,7 +150,7 @@ public: * * @return Effectiveness matrix */ - const matrix::Matrix &getEffectivenessMatrix() const { return _effectiveness; } + const matrix::Matrix &getEffectivenessMatrixAllocation() const { return _effectiveness; } /** * Set the minimum actuator values diff --git a/src/modules/control_allocator/ControlAllocator.cpp b/src/modules/control_allocator/ControlAllocator.cpp index ac10559d37..58d1a6ea98 100644 --- a/src/modules/control_allocator/ControlAllocator.cpp +++ b/src/modules/control_allocator/ControlAllocator.cpp @@ -815,7 +815,8 @@ int ControlAllocator::print_status() // Print current effectiveness matrix for (int i = 0; i < _num_control_allocation; ++i) { - const ActuatorEffectiveness::EffectivenessMatrix &effectiveness = _control_allocation[i]->getEffectivenessMatrix(); + const ActuatorEffectiveness::EffectivenessMatrix &effectiveness = + _control_allocation[i]->getEffectivenessMatrixAllocation(); if (_num_control_allocation > 1) { PX4_INFO("Instance: %i", i);