From 1e17a86a3961613d443587abf98e097c273bd0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Tue, 20 Nov 2018 14:14:13 +0100
Subject: [PATCH] collisionprevention: fix typo in param description & minor
code style
---
src/lib/CollisionPrevention/CollisionPrevention.hpp | 4 +---
src/lib/CollisionPrevention/collisionprevention_params.c | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/lib/CollisionPrevention/CollisionPrevention.hpp b/src/lib/CollisionPrevention/CollisionPrevention.hpp
index 527655611d..3bea60daf3 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 1b4175396b..030f943a65 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
--
GitLab