common: simplified LANDING_TARGET message

Also moved to message id 149
dforsi · May 29, 2015 · d546467 · d546467
1 parent 5b39ef2
commit d546467
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/message_definitions/v1.0/common.xml b/message_definitions/v1.0/common.xml
@@ -2767,17 +2767,15 @@
             <field type="uint16_t" name="product_id">ID of the product</field>
             <field type="uint64_t" name="uid">UID if provided by hardware</field>
         </message>
-        <!-- MESSAGE IDs 180 - 240: Space for custom messages in individual projectname_messages.xml files -->
-        <message id="230" name="LANDING_TARGET">
+        <message id="149" name="LANDING_TARGET">
             <description>The location of a landing area captured from a downward facing camera</description>
-            <field type="uint8_t" name="lnd_target_num">The ID of the target if multiple targets are present</field>
-            <field type="uint8_t" name="target_system">System ID</field>
-            <field type="uint8_t" name="target_component">Component ID</field>
+            <field type="uint8_t" name="target_num">The ID of the target if multiple targets are present</field>
             <field type="uint8_t" name="frame">MAV_FRAME enum specifying the whether the following feilds are earth-frame, body-frame, etc.</field>
-            <field type="float" name="angle_x">Angular offset(radians) of the object from the center of the image: x-axis</field>
-            <field type="float" name="angle_y">Angular offset(radians) of the object from the center of the image: y-axis</field>
-            <field type="float" name="distance">Distance to the object from the vehicle in meters</field>
+            <field type="float" name="angle_x">X-axis angular offset (in radians) of the target from the center of the image</field>
+            <field type="float" name="angle_y">Y-axis angular offset (in radians) of the target from the center of the image</field>
+            <field type="float" name="distance">Distance to the target from the vehicle in meters</field>
         </message>
+        <!-- MESSAGE IDs 180 - 240: Space for custom messages in individual projectname_messages.xml files -->
         <message id="248" name="V2_EXTENSION">
             <description>Message implementing parts of the V2 payload specs in V1 frames for transitional support.</description>
             <field type="uint8_t" name="target_network">Network ID (0 for broadcast)</field>