zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_Avoidance: Use SI units conventions in parameter units 

Follow the rules from:
http://physics.nist.gov/cuu/Units/units.html
http://physics.nist.gov/cuu/Units/outside.html
and
http://physics.nist.gov/cuu/Units/checklist.html
one further constrain is that only printable (7bit) ASCII characters are allowed
mission-4.1.18
Dr.-Ing. Amilcar Do Carmo Lucas 8 years ago committed by Andrew Tridgell
parent
9941e910ee
commit
8bd51fa068
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libraries/AP_Avoidance/AP_Avoidance.cpp

12
libraries/AP_Avoidance/AP_Avoidance.cpp
Unescape View File

@ -76,42 +76,42 @@ const AP_Param::GroupInfo AP_Avoidance::var_info[] = {
// @Param: W_TIME // @Param: W_TIME
// @DisplayName: Time Horizon Warn // @DisplayName: Time Horizon Warn
// @Description: Aircraft velocity vectors are multiplied by this time to determine closest approach. If this results in an approach closer than W_DIST_XY or W_DIST_Z then W_ACTION is undertaken (assuming F_ACTION is not undertaken) // @Description: Aircraft velocity vectors are multiplied by this time to determine closest approach. If this results in an approach closer than W_DIST_XY or W_DIST_Z then W_ACTION is undertaken (assuming F_ACTION is not undertaken)
// @Units: seconds // @Units: s
// @User: Advanced // @User: Advanced
AP_GROUPINFO("W_TIME", 6, AP_Avoidance, _warn_time_horizon, AP_AVOIDANCE_WARN_TIME_DEFAULT), AP_GROUPINFO("W_TIME", 6, AP_Avoidance, _warn_time_horizon, AP_AVOIDANCE_WARN_TIME_DEFAULT),
// @Param: F_TIME // @Param: F_TIME
// @DisplayName: Time Horizon Fail // @DisplayName: Time Horizon Fail
// @Description: Aircraft velocity vectors are multiplied by this time to determine closest approach. If this results in an approach closer than F_DIST_XY or F_DIST_Z then F_ACTION is undertaken // @Description: Aircraft velocity vectors are multiplied by this time to determine closest approach. If this results in an approach closer than F_DIST_XY or F_DIST_Z then F_ACTION is undertaken
// @Units: seconds // @Units: s
// @User: Advanced // @User: Advanced
AP_GROUPINFO("F_TIME", 7, AP_Avoidance, _fail_time_horizon, AP_AVOIDANCE_FAIL_TIME_DEFAULT), AP_GROUPINFO("F_TIME", 7, AP_Avoidance, _fail_time_horizon, AP_AVOIDANCE_FAIL_TIME_DEFAULT),
// @Param: W_DIST_XY // @Param: W_DIST_XY
// @DisplayName: Distance Warn XY // @DisplayName: Distance Warn XY
// @Description: Closest allowed projected distance before W_ACTION is undertaken // @Description: Closest allowed projected distance before W_ACTION is undertaken
// @Units: meters // @Units: m
// @User: Advanced // @User: Advanced
AP_GROUPINFO("W_DIST_XY", 8, AP_Avoidance, _warn_distance_xy, AP_AVOIDANCE_WARN_DISTANCE_XY_DEFAULT), AP_GROUPINFO("W_DIST_XY", 8, AP_Avoidance, _warn_distance_xy, AP_AVOIDANCE_WARN_DISTANCE_XY_DEFAULT),
// @Param: F_DIST_XY // @Param: F_DIST_XY
// @DisplayName: Distance Fail XY // @DisplayName: Distance Fail XY
// @Description: Closest allowed projected distance before F_ACTION is undertaken // @Description: Closest allowed projected distance before F_ACTION is undertaken
// @Units: meters // @Units: m
// @User: Advanced // @User: Advanced
AP_GROUPINFO("F_DIST_XY", 9, AP_Avoidance, _fail_distance_xy, AP_AVOIDANCE_FAIL_DISTANCE_XY_DEFAULT), AP_GROUPINFO("F_DIST_XY", 9, AP_Avoidance, _fail_distance_xy, AP_AVOIDANCE_FAIL_DISTANCE_XY_DEFAULT),
// @Param: W_DIST_Z // @Param: W_DIST_Z
// @DisplayName: Distance Warn Z // @DisplayName: Distance Warn Z
// @Description: Closest allowed projected distance before BEHAVIOUR_W is undertaken // @Description: Closest allowed projected distance before BEHAVIOUR_W is undertaken
// @Units: meters // @Units: m
// @User: Advanced // @User: Advanced
AP_GROUPINFO("W_DIST_Z", 10, AP_Avoidance, _warn_distance_z, AP_AVOIDANCE_WARN_DISTANCE_Z_DEFAULT), AP_GROUPINFO("W_DIST_Z", 10, AP_Avoidance, _warn_distance_z, AP_AVOIDANCE_WARN_DISTANCE_Z_DEFAULT),
// @Param: F_DIST_Z // @Param: F_DIST_Z
// @DisplayName: Distance Fail Z // @DisplayName: Distance Fail Z
// @Description: Closest allowed projected distance before BEHAVIOUR_F is undertaken // @Description: Closest allowed projected distance before BEHAVIOUR_F is undertaken
// @Units: meters // @Units: m
// @User: Advanced // @User: Advanced
AP_GROUPINFO("F_DIST_Z", 11, AP_Avoidance, _fail_distance_z, AP_AVOIDANCE_FAIL_DISTANCE_Z_DEFAULT), AP_GROUPINFO("F_DIST_Z", 11, AP_Avoidance, _fail_distance_z, AP_AVOIDANCE_FAIL_DISTANCE_Z_DEFAULT),

Write Preview
Loading…
Cancel
Save