fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 08:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

LandDetector: Shorter and less ambiguous param names

Browse Source
This commit is contained in:
Johan Jansen
2015-01-15 14:58:06 +01:00
parent 92add9cf80
commit 510a314386
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/land_detector/FixedwingLandDetector.cpp
+3 -3
View File
@@ -57,9 +57,9 @@ FixedwingLandDetector::FixedwingLandDetector() : LandDetector(),
_airspeed_filtered(0.0f),
_landDetectTrigger(0)
{
_paramHandle.maxVelocity = param_find("LAND_FW_VELOCITY_MAX");
_paramHandle.maxClimbRate = param_find("LAND_FW_MAX_CLIMB_RATE");
_paramHandle.maxAirSpeed = param_find("LAND_FW_AIR_SPEED_MAX");
_paramHandle.maxVelocity = param_find("LAND_FW_VEL_XY_MAX");
_paramHandle.maxClimbRate = param_find("LAND_FW_VEL_Z_MAX");
_paramHandle.maxAirSpeed = param_find("LAND_FW_AIRSPEED_MAX");
}
void FixedwingLandDetector::initialize()
src/modules/land_detector/MulticopterLandDetector.cpp
+4 -4
View File
@@ -62,10 +62,10 @@ MulticopterLandDetector::MulticopterLandDetector() : LandDetector(),
_landTimer(0)
{
_paramHandle.maxRotation = param_find("LAND_MC_MAX_CLIMB_RATE");
_paramHandle.maxVelocity = param_find("LAND_MC_VELOCITY_MAX");
_paramHandle.maxClimbRate = param_find("LAND_MC_ROTATION_MAX");
_paramHandle.maxThrottle = param_find("LAND_MC_THRUST_MAX");
_paramHandle.maxRotation = param_find("LAND_MC_Z_VEL_MAX");
_paramHandle.maxVelocity = param_find("LAND_MC_XY_VEL_MAX");
_paramHandle.maxClimbRate = param_find("LAND_MC_ROT_MAX");
_paramHandle.maxThrottle = param_find("LAND_MC_THR_MAX");
}
void MulticopterLandDetector::initialize()
src/modules/land_detector/land_detector_params.c
+6 -6
View File
@@ -48,7 +48,7 @@
*
* @group Land Detector
*/
PARAM_DEFINE_FLOAT(LAND_MC_MAX_CLIMB_RATE, 0.30f);
PARAM_DEFINE_FLOAT(LAND_MC_Z_VEL_MAX, 0.30f);
/**
* Multicopter max horizontal velocity
@@ -57,7 +57,7 @@ PARAM_DEFINE_FLOAT(LAND_MC_MAX_CLIMB_RATE, 0.30f);
*
* @group Land Detector
*/
PARAM_DEFINE_FLOAT(LAND_MC_VELOCITY_MAX, 1.00f);
PARAM_DEFINE_FLOAT(LAND_MC_XY_VEL_MAX, 1.00f);
/**
* Multicopter max rotation
@@ -66,7 +66,7 @@ PARAM_DEFINE_FLOAT(LAND_MC_VELOCITY_MAX, 1.00f);
*
* @group Land Detector
*/
PARAM_DEFINE_FLOAT(LAND_MC_MAX_ROTATION, 0.20f);
PARAM_DEFINE_FLOAT(LAND_MC_ROT_MAX, 0.20f);
/**
* Multicopter max throttle
@@ -75,7 +75,7 @@ PARAM_DEFINE_FLOAT(LAND_MC_MAX_ROTATION, 0.20f);
*
* @group Land Detector
*/
PARAM_DEFINE_FLOAT(LAND_MC_MAX_THROTTLE, 0.20f);
PARAM_DEFINE_FLOAT(LAND_MC_THR_MAX, 0.20f);
/**
* Fixedwing max horizontal velocity
@@ -84,7 +84,7 @@ PARAM_DEFINE_FLOAT(LAND_MC_MAX_THROTTLE, 0.20f);
*
* @group Land Detector
*/
PARAM_DEFINE_FLOAT(LAND_FW_VELOCITY_MAX, 0.20f);
PARAM_DEFINE_FLOAT(LAND_FW_VEL_XY_MAX, 0.20f);
/**
* Fixedwing max climb rate
@@ -93,7 +93,7 @@ PARAM_DEFINE_FLOAT(LAND_FW_VELOCITY_MAX, 0.20f);
*
* @group Land Detector
*/
PARAM_DEFINE_FLOAT(LAND_FW_MAX_CLIMB_RATE, 10.00f);
PARAM_DEFINE_FLOAT(LAND_FW_VEL_Z_MAX, 10.00f);
/**
* Airspeed max