altos: Make ao_gps_print deal with telem containing 32-bit altitude values
authorKeith Packard <keithp@keithp.com>
Mon, 14 Jul 2014 03:43:27 +0000 (20:43 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 14 Jul 2014 03:43:27 +0000 (20:43 -0700)
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>
src/kernel/ao_gps_print.c

index 47c945d78b80f578622505f770af284dacf5a7d1..d26021da86b9511f340d9fbd203b730b3436b99d 100644 (file)
 #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 "