Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 16:23:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: merge in upstream changes

Browse Source
This commit is contained in:
Andrew Tridgell 2014-06-17 20:19:35 +10:00
parent 87fcfbf9dd
commit 0db226daf5
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/GCS_MAVLink/message_definitions/common.xml
View File

@ -644,7 +644,7 @@
<entry value="176" name="MAV_CMD_DO_SET_MODE"> <entry value="176" name="MAV_CMD_DO_SET_MODE">
<description>Set system mode.</description> <description>Set system mode.</description>
<param index="1">Mode, as defined by ENUM MAV_MODE</param> <param index="1">Mode, as defined by ENUM MAV_MODE</param>
<param index="2">Empty</param> <param index="2">Custom mode - this is system specific, please refer to the individual autopilot specifications for details.</param>
<param index="3">Empty</param> <param index="3">Empty</param>
<param index="4">Empty</param> <param index="4">Empty</param>
<param index="5">Empty</param> <param index="5">Empty</param>
@ -1190,6 +1190,15 @@
<description>Send multiple replies until port is drained</description> <description>Send multiple replies until port is drained</description>
</entry> </entry>
</enum> </enum>
<enum name="MAV_DISTANCE_SENSOR">
<description>Enumeration of distance sensor types</description>
<entry value="0" name="MAV_DISTANCE_SENSOR_LASER">
<description>Laser altimeter, e.g. LightWare SF02/F or PulsedLight units</description>
</entry>
<entry value="1" name="MAV_DISTANCE_SENSOR_ULTRASOUND">
<description>Ultrasound altimeter, e.g. MaxBotix units</description>
</entry>
</enum>
</enums> </enums>
<messages> <messages>
<message id="0" name="HEARTBEAT"> <message id="0" name="HEARTBEAT">
@ -2118,6 +2127,16 @@
<field type="uint16_t" name="seqnr">sequence number (starting with 0 on every transmission)</field> <field type="uint16_t" name="seqnr">sequence number (starting with 0 on every transmission)</field>
<field type="uint8_t[253]" name="data">image data bytes</field> <field type="uint8_t[253]" name="data">image data bytes</field>
</message> </message>
<message id="132" name="DISTANCE_SENSOR">
<field type="uint32_t" name="time_boot_ms">Time since system boot</field>
<field type="uint16_t" name="min_distance">Minimum distance the sensor can measure in centimeters</field>
<field type="uint16_t" name="max_distance">Maximum distance the sensor can measure in centimeters</field>
<field type="uint16_t" name="current_distance">Current distance reading</field>
<field type="uint8_t" name="type">Type from MAV_DISTANCE_SENSOR enum.</field>
<field type="uint8_t" name="id">Onboard ID of the sensor</field>
<field type="uint8_t" name="orientation">Direction the sensor faces from FIXME enum.</field>
<field type="uint8_t" name="covariance">Measurement covariance in centimeters, 0 for unknown / invalid readings</field>
</message>
<message id="147" name="BATTERY_STATUS"> <message id="147" name="BATTERY_STATUS">
<description>Transmitte battery informations for a accu pack.</description> <description>Transmitte battery informations for a accu pack.</description>
<field type="uint8_t" name="accu_id">Accupack ID</field> <field type="uint8_t" name="accu_id">Accupack ID</field>