This commit is contained in:
PX4BuildBot
2016-11-18 23:14:08 +00:00
parent a4e2e6a67f
commit 87e3b578db
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -915,8 +915,8 @@ typedef enum MAV_COLLISION_ACTION
{
MAV_COLLISION_ACTION_NONE=0, /* Ignore any potential collisions | */
MAV_COLLISION_ACTION_REPORT=1, /* Report potential collision | */
MAV_COLLISION_ACTION_ASCEND_OR_DESCEND=2, /* Ascend or Descend to avoid thread | */
MAV_COLLISION_ACTION_MOVE_HORIZONTALLY=3, /* Ascend or Descend to avoid thread | */
MAV_COLLISION_ACTION_ASCEND_OR_DESCEND=2, /* Ascend or Descend to avoid threat | */
MAV_COLLISION_ACTION_MOVE_HORIZONTALLY=3, /* Move horizontally to avoid threat | */
MAV_COLLISION_ACTION_MOVE_PERPENDICULAR=4, /* Aircraft to move perpendicular to the collision's velocity vector | */
MAV_COLLISION_ACTION_RTL=5, /* Aircraft to fly directly back to its launch point | */
MAV_COLLISION_ACTION_HOVER=6, /* Aircraft to stop in place | */
+2 -2
View File
@@ -2317,10 +2317,10 @@
<description>Report potential collision</description>
</entry>
<entry value="2" name="MAV_COLLISION_ACTION_ASCEND_OR_DESCEND">
<description>Ascend or Descend to avoid thread</description>
<description>Ascend or Descend to avoid threat</description>
</entry>
<entry value="3" name="MAV_COLLISION_ACTION_MOVE_HORIZONTALLY">
<description>Ascend or Descend to avoid thread</description>
<description>Move horizontally to avoid threat</description>
</entry>
<entry value="4" name="MAV_COLLISION_ACTION_MOVE_PERPENDICULAR">
<description>Aircraft to move perpendicular to the collision's velocity vector</description>