From b8609f99d746bf8926b2ad2fe6dbab95588223c0 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 30 Jun 2015 15:24:05 +0200
Subject: [PATCH] MAVLink app: Fix parameter comments

---
 src/modules/mavlink/mavlink.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/modules/mavlink/mavlink.c b/src/modules/mavlink/mavlink.c
index 62d40d4b74..b1d369cbf4 100644
--- a/src/modules/mavlink/mavlink.c
+++ b/src/modules/mavlink/mavlink.c
@@ -33,9 +33,9 @@
 
 /**
  * @file mavlink.c
- * Adapter functions expected by the protocol library
+ * Define MAVLink specific parameters
  *
- * @author Lorenz Meier <lm@inf.ethz.ch>
+ * @author Lorenz Meier <lorenz@px4.io>
  */
 
 #include <nuttx/config.h>
@@ -46,7 +46,6 @@
 #include "mavlink_bridge_header.h"
 #include <systemlib/param/param.h>
 
-/* define MAVLink specific parameters */
 /**
  * MAVLink system ID
  * @group MAVLink
@@ -64,34 +63,31 @@ PARAM_DEFINE_INT32(MAV_SYS_ID, 1);
 PARAM_DEFINE_INT32(MAV_COMP_ID, 50);
 
 /**
-<<<<<<< Updated upstream
- * MAVLink airframe type
- *
- * 
- * @min 0
-=======
  * MAVLink Radio ID
  *
  * When non-zero the MAVLink app will attempt to configure the
- * radio to this ID and re-set the parameter to 0.
+ * radio to this ID and re-set the parameter to 0. If the value
+ * is negative it will reset the complete radio config to
+ * factory defaults.
  *
  * @group MAVLink
- * @min 0
+ * @min -1
  * @max 240
  */
 PARAM_DEFINE_INT32(MAV_RADIO_ID, 0);
 
 /**
- * MAVLink type
->>>>>>> Stashed changes
+ * MAVLink airframe type
+ *
+ * @min 1
  * @group MAVLink
  */
 PARAM_DEFINE_INT32(MAV_TYPE, 1);
 
 /**
- * Use/Accept HIL GPS message (even if not in HIL mode)
+ * Use/Accept HIL GPS message even if not in HIL mode
  *
- * If set to 1 incomming HIL GPS messages are parsed.
+ * If set to 1 incoming HIL GPS messages are parsed.
  *
  * @group MAVLink
  */
@@ -100,8 +96,8 @@ PARAM_DEFINE_INT32(MAV_USEHILGPS, 0);
 /**
  * Forward external setpoint messages
  *
- * If set to 1 incomming external setpoint messages will be directly forwarded to the controllers if in offboard
- * control mode
+ * If set to 1 incoming external setpoint messages will be directly forwarded
+ * to the controllers if in offboard control mode
  *
  * @group MAVLink
  */