diff --git a/src/lib/CollisionPrevention/CollisionPrevention.hpp b/src/lib/CollisionPrevention/CollisionPrevention.hpp index 527655611de859e5b19cd39265705015823a20a0..3bea60daf361050ff65da6dae4bbb0788812169f 100644 --- a/src/lib/CollisionPrevention/CollisionPrevention.hpp +++ b/src/lib/CollisionPrevention/CollisionPrevention.hpp @@ -49,8 +49,6 @@ #include <mathlib/mathlib.h> #include <drivers/drv_hrt.h> #include <uORB/topics/mavlink_log.h> -#include <uORB/Publication.hpp> -using uORB::Publication; #include <uORB/uORB.h> #include <systemlib/mavlink_log.h> #include <lib/FlightTasks/tasks/FlightTask/SubscriptionArray.hpp> @@ -68,7 +66,7 @@ public: */ bool initializeSubscriptions(SubscriptionArray &subscription_array); - bool is_active() {return MPC_COL_PREV_D.get() > 0 ;} + bool is_active() { return MPC_COL_PREV_D.get() > 0; } void modifySetpoint(matrix::Vector2f &original_setpoint, const float max_speed); diff --git a/src/lib/CollisionPrevention/collisionprevention_params.c b/src/lib/CollisionPrevention/collisionprevention_params.c index 1b4175396b6a8afe074d8388c94741a13b5a9f52..030f943a6540d3e6133952e564566c57330dbaf5 100644 --- a/src/lib/CollisionPrevention/collisionprevention_params.c +++ b/src/lib/CollisionPrevention/collisionprevention_params.c @@ -42,7 +42,7 @@ /** * Minimum distance the vehicle should keep to all obstacles * - * Only used in Position mode. Collision avoidace is disable by setting this parameter to a negative value + * Only used in Position mode. Collision avoidace is disabled by setting this parameter to a negative value * * @min -1 * @max 15