change feature name from CollisionAvoidance to CollisionPrevention

This commit is contained in:
baumanta
2018-11-20 14:11:33 +01:00
committed by Beat Küng
parent f611eddadd
commit dd45fa6541
8 changed files with 38 additions and 36 deletions
@@ -47,7 +47,7 @@ bool FlightTaskManualPosition::initializeSubscriptions(SubscriptionArray &subscr
return false;
}
if (!_collision_avoidance.initializeSubscriptions(subscription_array)) {
if (!_collision_prevention.initializeSubscriptions(subscription_array)) {
return false;
}
@@ -127,9 +127,9 @@ void FlightTaskManualPosition::_scaleSticks()
/* Rotate setpoint into local frame. */
_rotateIntoHeadingFrame(vel_sp_xy);
// collision avoidance
if (_collision_avoidance.is_active()) {
_collision_avoidance.modifySetpoint(vel_sp_xy, _constraints.speed_xy);
// collision prevention
if (_collision_prevention.is_active()) {
_collision_prevention.modifySetpoint(vel_sp_xy, _constraints.speed_xy);
}
_velocity_setpoint(0) = vel_sp_xy(0);
@@ -40,8 +40,8 @@
#pragma once
#include <CollisionPrevention/CollisionPrevention.hpp>
#include "FlightTaskManualAltitude.hpp"
#include <lib/CollisionAvoidance/CollisionAvoidance.hpp>
class FlightTaskManualPosition : public FlightTaskManualAltitude
{
@@ -77,5 +77,5 @@ private:
WeatherVane *_weathervane_yaw_handler =
nullptr; /**< external weathervane library, used to implement a yaw control law that turns the vehicle nose into the wind */
CollisionAvoidance _collision_avoidance; /**< collision avoidance setpoint amendment */
CollisionPrevention _collision_prevention; /**< collision avoidance setpoint amendment */
};