aboutsummaryrefslogtreecommitdiff
path: root/src/modules/navigator
diff options
context:
space:
mode:
authorDaniel Agar <daniel@agar.ca>2015-03-27 19:08:44 -0400
committerDaniel Agar <daniel@agar.ca>2015-03-27 23:38:58 -0400
commit8aae66b893444c74a22ad7beb89e3828e0444108 (patch)
tree893833e818d8138360f8fa0bf5554dc6b036f369 /src/modules/navigator
parent5cc1a5dfdae53626c3cdf35e3d7b60f1a4ca68ed (diff)
downloadpx4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.tar.gz
px4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.tar.bz2
px4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.zip
trivial code style cleanup round 2
Diffstat (limited to 'src/modules/navigator')
-rw-r--r--src/modules/navigator/mission_block.h6
-rw-r--r--src/modules/navigator/mission_feasibility_checker.h3
-rw-r--r--src/modules/navigator/navigator_mode.cpp3
-rw-r--r--src/modules/navigator/navigator_mode.h4
4 files changed, 9 insertions, 7 deletions
diff --git a/src/modules/navigator/mission_block.h b/src/modules/navigator/mission_block.h
index adf50bc39..ec3e30582 100644
--- a/src/modules/navigator/mission_block.h
+++ b/src/modules/navigator/mission_block.h
@@ -83,9 +83,9 @@ protected:
*/
void mission_item_to_position_setpoint(const mission_item_s *item, position_setpoint_s *sp);
- /**
- * Set previous position setpoint to current setpoint
- */
+ /**
+ * Set previous position setpoint to current setpoint
+ */
void set_previous_pos_setpoint();
/**
diff --git a/src/modules/navigator/mission_feasibility_checker.h b/src/modules/navigator/mission_feasibility_checker.h
index 96c9209d3..9a77a6dc2 100644
--- a/src/modules/navigator/mission_feasibility_checker.h
+++ b/src/modules/navigator/mission_feasibility_checker.h
@@ -78,7 +78,8 @@ public:
/*
* Returns true if mission is feasible and false otherwise
*/
- bool checkMissionFeasible(bool isRotarywing, dm_item_t dm_current, size_t nMissionItems, Geofence &geofence, float home_alt);
+ bool checkMissionFeasible(bool isRotarywing, dm_item_t dm_current, size_t nMissionItems, Geofence &geofence,
+ float home_alt);
};
diff --git a/src/modules/navigator/navigator_mode.cpp b/src/modules/navigator/navigator_mode.cpp
index 2f322031c..f7ccda0cb 100644
--- a/src/modules/navigator/navigator_mode.cpp
+++ b/src/modules/navigator/navigator_mode.cpp
@@ -58,7 +58,8 @@ NavigatorMode::~NavigatorMode()
}
void
-NavigatorMode::run(bool active) {
+NavigatorMode::run(bool active)
+{
if (active) {
if (_first_run) {
/* first run */
diff --git a/src/modules/navigator/navigator_mode.h b/src/modules/navigator/navigator_mode.h
index de5545dcb..0839d9be6 100644
--- a/src/modules/navigator/navigator_mode.h
+++ b/src/modules/navigator/navigator_mode.h
@@ -92,8 +92,8 @@ private:
/* this class has ptr data members, so it should not be copied,
* consequently the copy constructors are private.
*/
- NavigatorMode(const NavigatorMode&);
- NavigatorMode operator=(const NavigatorMode&);
+ NavigatorMode(const NavigatorMode &);
+ NavigatorMode operator=(const NavigatorMode &);
};
#endif