Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 17:06:31 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[messages][server] WP_MOVED_LLA alt in mm

Browse Source
This commit is contained in:
Felix Ruess
2015-01-02 23:13:35 +01:00
parent 12024911cb
commit 2b80da0d19
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/messages.xml
+2 -2
View File
@@ -356,7 +356,7 @@
<field name="wp_id" type="uint8"/> <field name="wp_id" type="uint8"/>
<field name="lat" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/> <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="lon" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
<field name="alt" type="int32" unit="cm"/> <field name="alt" type="int32" unit="mm" alt_unit="m">Height above Mean Sea Level (geoid)</field>
</message> </message>
<message name="CHRONO" id="48"> <message name="CHRONO" id="48">
@@ -2223,7 +2223,7 @@
<field name="ac_id" type="uint8"/> <field name="ac_id" type="uint8"/>
<field name="lat" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/> <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="lon" type="int32" unit="1e7deg" alt_unit="deg" alt_unit_coef="0.0000001"/>
<field name="alt" type="int32" unit="cm"/> <field name="alt" type="int32" unit="cm" alt_unit="m">Height above Mean Sea Level (geoid)</field>
</message> </message>
<message name="WIND_INFO" id="3" link="forwarded"> <message name="WIND_INFO" id="3" link="forwarded">
sw/ground_segment/tmtc/fw_server.ml
+1 -1
View File
@@ -318,7 +318,7 @@ let log_and_parse = fun ac_name (a:Aircraft.aircraft) msg values ->
and lon = ivalue "lon" and lon = ivalue "lon"
and alt = ivalue "alt" in and alt = ivalue "alt" in
let geo = make_geo_deg (float lat /. 1e7) (float lon /. 1e7) in let geo = make_geo_deg (float lat /. 1e7) (float lon /. 1e7) in
update_waypoint a (ivalue "wp_id") geo (float alt /. 100.) update_waypoint a (ivalue "wp_id") geo (float alt /. 1000.)
| "GENERIC_COM" -> | "GENERIC_COM" ->
let flight_time = ivalue "flight_time" in let flight_time = ivalue "flight_time" in
if flight_time >= a.flight_time then begin if flight_time >= a.flight_time then begin