[messages] DC_SHOT|INFO: abreviated lat/lon/alt field names

paparazzi · Nov 25, 2014 · efb30f0 · efb30f0
1 parent 34e75bc
commit efb30f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/conf/messages.xml b/conf/messages.xml
@@ -540,9 +540,9 @@
 
   <message name="DC_INFO" id="64">
     <field name="mode" type="int16" unit=""/>
-    <field name="latitude" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
-    <field name="longitude" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
-    <field name="altitude" type="int32" unit="mm" alt_unit="m"/>
+    <field name="lat" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
+    <field name="lon" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
+    <field name="alt" type="int32" unit="mm" alt_unit="m"/>
     <field name="course" type="float" unit="deg"/>
     <field name="buffer" type="uint16"/>
     <field name="dist" type="float" unit="m"/>
@@ -906,9 +906,9 @@
 
   <message name="DC_SHOT" id="110">
     <field name="photo_nr" type="int16"/>
-    <field name="latitude" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
-    <field name="longitude" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
-    <field name="altitude" type="int32" unit="mm" alt_unit="m"/>
+    <field name="lat" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
+    <field name="lon" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
+    <field name="alt" type="int32" unit="mm" alt_unit="m"/>
     <field name="phi" type="int16" unit="decideg"/>
     <field name="theta" type="int16" unit="decideg"/>
     <field name="course" type="int16" unit="decideg"/>

diff --git a/sw/ground_segment/cockpit/live.ml b/sw/ground_segment/cockpit/live.ml
@@ -1361,8 +1361,8 @@ let mark_dcshot = fun (geomap:G.widget) _sender vs ->
   let ac = find_ac !active_ac in
   let photonumber = Pprz.string_assoc "photo_nr" vs in
   try
-    let lat = Pprz.int_assoc "latitude" vs
-    and lon = Pprz.int_assoc "longitude" vs in
+    let lat = Pprz.int_assoc "lat" vs
+    and lon = Pprz.int_assoc "lon" vs in
     let wgs84 = LL.make_geo_deg (float lat /. 1e7) (float lon /. 1e7) in
     let group = geomap#background in
     let point = geomap#photoprojection ~group ~fill_color:"yellow" ~number:photonumber wgs84 3. in