Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 00:28:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: merge XML from upstream

Browse Source
This commit is contained in:
Andrew Tridgell 2014-03-20 10:20:00 +11:00
parent 552674389d
commit 106fda773f
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,6 +111,9 @@
<entry value="17" name="MAV_TYPE_KITE">
<description>Flapping wing</description>
</entry>
<entry value="18" name="MAV_TYPE_ONBOARD_CONTROLLER">
<description>Onboard companion controller</description>
</entry>
</enum>
<!-- WARNING: MAV_ACTION Enum is no longer supported - has been removed. Please use MAV_CMD -->
<enum name="MAV_MODE_FLAG">
@ -704,7 +707,7 @@
<param index="3">Ground pressure: 0: no, 1: yes</param>
<param index="4">Radio calibration: 0: no, 1: yes</param>
<param index="5">Accelerometer calibration: 0: no, 1: yes</param>
<param index="6">Empty</param>
<param index="6">Compass/Motor interference calibration: 0: no, 1: yes</param>
<param index="7">Empty</param>
</entry>
<entry value="242" name="MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS">
@ -1255,13 +1258,13 @@
<field type="uint16_t" name="command">The scheduled action for the MISSION. see MAV_CMD in common.xml MAVLink specs</field>
<field type="uint8_t" name="current">false:0, true:1</field>
<field type="uint8_t" name="autocontinue">autocontinue to next wp</field>
<field type="float" name="param1">PARAM1 / For NAV command MISSIONs: Radius in which the MISSION is accepted as reached, in meters</field>
<field type="float" name="param2">PARAM2 / For NAV command MISSIONs: Time that the MAV should stay inside the PARAM1 radius before advancing, in milliseconds</field>
<field type="float" name="param3">PARAM3 / For LOITER command MISSIONs: Orbit to circle around the MISSION, in meters. If positive the orbit direction should be clockwise, if negative the orbit direction should be counter-clockwise.</field>
<field type="float" name="param4">PARAM4 / For NAV and LOITER command MISSIONs: Yaw orientation in degrees, [0..360] 0 = NORTH</field>
<field type="float" name="param1">PARAM1, see MAV_CMD enum</field>
<field type="float" name="param2">PARAM2, see MAV_CMD enum</field>
<field type="float" name="param3">PARAM3, see MAV_CMD enum</field>
<field type="float" name="param4">PARAM4, see MAV_CMD enum</field>
<field type="float" name="x">PARAM5 / local: x position, global: latitude</field>
<field type="float" name="y">PARAM6 / y position: global: longitude</field>
<field type="float" name="z">PARAM7 / z position: global: altitude</field>
<field type="float" name="z">PARAM7 / z position: global: altitude (relative or absolute, depending on frame.</field>
</message>
<message id="40" name="MISSION_REQUEST">
<description>Request the information of the mission item with the sequence number seq. The response of the system to this message should be a MISSION_ITEM message. http://qgroundcontrol.org/mavlink/waypoint_protocol</description>
@ -1873,6 +1876,19 @@
<field type="uint16_t" name="Vservo">servo rail voltage in millivolts</field>
<field type="uint16_t" name="flags">power supply status flags (see MAV_POWER_STATUS enum)</field>
</message>
<message id="130" name="DATA_TRANSMISSION_HANDSHAKE">
<field type="uint8_t" name="type">type of requested/acknowledged data (as defined in ENUM DATA_TYPES in mavlink/include/mavlink_types.h)</field>
<field type="uint32_t" name="size">total data size in bytes (set on ACK only)</field>
<field type="uint16_t" name="width">Width of a matrix or image</field>
<field type="uint16_t" name="height">Height of a matrix or image</field>
<field type="uint16_t" name="packets">number of packets beeing sent (set on ACK only)</field>
<field type="uint8_t" name="payload">payload size per packet (normally 253 byte, see DATA field size in message ENCAPSULATED_DATA) (set on ACK only)</field>
<field type="uint8_t" name="jpg_quality">JPEG quality out of [1,100]</field>
</message>
<message id="131" name="ENCAPSULATED_DATA">
<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>
</message>
<message id="147" name="BATTERY_STATUS">
<description>Transmitte battery informations for a accu pack.</description>
<field type="uint8_t" name="accu_id">Accupack ID</field>

13
libraries/GCS_MAVLink/message_definitions/pixhawk.xml
View File

@ -172,19 +172,6 @@
<field type="float" name="zp2">Z2 Position</field>
<field type="char[26]" name="name">POI connection name</field>
</message>
<message id="193" name="DATA_TRANSMISSION_HANDSHAKE">
<field type="uint8_t" name="type">type of requested/acknowledged data (as defined in ENUM DATA_TYPES in mavlink/include/mavlink_types.h)</field>
<field type="uint32_t" name="size">total data size in bytes (set on ACK only)</field>
<field type="uint16_t" name="width">Width of a matrix or image</field>
<field type="uint16_t" name="height">Height of a matrix or image</field>
<field type="uint8_t" name="packets">number of packets beeing sent (set on ACK only)</field>
<field type="uint8_t" name="payload">payload size per packet (normally 253 byte, see DATA field size in message ENCAPSULATED_DATA) (set on ACK only)</field>
<field type="uint8_t" name="jpg_quality">JPEG quality out of [1,100]</field>
</message>
<message id="194" name="ENCAPSULATED_DATA">
<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>
</message>
<message id="195" name="BRIEF_FEATURE">
<field type="float" name="x">x position in m</field>
<field type="float" name="y">y position in m</field>