fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-01 04:24:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_v1.0.0' of github.com:PX4/Firmware into beta

Browse Source
This commit is contained in:
Lorenz Meier 2015-06-30 07:11:13 +02:00
commit 7266ba1583
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/mc_pos_control/mc_pos_control_params.c
View File

@ -1,7 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2013 PX4 Development Team. All rights reserved.
* Author: @author Anton Babushkin <anton.babushkin@me.com>
* Copyright (c) 2013-2015 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
@ -36,7 +35,7 @@
* @file mc_pos_control_params.c
* Multicopter position controller parameters.
*
* @author Anton Babushkin <anton.babushkin@me.com>
* @author Anton Babushkin <anton@px4.io>
*/
#include <systemlib/param/param.h>
@ -107,7 +106,7 @@ PARAM_DEFINE_FLOAT(MPC_Z_VEL_D, 0.0f);
*
* @unit m/s
* @min 0.0
* @max 8 m/s
* @max 8.0
* @group Multicopter Position Control
*/
PARAM_DEFINE_FLOAT(MPC_Z_VEL_MAX, 3.0f);
@ -184,7 +183,7 @@ PARAM_DEFINE_FLOAT(MPC_XY_FF, 0.5f);
*
* Limits maximum tilt in AUTO and POSCTRL modes during flight.
*
* @unit deg
* @unit degree
* @min 0.0
* @max 90.0
* @group Multicopter Position Control
@ -196,7 +195,7 @@ PARAM_DEFINE_FLOAT(MPC_TILTMAX_AIR, 45.0f);
*
* Limits maximum tilt angle on landing.
*
* @unit deg
* @unit degree
* @min 0.0
* @max 90.0
* @group Multicopter Position Control
@ -215,7 +214,7 @@ PARAM_DEFINE_FLOAT(MPC_LAND_SPEED, 1.0f);
/**
* Max manual roll
*
* @unit deg
* @unit degree
* @min 0.0
* @max 90.0
* @group Multicopter Position Control
@ -225,7 +224,7 @@ PARAM_DEFINE_FLOAT(MPC_MAN_R_MAX, 35.0f);
/**
* Max manual pitch
*
* @unit deg
* @unit degree
* @min 0.0
* @max 90.0
* @group Multicopter Position Control
@ -235,7 +234,7 @@ PARAM_DEFINE_FLOAT(MPC_MAN_P_MAX, 35.0f);
/**
* Max manual yaw rate
*
* @unit deg/s
* @unit degree / s
* @min 0.0
* @group Multicopter Position Control
*/

10
src/modules/navigator/datalinkloss_params.c
View File

@ -36,7 +36,7 @@
*
* Parameters for DLL
*
* @author Thomas Gubler <thomasgubler@gmail.com>
* @author Thomas Gubler <thomas@px4.io>
*/
#include <nuttx/config.h>
@ -64,8 +64,8 @@ PARAM_DEFINE_FLOAT(NAV_DLL_CH_T, 120.0f);
* Latitude of comms hold waypoint
*
* @unit degrees * 1e7
* @min -90
* @max 90
* @min -900000000
* @max 900000000
* @group Data Link Loss
*/
PARAM_DEFINE_INT32(NAV_DLL_CH_LAT, -266072120);
@ -76,8 +76,8 @@ PARAM_DEFINE_INT32(NAV_DLL_CH_LAT, -266072120);
* Longitude of comms hold waypoint
*
* @unit degrees * 1e7
* @min -180
* @max 180
* @min -1800000000
* @max 1800000000
* @group Data Link Loss
*/
PARAM_DEFINE_INT32(NAV_DLL_CH_LON, 1518453890);

26
src/modules/navigator/navigator_params.c
View File

@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2014 PX4 Development Team. All rights reserved.
* Copyright (c) 2014, 2015 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
@ -36,8 +36,8 @@
*
* Parameters for navigator in general
*
* @author Julian Oes <julian@oes.ch>
* @author Thomas Gubler <thomasgubler@gmail.com>
* @author Julian Oes <julian@px4.io>
* @author Thomas Gubler <thomas@px4.io>
*/
#include <nuttx/config.h>
@ -49,9 +49,9 @@
*
* Default value of loiter radius for missions, loiter, RTL, etc. (fixedwing only).
*
* @unit meters
* @min 20
* @max 200
* @unit meter
* @min 25
* @max 1000
* @group Mission
*/
PARAM_DEFINE_FLOAT(NAV_LOITER_RAD, 50.0f);
@ -61,9 +61,9 @@ PARAM_DEFINE_FLOAT(NAV_LOITER_RAD, 50.0f);
*
* Default acceptance radius, overridden by acceptance radius of waypoint if set.
*
* @unit meters
* @unit meter
* @min 0.05
* @max 200
* @max 200.0
* @group Mission
*/
PARAM_DEFINE_FLOAT(NAV_ACC_RAD, 10.0f);
@ -74,6 +74,7 @@ PARAM_DEFINE_FLOAT(NAV_ACC_RAD, 10.0f);
* If set to 1 the behaviour on data link loss is set to a mode according to the OBC rules
*
* @min 0
* @max 1
* @group Mission
*/
PARAM_DEFINE_INT32(NAV_DLL_OBC, 0);
@ -84,6 +85,7 @@ PARAM_DEFINE_INT32(NAV_DLL_OBC, 0);
* If set to 1 the behaviour on data link loss is set to a mode according to the OBC rules
*
* @min 0
* @max 1
* @group Mission
*/
PARAM_DEFINE_INT32(NAV_RCL_OBC, 0);
@ -94,7 +96,8 @@ PARAM_DEFINE_INT32(NAV_RCL_OBC, 0);
* Latitude of airfield home waypoint
*
* @unit degrees * 1e7
* @min 0
* @min -900000000
* @max 900000000
* @group Data Link Loss
*/
PARAM_DEFINE_INT32(NAV_AH_LAT, -265847810);
@ -105,7 +108,8 @@ PARAM_DEFINE_INT32(NAV_AH_LAT, -265847810);
* Longitude of airfield home waypoint
*
* @unit degrees * 1e7
* @min 0
* @min -1800000000
* @max 1800000000
* @group Data Link Loss
*/
PARAM_DEFINE_INT32(NAV_AH_LON, 1518423250);
@ -116,7 +120,7 @@ PARAM_DEFINE_INT32(NAV_AH_LON, 1518423250);
* Altitude of airfield home waypoint
*
* @unit m
* @min 0.0
* @min -50
* @group Data Link Loss
*/
PARAM_DEFINE_FLOAT(NAV_AH_ALT, 600.0f);