aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-01-09 08:10:03 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-01-09 08:10:03 +0100
commit55eaa38c651be41eee31b86330edbf27869385f8 (patch)
treea13eb9b53903521fc5d02336dbbb75834b483614 /src
parent581d702478d8671faaf48c32dd7071e06d2b4254 (diff)
downloadpx4-firmware-55eaa38c651be41eee31b86330edbf27869385f8.tar.gz
px4-firmware-55eaa38c651be41eee31b86330edbf27869385f8.tar.bz2
px4-firmware-55eaa38c651be41eee31b86330edbf27869385f8.zip
Documentation cleanup in navigator
Diffstat (limited to 'src')
-rw-r--r--src/modules/navigator/navigator_main.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp
index bb7520a03..63952be6e 100644
--- a/src/modules/navigator/navigator_main.cpp
+++ b/src/modules/navigator/navigator_main.cpp
@@ -1,9 +1,6 @@
/****************************************************************************
*
- * Copyright (c) 2013 PX4 Development Team. All rights reserved.
- * Author: @author Lorenz Meier <lm@inf.ethz.ch>
- * @author Jean Cyr <jean.m.cyr@gmail.com>
- * @author Julian Oes <joes@student.ethz.ch>
+ * Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,11 +31,18 @@
*
****************************************************************************/
/**
- * @file navigator_main.c
+ * @file navigator_main.cpp
* Implementation of the main navigation state machine.
*
* Handles missions, geo fencing and failsafe navigation behavior.
* Published the mission item triplet for the position controller.
+ *
+ * @author Julian Oes <joes@student.ethz.ch>
+ * @author Jean Cyr <jean.m.cyr@gmail.com>
+ * @author Anton Babushkin <anton.babushkin@me.com>
+ * @author Thomas Gubler <thomasgubler@gmail.com>
+ * @author Lorenz Meier <lm@inf.ethz.ch>
+ *
*/
#include <nuttx/config.h>
@@ -349,11 +353,11 @@ private:
namespace navigator
{
-/* oddly, ERROR is not defined for c++ */
-#ifdef ERROR
-# undef ERROR
-#endif
-static const int ERROR = -1;
+// /* oddly, ERROR is not defined for c++ */
+// #ifdef ERROR
+// # undef ERROR
+// #endif
+// static const int ERROR = -1;
Navigator *g_navigator;
}