From: Keith Packard <keithp@keithp.com>
Date: Mon, 14 Jul 2014 03:43:27 +0000 (-0700)
Subject: altos: Make ao_gps_print deal with telem containing 32-bit altitude values
X-Git-Tag: 1.4.9.2~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=50aec54bdc35962145eff9b465f9cd7b3d9fea0b

altos: Make ao_gps_print deal with telem containing 32-bit altitude values

ao_gps_print is used with new telem packets from a few places; use
AO_TELEMETRY_LOCATION_ALTITUDE when necessary.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/kernel/ao_gps_print.c b/src/kernel/ao_gps_print.c
index 47c945d7..d26021da 100644
--- a/src/kernel/ao_gps_print.c
+++ b/src/kernel/ao_gps_print.c
@@ -20,6 +20,10 @@
 #endif
 #include "ao_telem.h"
 
+#ifndef AO_TELEMETRY_LOCATION_ALTITUDE
+#define AO_TELEMETRY_LOCATION_ALTITUDE(l)	((l)->altitude)
+#endif
+
 void
 ao_gps_print(__xdata struct ao_gps_orig *gps_data) __reentrant
 {
@@ -42,7 +46,7 @@ ao_gps_print(__xdata struct ao_gps_orig *gps_data) __reentrant
 	       AO_TELEM_GPS_ALTITUDE " %d ",
 	       (long) gps_data->latitude,
 	       (long) gps_data->longitude,
-	       gps_data->altitude);
+	       AO_TELEMETRY_LOCATION_ALTITUDE(gps_data));
 
 	if (gps_data->flags & AO_GPS_DATE_VALID)
 		printf(AO_TELEM_GPS_YEAR " %d "